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/09/01 07:36:17 UTC
[skywalking] branch es_https_ssl updated (5294ad9 -> fac2000)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch es_https_ssl
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 5294ad9 refactoring var name.
add b3a2c64 Update powered-by.md (#3375)
add 54614a0 Support gateway without agent (#3308)
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 fac2000 Merge branch 'master' into es_https_ssl
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 4 +
Jenkinsfile-E2E | 4 +-
.../agent/core/context/ids/DistributedTraceId.java | 2 +-
.../apm/agent/core/context/trace/ExitSpan.java | 2 +-
.../agent/core/logging/core/PatternLoggerTest.java | 31 +---
.../apm/plugin/okhttp/v3/OnFailureInterceptor.java | 2 +-
docs/en/setup/backend/backend-setup.md | 4 +-
docs/en/setup/backend/dynamic-config.md | 1 +
docs/en/setup/backend/uninstrumented-gateways.md | 22 +++
docs/en/setup/envoy/als_setting.md | 26 +++-
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 +++++++++
docs/powered-by.md | 1 +
.../oap/server/core/register/ServiceInventory.java | 10 +-
.../service/IServiceInventoryRegister.java | 12 ++
.../register/service/ServiceInventoryRegister.java | 27 +++-
oap-server/server-library/library-client/pom.xml | 2 +-
.../src/main/proto/google/api/http.proto | 2 +-
.../trace/provider/TraceModuleProvider.java | 26 +++-
.../trace/provider/TraceServiceModuleConfig.java | 1 +
.../provider/UninstrumentedGatewaysConfig.java | 159 +++++++++++++++++++++
.../listener/endpoint/MultiScopesSpanListener.java | 34 +++--
.../service/ServiceMappingSpanListener.java | 55 +++++--
.../transform/SpringSleuthSegmentBuilderTest.java | 5 +-
.../server-starter/src/main/assembly/assembly.xml | 0
.../server-starter/src/main/assembly/gateways.yml | 10 +-
pom.xml | 2 +
skywalking-ui | 2 +-
.../skywalking/e2e/cluster/TestController.java | 2 +-
test/e2e/e2e-cluster/{provider => gateway}/pom.xml | 14 +-
.../apache/skywalking/e2e/GatewayApplication.java} | 9 +-
.../gateway/src/main/resources/application.yml | 15 +-
test/e2e/e2e-cluster/pom.xml | 1 +
test/e2e/e2e-cluster/test-runner/pom.xml | 30 ++--
.../test-runner/src/docker/rc.d/rc0-prepare.sh | 12 +-
.../test-runner/src/docker/rc.d/rc1-startup.sh | 35 +++--
.../skywalking/e2e/ClusterVerificationITCase.java | 62 ++++----
...ywalking.e2e.ClusterVerificationITCase.topo.yml | 6 +
test/e2e/pom.xml | 1 +
47 files changed, 714 insertions(+), 160 deletions(-)
mode change 100644 => 100755 docs/en/setup/backend/dynamic-config.md
create mode 100755 docs/en/setup/backend/uninstrumented-gateways.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
mode change 100644 => 100755 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInventoryRegister.java
mode change 100644 => 100755 oap-server/server-library/library-client/pom.xml
mode change 100644 => 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java
mode change 100644 => 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java
create mode 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/UninstrumentedGatewaysConfig.java
mode change 100644 => 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
mode change 100644 => 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceMappingSpanListener.java
mode change 100644 => 100755 oap-server/server-starter/src/main/assembly/assembly.xml
copy apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService => oap-server/server-starter/src/main/assembly/gateways.yml (81%)
mode change 100644 => 100755
copy test/e2e/e2e-cluster/{provider => gateway}/pom.xml (89%)
copy test/e2e/e2e-cluster/{consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java => gateway/src/main/java/org/apache/skywalking/e2e/GatewayApplication.java} (82%)
copy oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine => test/e2e/e2e-cluster/gateway/src/main/resources/application.yml (82%)
mode change 100644 => 100755 test/e2e/e2e-cluster/test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java