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/12/15 14:51:29 UTC
[skywalking] 01/01: Merge commit
'4e501328171f434c74144d373be6df0264f43a24' into more-users
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch more-users
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit c6a71f23c892cfd19362a48a9207f5631632b9b8
Merge: 752f85d 4e50132
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Dec 15 22:50:56 2019 +0800
Merge commit '4e501328171f434c74144d373be6df0264f43a24' into more-users
.github/workflows/ci-it.yaml | 45 +++++++--
.github/workflows/e2e.yaml | 14 +--
.github/workflows/istio-mixer-ci.yaml | 9 +-
.github/workflows/plugins-test.yaml | 6 --
.gitignore | 2 +
CHANGES.md | 11 +++
.../skywalking/apm/agent/core/conf/Config.java | 11 ++-
.../apm/agent/core/context/TracingContext.java | 106 +++++++++++++--------
.../core/context/trace/StackBasedTracingSpan.java | 33 ++++---
.../apm/agent/core/dictionary/DictionaryUtil.java | 7 ++
.../core/dictionary/EndpointNameDictionary.java | 45 ++-------
.../plugin/elasticsearch/v6/RemotePeerCache.java | 2 +-
.../RestHighLevelClientConInterceptorTest.java | 11 +--
.../patch/GetPropertyDescriptorsInterceptor.java | 3 +-
.../resttemplate/async/RestExecuteInterceptor.java | 11 +--
.../resttemplate/sync/RestExecuteInterceptor.java | 15 +--
docker/oap/docker-entrypoint.sh | 14 +--
docs/README.md | 92 +++++++++---------
docs/en/FAQ/README.md | 2 +
docs/en/FAQ/Unexpected-endpoint-register.md | 12 +++
docs/en/FAQ/time-and-timezone.md | 21 ++++
docs/en/guides/Plugin-test.md | 2 +-
...ross-Process-Propagation-Headers-Protocol-v2.md | 2 +
docs/en/setup/README.md | 29 ++++--
docs/en/setup/backend/backend-ui-setup.md | 50 ++++++----
docs/en/setup/service-agent/java-agent/README.md | 3 +
.../service-agent/java-agent/op_name_group_rule.md | 3 +-
install/deploy/skywalking-deploy.sh | 4 +-
.../apache/skywalking/oap/server/core/Const.java | 1 +
.../mesh/ServiceMeshMetricDataDecorator.java | 13 +--
.../handler/v6/grpc/RegisterServiceHandler.java | 21 ++--
.../trace/provider/parser/SegmentParse.java | 2 +-
.../trace/provider/parser/SegmentParseV2.java | 2 +-
.../listener/endpoint/MultiScopesSpanListener.java | 19 +++-
.../listener/segment/SegmentSpanListener.java | 19 +++-
.../standardization/ReferenceIdExchanger.java | 20 +++-
.../{SpanIdExchanger.java => SpanExchanger.java} | 43 +++++----
.../server/receiver/trace/mock/ServiceAMock.java | 9 +-
.../server/receiver/trace/mock/ServiceBMock.java | 6 +-
skywalking-ui | 2 +-
.../config/expectedData.yaml | 11 +--
.../canal-scenario/config/expectedData.yaml | 2 +-
.../config/expectedData.yaml | 2 +-
.../dubbo-2.5.x-scenario/config/expectedData.yaml | 20 +---
.../dubbo-2.7.x-scenario/config/expectedData.yaml | 21 +---
.../ehcache-2.x-scenario/config/expectedData.yaml | 2 +-
.../config/expectedData.yaml | 5 +-
.../config/expectedData.yaml | 5 +-
.../config/expectedData.yaml | 5 +-
.../hystrix-scenario/config/expectedData.yaml | 6 +-
.../jedis-scenario/config/expectedData.yaml | 3 +-
.../jetty-scenario/config/expectedData.yaml | 3 +-
.../kafka-scenario/config/expectedData.yaml | 23 +----
.../mongodb-3.x-scenario/config/expectedData.yaml | 3 +-
.../mysql-scenario/config/expectedData.yaml | 3 +-
.../config/expectedData.yaml | 2 +-
.../okhttp-scenario/config/expectedData.yaml | 12 ++-
.../oracle-scenario/config/expectedData.yaml | 4 +-
.../config/expectedData.yaml | 4 +-
.../postgresql-scenario/config/expectedData.yaml | 4 +-
.../pulsar-scenario/config/expectedData.yaml | 2 +-
.../rabbitmq-scenario/config/expectedData.yaml | 2 +-
.../redisson-scenario/config/expectedData.yaml | 2 +-
.../solrj-7.x-scenario/config/expectedData.yaml | 4 +-
.../spring-3.1.x-scenario/config/expectedData.yaml | 5 +-
.../spring-4.1.x-scenario/config/expectedData.yaml | 4 +-
.../spring-4.3.x-scenario/config/expectedData.yaml | 4 +-
.../spring-async-scenario/config/expectedData.yaml | 4 +-
.../spring-tx-scenario/config/expectedData.yaml | 4 +-
.../undertow-scenario/config/expectedData.yaml | 6 +-
.../webflux-scenario/config/expectedData.yaml | 4 +-
.../tool/validator/assertor/SegmentAssert.java | 4 +-
.../tool/validator/assertor/SegmentRefAssert.java | 12 +--
.../exception/SegmentRefNotFoundException.java | 4 +-
.../tool/validator/entity/SegmentForRead.java | 16 ++--
.../agent/tool/validator/entity/SegmentRef.java | 12 +--
76 files changed, 497 insertions(+), 454 deletions(-)