This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 6edeb17 fix profile main function file link.
add 171620b Add Nginx correlation e2e test (#4646)
add 1dac476 Merge branch 'master' into patch-1
No new revisions were added by this update.
Summary of changes:
.../apm/agent/core/context/CorrelationContext.java | 7 ++++---
.../apm/agent/core/context/CorrelationContextTest.java | 2 +-
.../skywalking/apm/toolkit/trace/TraceContext.java | 0
.../org/apache/skywalking/e2e/lua/LuaController.java | 8 ++++++++
test/e2e/e2e-test/docker/lua/Dockerfile.nginx | 2 +-
test/e2e/e2e-test/docker/lua/nginx.conf | 4 ++--
.../test/java/org/apache/skywalking/e2e/LuaE2E.java | 18 ++++++++++++------
.../src/test/resources/expected/lua/endpoints-end.yml | 4 +---
.../src/test/resources/expected/lua/traces.yml | 2 +-
9 files changed, 30 insertions(+), 17 deletions(-)
copy test/{plugin/scenarios/apm-toolkit-trace-scenario =>
e2e/e2e-service-provider}/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
(100%)
