You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/08/06 15:05:44 UTC
[skywalking] branch query-labeled updated (534cff4 -> cda6e25)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch query-labeled
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 534cff4 Merge branch 'master' into query-labeled
add ecbde45 MOD: Sync submodule updates (#5205)
add 78a355e Update README.md (#5206)
add 966403c missing time unit in query (#5210)
add 2f2840c Begin 8.2.0 iteration. (#5211)
add 4f01158 fix an error when executing startup.bat when the log directory exists (#5213)
add 118e334 Fix ParsePathUtil#parameterEquals method ArrayIndexOutOfBoundsException error and some typo (#5216)
add 0146aa5 Exporter INCREMENT mode is not working. (#5220)
add e7288bf Fix error format of time in serviceTraffic update. (#5221)
add 0528180 Fix typo (#5214)
add 58188be Sync ui (#5229)
add df39722 component-libraries.yml typo fix (#5230)
add 4149ac5 The Dubbo plugin can collect more information by custom (#5209)
add 48311e0 Use client side component name when no server side mapping. (#5232)
add 89f314c Make the column length of slow DB statement having the good default value. (#5238)
add 7a20c26 Add HBase hbase-client plugin (#5225)
add 6c487dd Remove unnecessary document. (#5240)
add 567c6b5 Fix Duration.java (#5241)
add f62b5c2 Merge branch 'master' into query-labeled
add cda6e25 Polish codes
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.3.yaml | 1 +
.../apm-toolkit-log4j-1.x/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x/pom.xml | 2 +-
.../apm-toolkit-logback-1.x/pom.xml | 2 +-
apm-application-toolkit/apm-toolkit-meter/pom.xml | 2 +-
.../apm-toolkit-micrometer-registry/pom.xml | 2 +-
.../apm-toolkit-opentracing/pom.xml | 2 +-
apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +-
apm-application-toolkit/pom.xml | 2 +-
apm-commons/apm-datacarrier/pom.xml | 2 +-
apm-commons/apm-util/pom.xml | 2 +-
apm-commons/pom.xml | 2 +-
apm-dist-es7/pom.xml | 2 +-
apm-dist/pom.xml | 2 +-
apm-protocol/apm-network/pom.xml | 2 +-
.../network/trace/component/ComponentsDefine.java | 2 +
apm-protocol/apm-network/src/main/proto | 2 +-
apm-protocol/pom.xml | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 2 +-
.../enhance/InstanceConstructorInterceptor.java | 2 +-
.../apm/agent/core/util/CollectionUtil.java | 6 +
apm-sniffer/apm-agent/pom.xml | 2 +-
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/baidu-brpc-plugin/pom.xml | 6 +-
.../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +-
.../cassandra-java-driver-3.x-plugin/pom.xml | 2 +-
.../dubbo-2.7.x-conflict-patch/pom.xml | 2 +-
.../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +-
.../apm/plugin/asf/dubbo/DubboInterceptor.java | 47 +++++++-
.../apm/plugin/asf/dubbo/DubboPluginConfig.java} | 21 ++--
.../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/ehcache-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +-
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
.../elasticsearch-6.x-plugin/pom.xml | 2 +-
.../feign-default-http-9.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml | 2 +-
.../graphql-plugin/graphql-12.x-plugin/pom.xml | 6 +-
.../graphql-plugin/graphql-8.x-plugin/pom.xml | 6 +-
.../graphql-plugin/graphql-9.x-plugin/pom.xml | 6 +-
apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml | 6 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +-
.../pom.xml | 21 ++--
.../apm/plugin/hbase/HTableInterceptor.java | 122 +++++++++++++++++++++
.../hbase/define/HTableInstrumentation.java} | 63 +++++------
.../src/main/resources/skywalking-plugin.def | 2 +-
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +-
.../httpasyncclient-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/httpclient-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/influxdb-2.x-plugin/pom.xml | 6 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +-
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/lettuce-5.x-plugin/pom.xml | 2 +-
.../light4j-plugins/light4j-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/mariadb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 2 +-
.../apm-sdk-plugin/netty-socketio-plugin/pom.xml | 2 +-
.../nutz-plugins/http-1.x-plugin/pom.xml | 2 +-
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 3 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/quasar-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml | 2 +-
.../resteasy-server-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +-
.../sharding-sphere-3.x-plugin/pom.xml | 2 +-
.../sharding-sphere-4.0.x-plugin/pom.xml | 6 +-
.../sharding-sphere-4.1.0-plugin/pom.xml | 2 +-
.../sharding-sphere-4.x-RC3-plugin/pom.xml | 2 +-
.../sharding-sphere-4.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 2 +-
.../spring-plugins/async-annotation-plugin/pom.xml | 2 +-
.../concurrent-util-4.x-plugin/pom.xml | 2 +-
.../spring-plugins/core-patch/pom.xml | 2 +-
.../mvc-annotation-3.x-plugin/pom.xml | 2 +-
.../mvc-annotation-4.x-plugin/pom.xml | 2 +-
.../mvc-annotation-5.x-plugin/pom.xml | 2 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 2 +-
.../plugin/spring/mvc/commons/ParsePathUtil.java | 8 +-
.../RequestMappingMethodInterceptor.java | 4 +-
.../interceptor/RestMappingMethodInterceptor.java | 2 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +-
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 2 +-
.../spring-cloud/netflix-plugins/pom.xml | 2 +-
.../spring-cloud-feign-1.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-cloud/pom.xml | 2 +-
.../spring-cloud-feign-2.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-commons/pom.xml | 2 +-
.../spring-webflux-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/undertow-plugins/pom.xml | 2 +-
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 2 +-
.../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-test-tools/pom.xml | 2 +-
.../apm-toolkit-log4j-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x-activation/pom.xml | 2 +-
.../apm-toolkit-logback-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-meter-activation/pom.xml | 2 +-
.../apm-toolkit-opentracing-activation/pom.xml | 2 +-
.../apm-toolkit-trace-activation/pom.xml | 2 +-
apm-sniffer/apm-toolkit-activation/pom.xml | 2 +-
.../bootstrap-plugins/jdk-http-plugin/pom.xml | 2 +-
.../bootstrap-plugins/jdk-threading-plugin/pom.xml | 2 +-
apm-sniffer/bootstrap-plugins/pom.xml | 2 +-
.../customize-enhance-plugin/pom.xml | 2 +-
.../optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +-
.../kotlin-coroutine-plugin/pom.xml | 2 +-
.../gateway-2.0.x-plugin/pom.xml | 2 +-
.../gateway-2.1.x-plugin/pom.xml | 2 +-
.../optional-spring-cloud/pom.xml | 2 +-
.../optional-spring-plugins/pom.xml | 2 +-
.../spring-annotation-plugin/pom.xml | 2 +-
.../spring-tx-plugin/pom.xml | 2 +-
apm-sniffer/optional-plugins/pom.xml | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 2 +-
.../zookeeper-3.4.x-plugin/pom.xml | 2 +-
.../kafka-reporter-plugin/pom.xml | 20 ++--
apm-sniffer/optional-reporter-plugins/pom.xml | 5 +-
apm-sniffer/pom.xml | 2 +-
apm-webapp/pom.xml | 2 +-
dist-material/bin/webappService.bat | 2 +-
docs/README.md | 2 +-
docs/en/guides/README.md | 2 -
docs/en/guides/inventory-extension.md | 31 ------
docs/en/setup/backend/backend-fetcher.md | 2 +-
docs/en/setup/backend/configuration-vocabulary.md | 9 +-
.../java-agent/How-to-enable-kafka-reporter.md | 2 +-
docs/en/setup/service-agent/java-agent/README.md | 12 +-
.../service-agent/java-agent/Supported-list.md | 2 +
oap-server/analyzer/agent-analyzer/pom.xml | 2 +-
.../analyzer/provider/AnalyzerModuleConfig.java | 4 +-
oap-server/analyzer/pom.xml | 2 +-
oap-server/exporter/pom.xml | 2 +-
oap-server/oal-grammar/pom.xml | 2 +-
oap-server/oal-rt/pom.xml | 2 +-
oap-server/pom.xml | 2 +-
oap-server/server-alarm-plugin/pom.xml | 2 +-
oap-server/server-bootstrap/pom.xml | 2 +-
.../src/main/resources/component-libraries.yml | 4 +
.../cluster-consul-plugin/pom.xml | 2 +-
.../cluster-etcd-plugin/pom.xml | 2 +-
.../cluster-kubernetes-plugin/pom.xml | 2 +-
.../cluster-nacos-plugin/pom.xml | 2 +-
.../cluster-standalone-plugin/pom.xml | 2 +-
.../cluster-zookeeper-plugin/pom.xml | 2 +-
oap-server/server-cluster-plugin/pom.xml | 2 +-
.../server-configuration/configuration-api/pom.xml | 2 +-
.../configuration-apollo/pom.xml | 2 +-
.../configuration-consul/pom.xml | 2 +-
.../configuration-etcd/pom.xml | 2 +-
.../configuration-k8s-configmap/pom.xml | 6 +-
.../configuration-nacos/pom.xml | 2 +-
.../configuration-zookeeper/pom.xml | 2 +-
.../grpc-configuration-sync/pom.xml | 2 +-
oap-server/server-configuration/pom.xml | 2 +-
oap-server/server-core/pom.xml | 2 +-
.../manual/database/TopNDatabaseStatement.java | 7 +-
.../oap/server/core/analysis/topn/TopN.java | 6 +-
.../analysis/worker/MetricsPersistentWorker.java | 12 +-
.../config/ComponentLibraryCatalogService.java | 9 +-
.../promethues/PrometheusMetricConverter.java | 2 +-
.../oap/server/core/query/input/Duration.java | 2 +-
.../oap/server/core/storage/annotation/Column.java | 8 ++
.../server/core/storage/model/StorageModels.java | 21 +++-
.../core/storage/query/IMetricsQueryDAO.java | 57 ++++++----
.../core/storage/query/MetricsQueryUtilTest.java | 17 ++-
.../kafka-fetcher-plugin/pom.xml | 2 +-
oap-server/server-fetcher-plugin/pom.xml | 2 +-
.../prometheus-fetcher-plugin/pom.xml | 2 +-
oap-server/server-health-checker/pom.xml | 6 +-
oap-server/server-library/library-client/pom.xml | 2 +-
oap-server/server-library/library-module/pom.xml | 2 +-
oap-server/server-library/library-server/pom.xml | 2 +-
oap-server/server-library/library-util/pom.xml | 2 +-
oap-server/server-library/pom.xml | 2 +-
oap-server/server-query-plugin/pom.xml | 2 +-
.../query-graphql-plugin/pom.xml | 2 +-
.../envoy-metrics-receiver-plugin/pom.xml | 2 +-
.../jaeger-receiver-plugin/pom.xml | 2 +-
.../opencensus-receiver-plugin/pom.xml | 6 +-
oap-server/server-receiver-plugin/pom.xml | 2 +-
.../server-receiver-plugin/receiver-proto/pom.xml | 2 +-
.../skywalking-clr-receiver-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
.../skywalking-jvm-receiver-plugin/pom.xml | 2 +-
.../skywalking-management-receiver-plugin/pom.xml | 2 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 2 +-
.../skywalking-meter-receiver-plugin/pom.xml | 2 +-
.../skywalking-profile-receiver-plugin/pom.xml | 2 +-
.../skywalking-sharing-server-plugin/pom.xml | 2 +-
.../skywalking-trace-receiver-plugin/pom.xml | 2 +-
.../zipkin-receiver-plugin/pom.xml | 2 +-
oap-server/server-starter-es7/pom.xml | 2 +-
oap-server/server-starter/pom.xml | 2 +-
oap-server/server-storage-plugin/pom.xml | 2 +-
.../storage-elasticsearch-plugin/pom.xml | 2 +-
.../elasticsearch/query/MetricsQueryEsDAO.java | 3 +-
.../storage-elasticsearch7-plugin/pom.xml | 2 +-
.../storage-influxdb-plugin/pom.xml | 2 +-
.../storage/plugin/influxdb/InfluxClient.java | 9 +-
.../plugin/influxdb/query/AggregationQuery.java | 4 +-
.../storage/plugin/influxdb/query/AlarmQuery.java | 4 +-
.../plugin/influxdb/query/MetricsQuery.java | 4 +-
.../plugin/influxdb/query/TopologyQuery.java | 8 +-
.../storage-jaeger-plugin/pom.xml | 2 +-
.../storage-jdbc-hikaricp-plugin/pom.xml | 2 +-
.../storage-zipkin-plugin/pom.xml | 2 +-
oap-server/server-telemetry/pom.xml | 2 +-
oap-server/server-telemetry/telemetry-api/pom.xml | 2 +-
.../server-telemetry/telemetry-prometheus/pom.xml | 2 +-
oap-server/server-testing/pom.xml | 2 +-
oap-server/server-tools/pom.xml | 2 +-
oap-server/server-tools/profile-exporter/pom.xml | 4 +-
.../tool-profile-snapshot-bootstrap/pom.xml | 4 +-
.../tool-profile-snapshot-exporter-es7/pom.xml | 4 +-
.../tool-profile-snapshot-exporter/pom.xml | 4 +-
.../tool-profile-snapshot-server-mock/pom.xml | 4 +-
pom.xml | 2 +-
skywalking-ui | 2 +-
.../expected/cluster/serviceInstanceTopo.yml | 4 +-
.../expected/gateway/serviceInstanceTopo.yml | 4 +-
.../src/test/resources/expected/gateway/topo.yml | 2 +-
.../scenarios/dubbo-2.7.x-scenario/bin/startup.sh | 3 +-
.../dubbo-2.7.x-scenario/config/expectedData.yaml | 110 ++++++++++---------
.../testcase/dubbo/controller/CaseController.java | 2 +-
.../apm/testcase/dubbo/services/GreetService.java | 2 +-
.../dubbo/services/impl/GreetServiceImpl.java | 6 +-
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 82 +++++++-------
.../configuration.yml | 17 +--
.../{lettuce-scenario => hbase-scenario}/pom.xml | 29 ++---
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/hbase}/Application.java | 2 +-
.../testcase/hbase/controller/HBaseController.java | 106 ++++++++++++++++++
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 6 +-
271 files changed, 863 insertions(+), 562 deletions(-)
copy apm-sniffer/{optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/SpringTXPluginConfig.java => apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboPluginConfig.java} (66%)
copy apm-sniffer/apm-sdk-plugin/{baidu-brpc-plugin => hbase-1.x-plugin}/pom.xml (80%)
create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java => hbase-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java} (61%)
copy apm-sniffer/apm-sdk-plugin/{dubbo-plugin => hbase-1.x-plugin}/src/main/resources/skywalking-plugin.def (91%)
delete mode 100644 docs/en/guides/inventory-extension.md
copy test/plugin/scenarios/{apm-toolkit-trace-scenario => hbase-scenario}/bin/startup.sh (90%)
copy test/plugin/scenarios/{graphql-12.x-scenario => hbase-scenario}/config/expectedData.yaml (53%)
copy test/plugin/scenarios/{lettuce-scenario => hbase-scenario}/configuration.yml (74%)
copy test/plugin/scenarios/{lettuce-scenario => hbase-scenario}/pom.xml (87%)
copy test/plugin/scenarios/{feign-scenario => hbase-scenario}/src/main/assembly/assembly.xml (95%)
copy test/plugin/scenarios/{canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal => hbase-scenario/src/main/java/org/apache/skywalking/apm/testcase/hbase}/Application.java (95%)
create mode 100644 test/plugin/scenarios/hbase-scenario/src/main/java/org/apache/skywalking/apm/testcase/hbase/controller/HBaseController.java
copy test/plugin/scenarios/{pulsar-scenario => hbase-scenario}/src/main/resources/application.properties (95%)
copy test/plugin/scenarios/{zookeeper-scenario => hbase-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/scenarios/{customize-scenario => hbase-scenario}/support-version.list (96%)