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/02 01:27:24 UTC
[skywalking] branch pxx-calculate updated (9bbfdf2 -> 978a7f2)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch pxx-calculate
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 9bbfdf2 Fix Pxx calculate bug.
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 978a7f2 Merge branch 'master' into pxx-calculate
No new revisions were added by this update.
Summary of changes:
.../agent/core/context/ids/DistributedTraceId.java | 2 +-
.../apm/agent/core/context/trace/ExitSpan.java | 2 +-
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 ++++++++++++++++++++++
.../register/service/ServiceInventoryRegister.java | 10 ++--
.../src/main/proto/google/api/http.proto | 2 +-
.../service/ServiceMappingSpanListener.java | 13 +++--
skywalking-ui | 2 +-
17 files changed, 262 insertions(+), 36 deletions(-)
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