From e8be63465c44142bdfca49d6c86762096733f552 Mon Sep 17 00:00:00 2001 From: Daming Date: Sat, 25 Apr 2020 23:35:47 +0800 Subject: [PATCH] More strict PluginTests expected data verifier (#4713) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * More strict PluginTests expected data verifier * remove unnecessary file Co-authored-by: 吴晟 Wu Sheng --- .../main/resources/docker-compose.template | 1 + .../config/expectedData.yaml | 22 +++++++------- .../avro-scenario/config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 2 +- .../feign-scenario/config/expectedData.yaml | 16 +++++----- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 17 ++++++++--- .../config/expectedData.yaml | 2 +- .../grpc-scenario/config/expectedData.yaml | 30 +++++++++---------- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 2 +- .../hystrix-scenario/config/expectedData.yaml | 4 +-- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 4 +-- .../jetty-scenario/config/expectedData.yaml | 4 +-- .../kafka-scenario/config/expectedData.yaml | 4 +-- .../config/expectedData.yaml | 4 +-- .../okhttp-scenario/config/expectedData.yaml | 8 ++--- .../pulsar-scenario/config/expectedData.yaml | 4 +-- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 8 ++--- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 2 +- .../sofarpc-scenario/config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 10 +++---- .../config/expectedData.yaml | 10 +++---- .../config/expectedData.yaml | 16 +++++----- .../config/expectedData.yaml | 4 +-- .../config/expectedData.yaml | 4 +-- .../config/expectedData.yaml | 4 +-- .../config/expectedData.yaml | 16 +++++----- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 6 ++-- 36 files changed, 118 insertions(+), 108 deletions(-) diff --git a/test/plugin/runner-helper/src/main/resources/docker-compose.template b/test/plugin/runner-helper/src/main/resources/docker-compose.template index 5fc96d664..f7b680332 100644 --- a/test/plugin/runner-helper/src/main/resources/docker-compose.template +++ b/test/plugin/runner-helper/src/main/resources/docker-compose.template @@ -46,6 +46,7 @@ services: - SCENARIO_ENTRY_SERVICE=${entry_service} - SCENARIO_HEALTH_CHECK_URL=${health_check} - SCENARIO_EXTEND_ENTRY_HEADER=${extend_entry_header} + - DEBUG_MODE=${debug_mode} volumes: - ${agent_home}:/usr/local/skywalking/scenario/agent - ${scenario_home}:/usr/local/skywalking/scenario diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml b/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml index b61a3c5f2..0e66dddc7 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml @@ -151,8 +151,8 @@ segmentItems: skipAnalysis: 'true' refs: - {parentEndpoint: /app, networkAddress: '127.0.0.1:8080', refType: CrossProcess, - parentSpanId: 4, parentTraceSegmentId: 1.2.3, parentServiceInstance: instance, - parentService: service, traceId: 3.4.5} + parentSpanId: 4, parentTraceSegmentId: 1.2.3, parentServiceInstance: instance, + parentService: service, traceId: 3.4.5} - segmentId: not null spans: - operationName: /case/asyncVisit/callable @@ -173,8 +173,8 @@ segmentItems: refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.CallableWrapper/call, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: apm-toolkit-trace-scenario, + traceId: not null} skipAnalysis: 'true' - segmentId: not null spans: @@ -207,7 +207,7 @@ segmentItems: refs: - {parentEndpoint: /case/tool-kit, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: apm-toolkit-trace-scenario, traceId: not null} skipAnalysis: 'true' - segmentId: not null spans: @@ -240,7 +240,7 @@ segmentItems: refs: - {parentEndpoint: /case/tool-kit, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: apm-toolkit-trace-scenario, traceId: not null} skipAnalysis: 'true' - segmentId: not null spans: @@ -262,8 +262,8 @@ segmentItems: refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.RunnableWrapper/run, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: apm-toolkit-trace-scenario, + traceId: not null} skipAnalysis: 'true' - segmentId: not null spans: @@ -296,7 +296,7 @@ segmentItems: refs: - {parentEndpoint: /case/tool-kit, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: apm-toolkit-trace-scenario, traceId: not null} skipAnalysis: 'true' - segmentId: not null spans: @@ -318,6 +318,6 @@ segmentItems: refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.SupplierWrapper/get, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: apm-toolkit-trace-scenario, + traceId: not null} skipAnalysis: 'true' diff --git a/test/plugin/scenarios/avro-scenario/config/expectedData.yaml b/test/plugin/scenarios/avro-scenario/config/expectedData.yaml index 24189fff0..cd9b9fcc7 100644 --- a/test/plugin/scenarios/avro-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/avro-scenario/config/expectedData.yaml @@ -33,7 +33,7 @@ segmentItems: refs: - {parentEndpoint: /avro-scenario/case/avro-scenario, networkAddress: 'localhost/127.0.0.1:9018', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: avro-client, traceId: not null} skipAnalysis: 'false' - serviceName: avro-client segmentSize: ge 2 diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/dubbo-2.5.x-scenario/config/expectedData.yaml index 382e9e81c..c243c4806 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/config/expectedData.yaml @@ -35,7 +35,7 @@ segmentItems: refs: - {parentEndpoint: /dubbo-2.5.x-scenario/case/dubbo, networkAddress: 'localhost:20080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: dubbo-2.5.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/dubbo-2.7.x-scenario/config/expectedData.yaml index dd672d45c..ffc15904b 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/config/expectedData.yaml @@ -35,7 +35,7 @@ segmentItems: refs: - {parentEndpoint: /dubbo-2.7.x-scenario/case/dubbo, networkAddress: 'localhost:20080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: dubbo-2.7.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/feign-scenario/config/expectedData.yaml b/test/plugin/scenarios/feign-scenario/config/expectedData.yaml index 2c8598bda..6015330a2 100644 --- a/test/plugin/scenarios/feign-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/feign-scenario/config/expectedData.yaml @@ -35,8 +35,8 @@ segmentItems: - {key: http.method, value: POST} refs: - {parentEndpoint: /feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', - refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, - parentServiceInstance: not null, parentService: not null, traceId: not null} + refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not + null, parentService: feign-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -56,8 +56,8 @@ segmentItems: - {key: http.method, value: GET} refs: - {parentEndpoint: /feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', - refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, - parentServiceInstance: not null, parentService: not null, traceId: not null} + refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not + null, parentService: feign-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -77,8 +77,8 @@ segmentItems: - {key: http.method, value: PUT} refs: - {parentEndpoint: /feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', - refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, - parentServiceInstance: not null, parentService: not null, traceId: not null} + refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not + null, parentService: feign-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -98,8 +98,8 @@ segmentItems: - {key: http.method, value: DELETE} refs: - {parentEndpoint: /feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', - refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, - parentServiceInstance: not null, parentService: not null, traceId: not null} + refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not + null, parentService: feign-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/finagle-17.10.x-scenario/config/expectedData.yaml index 647442dbe..741e2cfd3 100644 --- a/test/plugin/scenarios/finagle-17.10.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/finagle-17.10.x-scenario/config/expectedData.yaml @@ -33,7 +33,7 @@ segmentItems: refs: - {parentEndpoint: /finagle-17.10.x-scenario/case/finagle, networkAddress: '127.0.0.1:12220', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: finagle-17.10.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml index 7a8c09c52..26ab6586d 100644 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml @@ -33,13 +33,22 @@ segmentItems: refs: - {parentEndpoint: /finagle-6.25.x-scenario/case/finagle, networkAddress: '127.0.0.1:12220', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: 'finagle-6.25.x-scenario', traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: - - {operationName: hello, operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: RPCFramework, - startTime: nq 0, endTime: nq 0, componentId: 85, isError: false, spanType: Exit, - peer: '127.0.0.1:12220', skipAnalysis: 'false'} + - operationName: hello + operationId: 0 + parentSpanId: 0 + spanId: 1 + spanLayer: RPCFramework + startTime: nq 0 + endTime: nq 0 + componentId: 85 + isError: false + spanType: Exit + peer: '127.0.0.1:12220' + skipAnalysis: 'false' - operationName: /finagle-6.25.x-scenario/case/finagle operationId: 0 parentSpanId: -1 diff --git a/test/plugin/scenarios/finagle-6.44.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/finagle-6.44.x-scenario/config/expectedData.yaml index fc4b410f2..97d50d29e 100644 --- a/test/plugin/scenarios/finagle-6.44.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/finagle-6.44.x-scenario/config/expectedData.yaml @@ -33,7 +33,7 @@ segmentItems: refs: - {parentEndpoint: /finagle-6.44.x-scenario/case/finagle, networkAddress: '127.0.0.1:12220', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: finagle-6.44.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/grpc-scenario/config/expectedData.yaml b/test/plugin/scenarios/grpc-scenario/config/expectedData.yaml index a7900c940..d92679aef 100644 --- a/test/plugin/scenarios/grpc-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/grpc-scenario/config/expectedData.yaml @@ -33,7 +33,7 @@ segmentItems: refs: - {parentEndpoint: /grpc-scenario/case/grpc-scenario, networkAddress: '127.0.0.1:18080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -69,7 +69,7 @@ segmentItems: refs: - {parentEndpoint: /grpc-scenario/case/grpc-scenario, networkAddress: '', refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -87,7 +87,7 @@ segmentItems: refs: - {parentEndpoint: /grpc-scenario/case/grpc-scenario, networkAddress: '', refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -105,7 +105,7 @@ segmentItems: refs: - {parentEndpoint: /grpc-scenario/case/grpc-scenario, networkAddress: '127.0.0.1:18080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -177,7 +177,7 @@ segmentItems: refs: - {parentEndpoint: GreeterBlocking.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - operationName: GreeterBlocking.sayHello/server/Request/onComplete operationId: 0 @@ -193,7 +193,7 @@ segmentItems: refs: - {parentEndpoint: GreeterBlocking.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -211,7 +211,7 @@ segmentItems: refs: - {parentEndpoint: Greeter.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - operationName: Greeter.sayHello/server/Request/onMessage operationId: 0 @@ -227,7 +227,7 @@ segmentItems: refs: - {parentEndpoint: Greeter.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -247,7 +247,7 @@ segmentItems: refs: - {parentEndpoint: Greeter.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - operationName: Greeter.sayHello/server/Request/onComplete operationId: 0 @@ -263,7 +263,7 @@ segmentItems: refs: - {parentEndpoint: Greeter.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -281,7 +281,7 @@ segmentItems: refs: - {parentEndpoint: /grpc-scenario/case/grpc-scenario, networkAddress: '', refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -299,7 +299,7 @@ segmentItems: refs: - {parentEndpoint: /grpc-scenario/case/grpc-scenario, networkAddress: '', refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -317,7 +317,7 @@ segmentItems: refs: - {parentEndpoint: /grpc-scenario/case/grpc-scenario, networkAddress: '127.0.0.1:18080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -343,7 +343,7 @@ segmentItems: refs: - {parentEndpoint: GreeterBlockingError.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - operationName: GreeterBlockingError.sayHello/server/Request/onComplete operationId: 0 @@ -359,7 +359,7 @@ segmentItems: refs: - {parentEndpoint: GreeterBlockingError.sayHello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: grpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/httpclient-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/httpclient-3.x-scenario/config/expectedData.yaml index 8e0f62f80..890791b19 100644 --- a/test/plugin/scenarios/httpclient-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/httpclient-3.x-scenario/config/expectedData.yaml @@ -36,7 +36,7 @@ segmentItems: refs: - {parentEndpoint: /httpclient-3.x-scenario/case/httpclient, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: httpclient-3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/httpclient-4.3.x-scenario/config/expectedData.yaml index c3f7746df..2fcd7aec9 100644 --- a/test/plugin/scenarios/httpclient-4.3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/config/expectedData.yaml @@ -36,7 +36,7 @@ segmentItems: refs: - {parentEndpoint: /httpclient-4.3.x-scenario/case/httpclient, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: httpclient-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml b/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml index f46fce1c0..37afd5892 100644 --- a/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml @@ -39,7 +39,7 @@ segmentItems: refs: - {parentEndpoint: /case/hystrix-scenario, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: hystrix-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -57,7 +57,7 @@ segmentItems: refs: - {parentEndpoint: Hystrix/TestACommand/Execution, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: hystrix-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml index 8ac6f760a..f60ab841f 100644 --- a/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml @@ -36,7 +36,7 @@ segmentItems: refs: - {parentEndpoint: /jdk-http-scenario/case/jdk-http-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: jdk-http-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml index bc1e86537..4f05c0479 100644 --- a/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml @@ -65,7 +65,7 @@ segmentItems: refs: - {parentEndpoint: '/greet/{username}', networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: jdk-threading-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -98,5 +98,5 @@ segmentItems: refs: - {parentEndpoint: '/greet/{username}', networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: jdk-threading-scenario, traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml b/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml index a99e546d4..5724c5e72 100644 --- a/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml @@ -35,8 +35,8 @@ segmentItems: - {key: http.method, value: GET} refs: - {parentEndpoint: /jettyclient-case/case/jettyclient-case, networkAddress: 'localhost:18080', - refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, - parentServiceInstance: not null, parentService: not null, traceId: not null} + refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not + null, parentService: jettyclient-scenario, traceId: not null} skipAnalysis: 'false' - serviceName: jettyclient-scenario segmentSize: 2 diff --git a/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml b/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml index 1b6dbd066..43995a17e 100644 --- a/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml @@ -35,7 +35,7 @@ segmentItems: refs: - {parentEndpoint: /case/kafka-case, networkAddress: '', refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: 'kafka-scenario', traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -88,5 +88,5 @@ segmentItems: refs: - {parentEndpoint: /case/kafka-case, networkAddress: 'kafka-server:9092', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: 'kafka-scenario', traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/kotlin-coroutine-scenario/config/expectedData.yaml b/test/plugin/scenarios/kotlin-coroutine-scenario/config/expectedData.yaml index ff7ca6676..7d4b91563 100644 --- a/test/plugin/scenarios/kotlin-coroutine-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/kotlin-coroutine-scenario/config/expectedData.yaml @@ -63,8 +63,8 @@ segmentItems: peer: '' refs: - {parentEndpoint: /kotlin-coroutine-scenario/case/h2, networkAddress: '', refType: CrossThread, - parentSpanId: 0, parentTraceSegmentId: not null, - parentServiceInstance: not null, parentService: not null, traceId: not null} + parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not + null, parentService: kotlin-coroutine-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml b/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml index 04b37cc99..0d55d4607 100644 --- a/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml @@ -54,7 +54,7 @@ segmentItems: refs: - {parentEndpoint: /okhttp-case/case/receiveContext-0, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: okhttp-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -74,7 +74,7 @@ segmentItems: refs: - {parentEndpoint: /okhttp-case/case/receiveContext-0, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: okhttp-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -94,6 +94,6 @@ segmentItems: - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-0'} refs: - {parentEndpoint: /case/okhttp-case, networkAddress: '', refType: CrossThread, - parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, - parentService: not null, traceId: not null} + parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not + null, parentService: okhttp-scenario, traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml b/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml index d438887d0..fcf2aa593 100644 --- a/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml @@ -67,7 +67,7 @@ segmentItems: refs: - {parentEndpoint: /case/pulsar-case, networkAddress: '', refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: pulsar-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -88,5 +88,5 @@ segmentItems: refs: - {parentEndpoint: /case/pulsar-case, networkAddress: not null, refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: pulsar-scenario, traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml b/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml index 7b2fccf20..7f84fab7e 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml @@ -37,7 +37,7 @@ segmentItems: refs: - {parentEndpoint: /rabbitmq-scenario/case/rabbitmq, networkAddress: not null, refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: rabbitmq-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/resttemplate-4.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/resttemplate-4.x-scenario/config/expectedData.yaml index d0603076c..9c17bd6b8 100644 --- a/test/plugin/scenarios/resttemplate-4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/resttemplate-4.x-scenario/config/expectedData.yaml @@ -53,8 +53,8 @@ segmentItems: refs: - {parentEndpoint: /resttemplate-4.x-scenario/resttemplate/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: resttemplate-4.x-scenario, + traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -75,8 +75,8 @@ segmentItems: refs: - {parentEndpoint: /resttemplate-4.x-scenario/resttemplate/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: resttemplate-4.x-scenario, + traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/shardingsphere-3.x-scenario/config/expectedData.yaml index 0cb2cf47f..63b0bb55a 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/config/expectedData.yaml @@ -117,7 +117,7 @@ segmentItems: refs: - {parentEndpoint: /shardingsphere-3.x-scenario/case/execute, networkAddress: '', refType: CrossThread, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: shardingsphere-3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/config/expectedData.yaml b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/config/expectedData.yaml index f6ec88f12..b91745ae6 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/config/expectedData.yaml @@ -117,7 +117,7 @@ segmentItems: refs: - {parentEndpoint: /shardingsphere-4.x-RC1-RC2-scenario/case/execute, networkAddress: '', refType: CrossThread, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: shardingsphere-4.x-RC1-RC2-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/config/expectedData.yaml b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/config/expectedData.yaml index b49ea7381..6596fcea9 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/config/expectedData.yaml @@ -117,7 +117,7 @@ segmentItems: refs: - {parentEndpoint: /shardingsphere-4.x-RC3-scenario/case/execute, networkAddress: '', refType: CrossThread, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: shardingsphere-4.x-RC3-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml b/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml index 40c2213c7..5d3033e32 100644 --- a/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml @@ -33,7 +33,7 @@ segmentItems: refs: - {parentEndpoint: /sofarpc-scenario/case/sofarpc, networkAddress: '127.0.0.1:12200', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: sofarpc-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml index 26ee6e7d3..95cd1e52b 100644 --- a/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml @@ -65,7 +65,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-3.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -86,7 +86,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-3.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -107,7 +107,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-3.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -128,7 +128,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-3.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -245,5 +245,5 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-3.1.x-scenario, traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml index 09a66bb09..d3ccdc639 100644 --- a/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml @@ -65,7 +65,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -86,7 +86,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -107,7 +107,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -128,7 +128,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.1.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -241,5 +241,5 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.1.x-scenario, traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml index e448afce9..986697be6 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml @@ -65,7 +65,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -86,7 +86,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -107,7 +107,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -128,7 +128,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -149,7 +149,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -170,7 +170,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 6, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -191,7 +191,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 7, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -212,7 +212,7 @@ segmentItems: refs: - {parentEndpoint: /case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 8, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-4.3.x-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml index 781504452..a5e9f32d2 100644 --- a/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml @@ -74,7 +74,7 @@ segmentItems: refs: - {parentEndpoint: SpringAsync, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-async-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -140,5 +140,5 @@ segmentItems: refs: - {parentEndpoint: /spring-async-scenario/case/spring-async, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: spring-async-scenario, traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/config/expectedData.yaml index 2dff834e1..b05778072 100644 --- a/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/config/expectedData.yaml @@ -53,8 +53,8 @@ segmentItems: refs: - {parentEndpoint: /spring-cloud-feign-1.1.x-scenario/case/spring-cloud-feign-1.1.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-cloud-feign-1.1.x-scenario, + traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/config/expectedData.yaml index b41980343..f2a113a94 100644 --- a/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/config/expectedData.yaml @@ -53,8 +53,8 @@ segmentItems: refs: - {parentEndpoint: /spring-cloud-feign-1.2.x-scenario/case/spring-cloud-feign-1.2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-cloud-feign-1.2.x-scenario, + traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/config/expectedData.yaml index ce7406645..6d5b26ae0 100644 --- a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/config/expectedData.yaml @@ -53,8 +53,8 @@ segmentItems: refs: - {parentEndpoint: /spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-cloud-feign-2.x-scenario, + traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -152,8 +152,8 @@ segmentItems: refs: - {parentEndpoint: /spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-cloud-feign-2.x-scenario, + traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -174,8 +174,8 @@ segmentItems: refs: - {parentEndpoint: /spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-cloud-feign-2.x-scenario, + traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -196,6 +196,6 @@ segmentItems: refs: - {parentEndpoint: /spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, - parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not - null, traceId: not null} + parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-cloud-feign-2.x-scenario, + traceId: not null} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/struts2.3-scenario/config/expectedData.yaml b/test/plugin/scenarios/struts2.3-scenario/config/expectedData.yaml index 7a1d0f952..22ddc5c3d 100644 --- a/test/plugin/scenarios/struts2.3-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/struts2.3-scenario/config/expectedData.yaml @@ -39,7 +39,7 @@ segmentItems: refs: - {parentEndpoint: /struts2.3-scenario/struts-scenario/case.action, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: struts2.3-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml b/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml index c10c71c05..1d5eab05e 100644 --- a/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml @@ -39,7 +39,7 @@ segmentItems: refs: - {parentEndpoint: /struts2.5-scenario/struts-scenario/case.action, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: struts2.5-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml b/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml index b7e66a12e..8ec60e253 100644 --- a/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml @@ -53,7 +53,7 @@ segmentItems: refs: - {parentEndpoint: UndertowDispatch, networkAddress: 'localhost:8081', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: undertow-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -74,7 +74,7 @@ segmentItems: refs: - {parentEndpoint: UndertowDispatch, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: undertow-scenario, traceId: not null} skipAnalysis: 'false' - segmentId: not null spans: @@ -140,5 +140,5 @@ segmentItems: refs: - {parentEndpoint: '/undertow-routing-scenario/case/{context}', networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: not null, traceId: not null} + null, parentService: undertow-scenario, traceId: not null} skipAnalysis: 'false'