More strict PluginTests expected data verifier (#4713)

* More strict PluginTests expected data verifier

* remove unnecessary file

Co-authored-by: 吴晟 Wu Sheng <wu.sheng@foxmail.com>

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

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'

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

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:

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:

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:

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:

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

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:

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:

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:

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:

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:

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:

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'

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

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'

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:

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'

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'

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:

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:

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:

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:

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:

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:

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'

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'

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:

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'

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:

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:

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'

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:

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:

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'