This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch service_props
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 6e12a3f add props when in query services.
add 77736c5 okhttp OnFailureInterceptor should log exception info (#3381)
add 6fd85c8 Avoid unnecessary resetting when service mapping id is
already 0 (#3383)
add 3d8d284 sync ui (#3387)
add 70b825c fix typo (#3388)
add 63b033d Add istio bypass adaptor setup document back (#3376)
add 53a1ae8 docs: Improve envoy metrics sending setup documentation
(#3389)
add 2a2679e Fix Pxx calculate bug. (#3391)
add dbbf22a support es https ssl config. (#3370)
add 7f5ac23 fix bug (#3393)
add c0bb891 UI sync (#3399)
add b0d3598 Add changelog for 6.4.0 release. (#3398)
add 05d9c0a MOD: Modify compatibility of kafka plugin and expand
operationName (#3390)
add 36a3601 #106 cache/persist page query states (#3406)
add dc37803 add vue-js-modal license. (#3415)
add d6a8461 UI Sync #3396 can the page of span info be expanded manually
(#3418)
add 44556ae gateway & webflux compatible with these scene (#3419)
add a690f67 add gateway.yml to avoid unnecessary errors (#3426)
add 55d3fa5 add ui lodash depend license (#3433)
add a6cbf37 Sync UI. (#3438)
add ce20fe1 Move to 6.5.0 (#3439)
add 721f864 Add TTL E2E test (#3437)
add e1ce6ed Fill my FAQ reply in official document. (#3450)
add 96b2baa spring-cloud-gateway traceid does not transmit #3411 (#3446)
add b5b088a Gateway compatible with downstream loss (#3445)
add db67b87 Update docker-entrypoint.sh (#3465)
add 919988f sync ui (#3468)
add bb0b3d3 provide cassandra java driver 3.x plugin (#3410)
add 876b60c Update ALS setup doc as istio 1.3 released (#3470)
add e08ae83 Merge branch 'master' into service_props
No new revisions were added by this update.
Summary of changes:
.gitmodules | 3 +
CHANGES.md | 58 +++++
Jenkinsfile-E2E | 11 +-
.../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-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/pom.xml | 2 +-
apm-dist/release-docs/LICENSE | 2 +
.../licenses/ui-licenses/LICENSE-lodash | 31 ++-
...E-vue-datepicker-local => LICENSE-vue-js-modal} | 4 +-
apm-protocol/apm-network/pom.xml | 2 +-
.../network/trace/component/ComponentsDefine.java | 2 +
apm-protocol/pom.xml | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 2 +-
.../agent/core/context/ids/DistributedTraceId.java | 2 +-
.../apm/agent/core/context/trace/ExitSpan.java | 2 +-
apm-sniffer/apm-agent/pom.xml | 2 +-
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +-
.../cassandra-java-driver-3.x-plugin}/pom.xml | 28 +-
.../java/driver/v3/ClusterConnectInterceptor.java} | 29 ++-
...onstructorWithStateListenerArgInterceptor.java} | 34 +--
.../cassandra/java/driver/v3/ConnectionInfo.java | 29 +--
.../cassandra/java/driver/v3}/Constants.java | 8 +-
...ultSetFutureGetUninterruptiblyInterceptor.java} | 35 ++-
...AndExecuteAsyncWithStatementArgInterceptor.java | 84 ++++++
.../driver/v3/define/ClusterInstrumentation.java} | 33 ++-
.../DefaultResultSetFutureInstrumentation.java} | 29 +--
.../v3/define/SessionManagerInstrumentation.java} | 33 ++-
.../src/main/resources/skywalking-plugin.def | 40 ++-
.../driver/v3/ClusterConnectInterceptorTest.java} | 67 +++--
...ructorWithStateListenerArgInterceptorTest.java} | 71 +++---
...etFutureGetUninterruptiblyInterceptorTest.java} | 48 ++--
...ecuteAsyncWithStatementArgInterceptorTest.java} | 47 ++--
.../dubbo-2.7.x-conflict-patch/pom.xml | 2 +-
.../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +-
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
.../feign-default-http-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +-
.../httpasyncclient-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
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 +-
.../{kafka-v1-plugin => kafka-plugin}/pom.xml | 4 +-
.../apm/plugin/kafka/CallbackInterceptor.java} | 69 ++---
.../kafka}/ConsumerConstructorInterceptor.java | 6 +-
.../plugin/kafka}/ConsumerEnhanceRequiredInfo.java | 11 +-
.../plugin/kafka}/KafkaConsumerInterceptor.java | 8 +-
.../plugin/kafka}/KafkaProducerInterceptor.java | 33 ++-
.../kafka}/ProducerConstructorInterceptor.java | 7 +-
.../kafka/ProducerConstructorMapInterceptor.java} | 18 +-
.../plugin/kafka}/SubscribeMethodInterceptor.java | 2 +-
.../define/AbstractKafkaInstrumentation.java | 2 +-
.../kafka}/define/CallbackInstrumentation.java | 4 +-
.../define/KafkaConsumerInstrumentation.java | 13 +-
.../define/KafkaProducerInstrumentation.java | 39 +--
.../define/KafkaProducerMapInstrumentation.java} | 24 +-
.../src/main}/resources/skywalking-plugin.def | 5 +-
.../apm/plugin/kafka}/CallbackInterceptorTest.java | 15 +-
.../kafka}/ConsumerConstructorInterceptorTest.java | 5 +-
.../kafka}/KafkaConsumerInterceptorTest.java | 20 +-
.../kafka}/KafkaProducerInterceptorTest.java | 14 +-
.../kafka}/ProducerConstructorInterceptorTest.java | 8 +-
.../kafka}/SubscribeMethodInterceptorTest.java | 11 +-
.../apm/plugin/kafka/v1/CallbackInterceptor.java | 57 -----
.../v1/ProducerRecordConstructorInterceptor.java | 29 ---
.../v1/define/ProducerRecordInstrumentation.java | 56 ----
.../src/main/resources/skywalking-plugin.def | 20 --
.../ProducerRecordConstructorInterceptorTest.java | 60 -----
.../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 +-
.../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/plugin/okhttp/v3/OnFailureInterceptor.java | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 5 +-
.../apm-sdk-plugin/postgresql-8.x-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.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 +-
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-plugins/spring-commons/pom.xml | 2 +-
.../spring-plugins/webflux-5.x-plugin/pom.xml | 2 +-
...> AbstractServerResponseMethodInterceptor.java} | 36 +--
.../DispatcherHandlerHandleMethodInterceptor.java | 59 +++--
...atcherHandlerHandleResultMethodInterceptor.java | 12 +-
...tcherHandlerInvokeHandlerMethodInterceptor.java | 38 +--
...> ServerWebExchangeConstructorInterceptor.java} | 2 +-
... => AbstractServerResponseInstrumentation.java} | 7 +-
....java => ServerWebExchangeInstrumentation.java} | 4 +-
.../src/main/resources/skywalking-plugin.def | 4 +-
.../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 | 5 +-
.../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 +-
apm-sniffer/bootstrap-plugins/pom.xml | 2 +-
.../customize-enhance-plugin/pom.xml | 2 +-
.../optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +-
.../optional-plugins/lettuce-5.x-plugin/pom.xml | 2 +-
.../gateway-2.1.x-plugin/pom.xml | 2 +-
.../v21x/NettyRoutingFilterInterceptor.java | 49 +++-
.../optional-spring-cloud/pom.xml | 2 +-
.../optional-spring-plugins/pom.xml | 2 +-
.../spring-annotation-plugin/pom.xml | 2 +-
.../optional-plugins/play-2.x-plugin/pom.xml | 5 +-
apm-sniffer/optional-plugins/pom.xml | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 2 +-
.../zookeeper-3.4.x-plugin/pom.xml | 2 +-
apm-sniffer/pom.xml | 2 +-
apm-webapp/pom.xml | 2 +-
docker/oap/docker-entrypoint.sh | 24 ++
docs/en/FAQ/MQ-involved-architecture.png | Bin 0 -> 35911 bytes
docs/en/FAQ/README.md | 3 +
docs/en/FAQ/why_mq_not_involved.md | 26 ++
docs/en/concepts-and-designs/overview.md | 1 +
docs/en/setup/backend/backend-storage.md | 30 +++
docs/en/setup/backend/ttl.md | 1 +
docs/en/setup/envoy/als_setting.md | 13 +-
docs/en/setup/envoy/config.yaml | 20 +-
.../en/setup/envoy/examples/metrics/Makefile | 11 +-
docs/en/setup/envoy/examples/metrics/README.md | 56 ++++
.../envoy/examples/metrics/docker-compose.yaml | 25 +-
.../{config.yaml => examples/metrics/envoy.yaml} | 23 +-
.../en/setup/envoy/examples/metrics}/log4j2.xml | 2 +
docs/en/setup/istio/README.md | 3 +-
docs/en/setup/istio/yaml/01-metrictemplate.yml | 24 ++
.../en/setup/istio/yaml/02-skywalingadapter.yml | 12 +-
docs/en/setup/istio/yaml/03-operator_cfg.yml | 65 +++++
.../service-agent/java-agent/Supported-list.md | 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 +-
.../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-etcd/pom.xml | 2 +-
.../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 +-
.../oap/server/core/CoreModuleConfig.java | 1 +
.../oap/server/core/CoreModuleProvider.java | 2 +-
.../server/core/analysis/metrics/PxxMetrics.java | 8 +-
.../register/service/ServiceInventoryRegister.java | 10 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 28 +-
.../core/analysis/metrics/PxxMetricsTest.java | 44 +++-
.../src/test/resources/component-libraries.yml | 9 +-
oap-server/server-library/library-buffer/pom.xml | 2 +-
oap-server/server-library/library-client/pom.xml | 2 +-
.../oap/server/library/client/Client.java | 2 +-
.../client/elasticsearch/ElasticSearchClient.java | 52 +++-
.../elasticsearch/ITElasticSearchClient.java | 28 +-
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 +-
oap-server/server-receiver-plugin/pom.xml | 2 +-
.../server-receiver-plugin/receiver-proto/pom.xml | 2 +-
.../src/main/proto/google/api/http.proto | 2 +-
.../skywalking-clr-receiver-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
.../skywalking-jvm-receiver-plugin/pom.xml | 2 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 2 +-
.../skywalking-register-receiver-plugin/pom.xml | 2 +-
.../skywalking-sharing-server-plugin/pom.xml | 2 +-
.../skywalking-so11y-receiver-plugin/pom.xml | 2 +-
.../skywalking-trace-receiver-plugin/pom.xml | 2 +-
.../service/ServiceMappingSpanListener.java | 13 +-
.../zipkin-receiver-plugin/pom.xml | 2 +-
oap-server/server-starter/pom.xml | 3 +-
.../src/main/assembly/application.yml | 3 +
.../server-starter/src/main/assembly/assembly.xml | 1 +
.../src/main/resources/application.yml | 3 +
.../src/main/resources/component-libraries.yml | 9 +-
oap-server/server-storage-plugin/pom.xml | 2 +-
.../storage-elasticsearch-plugin/pom.xml | 2 +-
.../StorageModuleElasticsearchConfig.java | 5 +-
.../StorageModuleElasticsearchProvider.java | 57 ++++-
.../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 +-
.../server-telemetry/telemetry-so11y/pom.xml | 2 +-
oap-server/server-testing/pom.xml | 2 +-
pom.xml | 2 +-
skywalking-ui | 2 +-
.../org/apache/skywalking/e2e/AbstractQuery.java | 52 +++-
...etricsMatcher.java => AllOfMetricsMatcher.java} | 22 +-
.../e2e/verification/AbstractMatcher.java | 10 +
.../test-runner => e2e-ttl/e2e-ttl-es}/pom.xml | 142 +++++------
.../e2e-ttl-es/src/docker/es_storage.awk} | 30 +--
.../e2e-ttl-es/src/docker/rc.d/rc0-prepare.sh | 18 +-
.../e2e-ttl-es}/src/docker/rc.d/rc1-startup.sh | 34 +--
.../e2e/e2e-ttl/e2e-ttl-es}/src/main/proto | 0
.../apache/skywalking/e2e/StorageTTLITCase.java | 284 +++++++++++++++++++++
test/e2e/{e2e-cluster => e2e-ttl}/pom.xml | 11 +-
test/e2e/pom.xml | 5 +-
267 files changed, 1877 insertions(+), 1160 deletions(-)
copy licenses/LICENSE-antd.txt =>
apm-dist/release-docs/licenses/ui-licenses/LICENSE-lodash (52%)
copy apm-dist/release-docs/licenses/ui-licenses/{LICENSE-vue-datepicker-local
=> LICENSE-vue-js-modal} (96%)
mode change 100755 => 100644
copy apm-sniffer/{optional-plugins/play-2.x-plugin =>
apm-sdk-plugin/cassandra-java-driver-3.x-plugin}/pom.xml (68%)
copy
apm-sniffer/apm-sdk-plugin/{undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptor.java
=>
cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptor.java}
(69%)
copy
apm-sniffer/apm-sdk-plugin/{spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptor.java
=>
cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptor.java}
(60%)
copy
apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java
=>
apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ConnectionInfo.java
(62%)
copy
apm-sniffer/apm-sdk-plugin/{mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define
=>
cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3}/Constants.java
(79%)
copy
apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ParseInterceptor.java
=>
cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptor.java}
(68%)
create mode 100644
apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptor.java
copy
apm-sniffer/apm-sdk-plugin/{redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisConnectionInstrumentation.java
=>
cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/ClusterInstrumentation.java}
(72%)
copy
apm-sniffer/{apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterActivation.java
=>
apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/DefaultResultSetFutureInstrumentation.java}
(77%)
copy
apm-sniffer/apm-sdk-plugin/{undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowRootHandlerInstrumentation.java
=>
cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/SessionManagerInstrumentation.java}
(74%)
copy apm-sniffer/apm-sdk-plugin/{httpasyncclient-4.x-plugin =>
cassandra-java-driver-3.x-plugin}/src/main/resources/skywalking-plugin.def (68%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptorTest.java
=>
cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptorTest.java}
(55%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptorTest.java
=>
cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptorTest.java}
(50%)
copy
apm-sniffer/apm-sdk-plugin/{mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptorTest.java
=>
cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptorTest.java}
(57%)
copy
apm-sniffer/apm-sdk-plugin/{mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptorTest.java
=>
cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptorTest.java}
(63%)
rename apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin => kafka-plugin}/pom.xml
(94%)
copy
apm-sniffer/{bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java
=>
apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptor.java}
(60%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/ConsumerConstructorInterceptor.java
(91%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/ConsumerEnhanceRequiredInfo.java
(87%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/KafkaConsumerInterceptor.java
(94%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/KafkaProducerInterceptor.java
(73%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/ProducerConstructorInterceptor.java
(86%)
copy
apm-sniffer/apm-sdk-plugin/{redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorMapInterceptor.java}
(73%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/SubscribeMethodInterceptor.java
(97%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/define/AbstractKafkaInstrumentation.java
(95%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/define/CallbackInstrumentation.java
(95%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/define/KafkaConsumerInstrumentation.java
(90%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1
=>
kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka}/define/KafkaProducerInstrumentation.java
(71%)
copy
apm-sniffer/{optional-plugins/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClientInstrumentation.java
=>
apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerMapInstrumentation.java}
(73%)
copy apm-sniffer/{apm-agent-core/src/test =>
apm-sdk-plugin/kafka-plugin/src/main}/resources/skywalking-plugin.def (67%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11
=>
kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka}/CallbackInterceptorTest.java
(89%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11
=>
kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka}/ConsumerConstructorInterceptorTest.java
(92%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11
=>
kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka}/KafkaConsumerInterceptorTest.java
(91%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11
=>
kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka}/KafkaProducerInterceptorTest.java
(88%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11
=>
kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka}/ProducerConstructorInterceptorTest.java
(94%)
rename
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11
=>
kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka}/SubscribeMethodInterceptorTest.java
(92%)
delete mode 100644
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java
delete mode 100644
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/ProducerRecordConstructorInterceptor.java
delete mode 100644
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
delete mode 100644
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/resources/skywalking-plugin.def
delete mode 100644
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/ProducerRecordConstructorInterceptorTest.java
rename
apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/{BodyInserterResponseMethodInterceptor.java
=> AbstractServerResponseMethodInterceptor.java} (67%)
rename
apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/{DefaultServerWebExchangeConstructorInterceptor.java
=> ServerWebExchangeConstructorInterceptor.java} (91%)
rename
apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/{BodyInserterResponseInstrumentation.java
=> AbstractServerResponseInstrumentation.java} (88%)
rename
apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/{DefaultServerWebExchangeInstrumentation.java
=> ServerWebExchangeInstrumentation.java} (93%)
create mode 100644 docs/en/FAQ/MQ-involved-architecture.png
create mode 100644 docs/en/FAQ/why_mq_not_involved.md
copy test/e2e/e2e-cluster/consumer/src/main/resources/application.yml =>
docs/en/setup/envoy/examples/metrics/Makefile (91%)
create mode 100644 docs/en/setup/envoy/examples/metrics/README.md
copy
test/e2e/e2e-agent-reboot/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml
=> docs/en/setup/envoy/examples/metrics/docker-compose.yaml (66%)
copy docs/en/setup/envoy/{config.yaml => examples/metrics/envoy.yaml} (73%)
copy {docker/oap => docs/en/setup/envoy/examples/metrics}/log4j2.xml (90%)
create mode 100755 docs/en/setup/istio/yaml/01-metrictemplate.yml
copy
apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/resources/skywalking-plugin.def
=> docs/en/setup/istio/yaml/02-skywalingadapter.yml (81%)
mode change 100644 => 100755
create mode 100755 docs/en/setup/istio/yaml/03-operator_cfg.yml
copy
test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/{AtLeastOneOfMetricsMatcher.java
=> AllOfMetricsMatcher.java} (74%)
copy test/e2e/{e2e-cluster/test-runner => e2e-ttl/e2e-ttl-es}/pom.xml (58%)
mode change 100755 => 100644
copy test/e2e/{e2e-cluster/test-runner/src/docker/clusterize.awk =>
e2e-ttl/e2e-ttl-es/src/docker/es_storage.awk} (68%)
copy apm-dist/bin/startup.sh =>
test/e2e/e2e-ttl/e2e-ttl-es/src/docker/rc.d/rc0-prepare.sh (61%)
mode change 100644 => 100755
copy test/e2e/{e2e-agent-reboot =>
e2e-ttl/e2e-ttl-es}/src/docker/rc.d/rc1-startup.sh (59%)
copy {apm-protocol/apm-network => test/e2e/e2e-ttl/e2e-ttl-es}/src/main/proto
(100%)
create mode 100644
test/e2e/e2e-ttl/e2e-ttl-es/src/test/java/org/apache/skywalking/e2e/StorageTTLITCase.java
copy test/e2e/{e2e-cluster => e2e-ttl}/pom.xml (87%)
