You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/05/21 05:43:01 UTC

[skywalking] branch new-topo updated (c673511 -> adab38f)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch new-topo
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from c673511  Merge branch 'master' into new-topo
     add 6c9613b  Link Go agent project in main repo. (#2697)
     add 3ca7f7b  Support ALS and observe service mesh without Mixer (#2460)
     add 9c2f5c9  Update README.md (#2701)
     add 7b21c33  Fix NPE when ALS is off. (#2715)
     add 90fe05b  Avoid webflux plugin generating many endpoints & optimization http plugin toPath method (#2718)
     add 98b495e  Spring cloud gateways 2.1.x plugin (#2517)
     add 3ebbe7c  Remove the ex which not thrown. & Remove unused logger. (#2710)
     add b7ef10a  Update UI. (#2722)
     add adab38f  Merge branch 'master' into new-topo

No new revisions were added by this update.

Summary of changes:
 README.md                                          |  10 +-
 .../network/trace/component/ComponentsDefine.java  |   3 +
 .../plugin/loader/InterceptorInstanceLoader.java   |   7 +-
 .../webflux/v5/OnInboundNextInterceptor.java       |  11 +-
 .../HttpClientRequestImplEndInterceptor.java       |   5 +-
 .../plugin/vertx3/RouterImplAcceptInterceptor.java |   5 +-
 .../gateway-2.x-plugin}/pom.xml                    |  35 +-
 .../gateway/v2/DefaultHttpHeadersInterceptor.java} |  17 +-
 .../v2/FilteringWebHandlerInterceptor.java}        |  33 +-
 .../HttpClientOperationsHeadersInterceptor.java}   |  21 +-
 .../v2/HttpClientOperationsSendInterceptor.java}   |  69 ++--
 .../v2/HttpClientOperationsStatusInterceptor.java} |  36 +-
 .../define/DefaultHttpHeadersInstrumentation.java} |  29 +-
 .../FilteringWebHandlerInstrumentation.java}       |  21 +-
 .../HttpClientOperationsInstrumentation.java}      |  53 +--
 .../src/main/resources/skywalking-plugin.def       |   5 +-
 .../optional-spring-cloud}/pom.xml                 |  11 +-
 .../optional-spring-plugins/pom.xml                |   1 +
 docker/oap/docker-entrypoint.sh                    |   9 +-
 docs/en/setup/README.md                            |   5 +-
 docs/en/setup/backend/backend-receivers.md         |   2 +-
 docs/en/setup/envoy/als_setting.md                 |  17 +
 .../{README.md => metrics_service_setting.md}      |   0
 docs/en/setup/service-agent/java-agent/README.md   |  11 +-
 .../service-agent/java-agent/Supported-list.md     |   2 +
 oap-server/pom.xml                                 |   2 +-
 .../src/test/resources/component-libraries.yml     |   3 +
 .../envoy-metrics-receiver-plugin/pom.xml          |  10 +
 .../envoy/AccessLogServiceGRPCHandler.java         | 123 +++++++
 .../receiver/envoy/EnvoyMetricReceiverConfig.java} |  24 +-
 .../envoy/EnvoyMetricReceiverProvider.java         |   9 +-
 .../receiver/envoy/als/ALSHTTPAnalysis.java}       |  22 +-
 .../receiver/envoy/als/DependencyResource.java     |  63 ++++
 .../oap/server/receiver/envoy/als/Fetcher.java     |  48 +++
 .../envoy/als/K8sALSServiceMeshHTTPAnalysis.java   | 372 +++++++++++++++++++++
 .../oap/server/receiver/envoy/als/Role.java}       |  22 +-
 .../receiver/envoy/als/ServiceMetaInfo.java}       |  56 ++--
 ....oap.server.receiver.envoy.als.ALSHTTPAnalysis} |   2 +-
 .../receiver/envoy/als/DependencyResourceTest.java |  97 ++++++
 .../receiver/envoy/als/K8sHTTPAnalysisTest.java    | 164 +++++++++
 .../src/test/resources/envoy-ingress.msg           |  89 +++++
 .../src/test/resources/envoy-ingress2sidecar.msg   |  99 ++++++
 .../test/resources/envoy-mesh-client-sidecar.msg   |  92 +++++
 .../test/resources/envoy-mesh-server-sidecar.msg   |  96 ++++++
 .../src/main/proto/envoy/api/v2/core/address.proto | 121 +++++++
 .../src/main/proto/envoy/api/v2/core/base.proto    | 176 ++++++++++
 .../proto/envoy/data/accesslog/v2/accesslog.proto  | 335 +++++++++++++++++++
 .../proto/envoy/service/accesslog/v2/als.proto     |  73 ++++
 .../mesh/ServiceMeshMetricDataDecorator.java       |  17 +-
 .../receiver/mesh/TelemetryDataDispatcher.java     |  30 +-
 .../src/main/assembly/application.yml              |   1 +
 .../src/main/resources/application.yml             |   1 +
 .../src/main/resources/component-libraries.yml     |   3 +
 skywalking-ui                                      |   2 +-
 54 files changed, 2332 insertions(+), 238 deletions(-)
 copy {apm-checkstyle => apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin}/pom.xml (61%)
 copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableConstructInterceptor.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/DefaultHttpHeadersInterceptor.java} (76%)
 copy apm-sniffer/optional-plugins/{lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java => optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/FilteringWebHandlerInterceptor.java} (70%)
 copy apm-sniffer/optional-plugins/{lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AbstractRedisClientInterceptor.java => optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/HttpClientOperationsHeadersInterceptor.java} (72%)
 copy apm-sniffer/{apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplEndInterceptor.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/HttpClientOperationsSendInterceptor.java} (59%)
 copy apm-sniffer/{apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/StatusInterceptor.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/HttpClientOperationsStatusInterceptor.java} (70%)
 copy apm-sniffer/{apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/ClusterNodeInstrumentation.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/define/DefaultHttpHeadersInstrumentation.java} (67%)
 copy apm-sniffer/optional-plugins/{zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/EventThreadInstrumentation.java => optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/define/FilteringWebHandlerInstrumentation.java} (76%)
 copy apm-sniffer/{apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/define/HttpClientOperationsInstrumentation.java} (58%)
 copy apm-sniffer/{apm-sdk-plugin/activemq-5.x-plugin => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin}/src/main/resources/skywalking-plugin.def (67%)
 copy apm-sniffer/{apm-sdk-plugin/spring-plugins/spring-cloud => optional-plugins/optional-spring-plugins/optional-spring-cloud}/pom.xml (80%)
 create mode 100644 docs/en/setup/envoy/als_setting.md
 rename docs/en/setup/envoy/{README.md => metrics_service_setting.md} (100%)
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java
 copy oap-server/{exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterSetting.java => server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java} (61%)
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/SourceDispatcher.java => server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/ALSHTTPAnalysis.java} (56%)
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/DependencyResource.java
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/Fetcher.java
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
 copy oap-server/{server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ReusableWatch.java => server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/Role.java} (74%)
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java => server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/ServiceMetaInfo.java} (50%)
 copy oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/resources/META-INF/services/{org.apache.skywalking.oap.server.library.module.ModuleDefine => org.apache.skywalking.oap.server.receiver.envoy.als.ALSHTTPAnalysis} (90%)
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/DependencyResourceTest.java
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sHTTPAnalysisTest.java
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/resources/envoy-ingress.msg
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/resources/envoy-ingress2sidecar.msg
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/resources/envoy-mesh-client-sidecar.msg
 create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/resources/envoy-mesh-server-sidecar.msg
 create mode 100644 oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/api/v2/core/address.proto
 create mode 100644 oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto
 create mode 100644 oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/accesslog/v2/als.proto