From d75cdf51e1088a9cf2289b5588e8114fcf3099d7 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Tue, 12 Jul 2022 14:53:14 +0800 Subject: [PATCH] Save http status code regardless of it's status (#258) --- .github/workflows/codeql.yaml | 1 - CHANGES.md | 1 + .../http/v9/DefaultHttpClientInterceptor.java | 2 +- .../v9/LoadBalancerHttpClientInterceptor.java | 2 +- .../v9/DefaultHttpClientInterceptorTest.java | 4 +- .../v4/HttpClientExecuteInterceptor.java | 2 +- .../HttpAsyncResponseConsumerWrapper.java | 5 +- .../v3/HttpClientExecuteInterceptor.java | 2 +- .../v5/HttpClientDoExecuteInterceptor.java | 2 +- .../wrapper/AsyncResponseConsumerWrapper.java | 10 +-- .../jetty/v9/server/HandleInterceptor.java | 6 +- .../JsonServiceExporterInterceptor.java | 3 + .../light4j/HandleRequestInterceptor.java | 2 +- .../nutz/http/sync/SenderSendInterceptor.java | 9 +-- .../nutz/mvc/ActionMethodInterceptor.java | 2 +- .../apm/plugin/okhttp/v2/CallInterceptor.java | 2 +- .../plugin/okhttp/v2/RealCallInterceptor.java | 2 +- .../plugin/okhttp/common/CallInterceptor.java | 2 +- .../okhttp/common/RealCallInterceptor.java | 2 +- .../apm/plugin/play/v2x/TracingFilter.java | 2 +- .../SynchronousDispatcherInterceptor.java | 2 +- .../ProducerOperationHandlerInterceptor.java | 2 +- .../v2/TransportClientHandlerInterceptor.java | 2 +- .../spring/mvc/v5/InvokeInterceptor.java | 6 +- .../AbstractMethodInterceptor.java | 6 +- .../sync/RestResponseInterceptor.java | 2 +- .../plugin/struts2/Struts2Interceptor.java | 6 +- .../tomcat78x/TomcatInvokeInterceptor.java | 6 +- .../undertow/v2x/handler/TracingHandler.java | 2 +- .../http/HttpClientParseHttpInterceptor.java | 6 +- .../plugin/shenyu/v24x/util/CommonUtil.java | 2 +- .../service-agent/java-agent/Plugin-test.md | 71 ++++++++++--------- test/e2e/case/expected/trace-info-detail.yml | 2 + test/e2e/case/expected/trace-users-detail.yml | 4 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 11 +++ .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 4 +- .../avro-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../canal-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 8 +++ .../config/expectedData.yaml | 3 +- .../config/expectedData.yaml | 1 + .../cxf-scenario/config/expectedData.yaml | 3 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 4 +- .../config/expectedData.yaml | 3 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 2 + .../config/expectedData.yaml | 2 +- .../config/expectedData.yaml | 1 + .../feign-scenario/config/expectedData.yaml | 11 +++ .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 5 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 +- .../gson-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 +- .../h2-scenario/config/expectedData.yaml | 1 + .../hbase-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 5 +- .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 5 ++ .../config/expectedData.yaml | 2 + .../hystrix-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 7 ++ .../jackson-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 15 +++- .../config/expectedData.yaml | 1 + .../jedis-scenario/config/expectedData.yaml | 1 + .../jetty-scenario/config/expectedData.yaml | 2 + .../jetty-scenario/support-version.list | 1 - .../config/expectedData.yaml | 1 + .../kafka-scenario/config/expectedData.yaml | 5 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 +- .../lettuce-scenario/config/expectedData.yaml | 2 + .../mariadb-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 +- .../mysql-scenario/config/expectedData.yaml | 5 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 2 + .../okhttp-scenario/config/expectedData.yaml | 5 ++ .../okhttp2-scenario/config/expectedData.yaml | 5 ++ .../oracle-scenario/config/expectedData.yaml | 1 + .../play-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../pulsar-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 4 +- .../quasar-scenario/config/expectedData.yaml | 4 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 12 +++- .../config/expectedData.yaml | 5 ++ .../support-version.list | 3 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 2 + .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 +- .../config/expectedData.yaml | 6 +- .../config/expectedData.yaml | 6 +- .../config/expectedData.yaml | 4 +- .../config/expectedData.yaml | 6 +- .../sofarpc-scenario/config/expectedData.yaml | 1 + .../config/expectedData.yaml | 8 +++ .../config/expectedData.yaml | 4 ++ .../config/expectedData.yaml | 12 ++++ .../config/expectedData.yaml | 17 ++++- .../config/expectedData.yaml | 18 +++++ .../config/expectedData.yaml | 5 ++ .../config/expectedData.yaml | 5 ++ .../config/expectedData.yaml | 5 ++ .../config/expectedData.yaml | 14 ++++ .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 5 +- .../config/expectedData.yaml | 4 +- .../config/expectedData.yaml | 1 + .../config/expectedData.yaml | 3 +- .../config/expectedData.yaml | 3 +- .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 3 + .../config/expectedData.yaml | 5 ++ .../webflux-scenario/config/expectedData.yaml | 6 ++ .../config/expectedData.yaml | 8 ++- .../config/expectedData.yaml | 1 + 158 files changed, 465 insertions(+), 114 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 10e029e3f..e5951d5cb 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -39,7 +39,6 @@ jobs: runs-on: ubuntu-latest strategy: - fail-fast: false matrix: language: [ 'java' ] diff --git a/CHANGES.md b/CHANGES.md index bcd50eeb0..e848df89b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Release Notes. * Fix `onHalfClose` using span operation name `/Request/onComplete` instead of the worng name `/Request/onHalfClose`. * Add plugin to support RESTeasy 4.x. * Add plugin to support hutool-http 5.x. +* Save http status code regardless of it's status. #### Documentation diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java index f254b8a74..b4c757fe6 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java @@ -154,9 +154,9 @@ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterc int statusCode = response.status(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } } diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/LoadBalancerHttpClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/LoadBalancerHttpClientInterceptor.java index 720c07f3a..82d62cb8b 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/LoadBalancerHttpClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/LoadBalancerHttpClientInterceptor.java @@ -81,9 +81,9 @@ public class LoadBalancerHttpClientInterceptor implements InstanceMethodsAroundI int statusCode = response.status(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } } diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java index 2bb710420..cb2e79ae0 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java @@ -114,7 +114,7 @@ public class DefaultHttpClientInterceptorTest { assertSpan(finishedSpan); List tags = SpanHelper.getTags(finishedSpan); - assertThat(tags.size(), is(2)); + assertThat(tags.size(), is(3)); assertThat(tags.get(0).getValue(), is("GET")); assertThat(tags.get(1).getValue(), is("http://skywalking.org/test/var")); assertThat(finishedSpan.getOperationName(), is("/test/{pathVar}")); @@ -170,7 +170,7 @@ public class DefaultHttpClientInterceptorTest { assertSpan(finishedSpan); List tags = SpanHelper.getTags(finishedSpan); - assertThat(tags.size(), is(2)); + assertThat(tags.size(), is(3)); assertThat(tags.get(0).getValue(), is("GET")); assertThat(tags.get(1).getValue(), is("http://skywalking.org/test/var")); diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java index e6a741055..b10768510 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java @@ -89,9 +89,9 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc if (responseStatusLine != null) { int statusCode = responseStatusLine.getStatusCode(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } HttpRequest httpRequest = (HttpRequest) allArguments[1]; // Active HTTP parameter collection automatically in the profiling context. diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java index 8ecf8f0f8..b03ad6b80 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java @@ -46,9 +46,10 @@ public class HttpAsyncResponseConsumerWrapper implements HttpAsyncResponseCon public void responseReceived(HttpResponse response) throws IOException, HttpException { if (ContextManager.isActive()) { int statusCode = response.getStatusLine().getStatusCode(); + AbstractSpan span = ContextManager.activeSpan().errorOccurred(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { - AbstractSpan span = ContextManager.activeSpan().errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); + span.errorOccurred(); } ContextManager.stopSpan(); } diff --git a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java index fa367e2f6..48caf56c9 100644 --- a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java @@ -75,9 +75,9 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc if (ret != null) { final int statusCode = (Integer) ret; final AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } final HttpMethod httpMethod = (HttpMethod) allArguments[1]; if (httpMethod == null) { diff --git a/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/HttpClientDoExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/HttpClientDoExecuteInterceptor.java index aed04d609..0d037afe2 100644 --- a/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/HttpClientDoExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/HttpClientDoExecuteInterceptor.java @@ -84,9 +84,9 @@ public class HttpClientDoExecuteInterceptor implements InstanceMethodsAroundInte int statusCode = response.getCode(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } } diff --git a/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/wrapper/AsyncResponseConsumerWrapper.java b/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/wrapper/AsyncResponseConsumerWrapper.java index 9e78477f9..9dec7d109 100644 --- a/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/wrapper/AsyncResponseConsumerWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/wrapper/AsyncResponseConsumerWrapper.java @@ -46,9 +46,10 @@ public class AsyncResponseConsumerWrapper implements AsyncResponseConsumer FutureCallback resultCallback) throws HttpException, IOException { if (ContextManager.isActive()) { int statusCode = response.getCode(); + AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { - AbstractSpan span = ContextManager.activeSpan().errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); + span.errorOccurred(); } ContextManager.stopSpan(); } @@ -59,9 +60,10 @@ public class AsyncResponseConsumerWrapper implements AsyncResponseConsumer public void informationResponse(HttpResponse response, HttpContext context) throws HttpException, IOException { if (ContextManager.isActive()) { int statusCode = response.getCode(); + AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { - AbstractSpan span = ContextManager.activeSpan().errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); + span.errorOccurred(); } ContextManager.stopSpan(); } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java index 85250d6c7..25006dd14 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java @@ -71,9 +71,11 @@ public class HandleInterceptor implements InstanceMethodsAroundInterceptor { HttpChannel httpChannel = (HttpChannel) objInst; HttpServletResponse servletResponse = httpChannel.getResponse(); AbstractSpan span = ContextManager.activeSpan(); - if (IS_SERVLET_GET_STATUS_METHOD_EXIST && servletResponse.getStatus() >= 400) { - span.errorOccurred(); + if (IS_SERVLET_GET_STATUS_METHOD_EXIST) { Tags.HTTP_RESPONSE_STATUS_CODE.set(span, servletResponse.getStatus()); + if (servletResponse.getStatus() >= 400) { + span.errorOccurred(); + } } ContextManager.stopSpan(); ContextManager.getRuntimeContext().remove(Constants.FORWARD_REQUEST_FLAG); diff --git a/apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonServiceExporterInterceptor.java b/apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonServiceExporterInterceptor.java index 3be6ee47c..55a7807aa 100644 --- a/apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonServiceExporterInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonServiceExporterInterceptor.java @@ -69,6 +69,9 @@ public class JsonServiceExporterInterceptor implements InstanceMethodsAroundInte AbstractSpan span = ContextManager.activeSpan(); if (IS_SERVLET_GET_STATUS_METHOD_EXIST) { Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); + if (response.getStatus() >= 400) { + span.errorOccurred(); + } } ContextManager.stopSpan(); diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java index 92c7b7e2e..1a1f45cee 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java @@ -74,9 +74,9 @@ public class HandleRequestInterceptor implements InstanceMethodsAroundIntercepto span.setComponent(ComponentsDefine.LIGHT_4J); SpanLayer.asHttp(span); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, exchange.getStatusCode()); if (exchange.getStatusCode() >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, exchange.getStatusCode()); } ContextManager.stopSpan(span); diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java index 18073215a..3f2bffacc 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java @@ -65,10 +65,11 @@ public class SenderSendInterceptor implements InstanceMethodsAroundInterceptor { Response response = (Response) ret; AbstractSpan span = ContextManager.activeSpan(); - if (response == null || response.getStatus() >= 400) { - span.errorOccurred(); - if (response != null) - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); + if (response == null) { + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); + if (response.getStatus() >= 400) { + span.errorOccurred(); + } } ContextManager.stopSpan(); return ret; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java index 67a02a43b..c7e314e54 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java @@ -74,9 +74,9 @@ public class ActionMethodInterceptor implements InstanceMethodsAroundInterceptor HttpServletResponse response = Mvcs.getResp(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); if (response.getStatus() >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); } ContextManager.stopSpan(); return ret; diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/CallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/CallInterceptor.java index adf5965ee..1ae28e459 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/CallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/CallInterceptor.java @@ -80,9 +80,9 @@ public class CallInterceptor implements InstanceMethodsAroundInterceptor { if (response != null) { int statusCode = response.code(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } } ContextManager.stopSpan(); diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/RealCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/RealCallInterceptor.java index 2b9387e57..4e8151bbb 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/RealCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v2/RealCallInterceptor.java @@ -108,9 +108,9 @@ public class RealCallInterceptor implements InstanceMethodsAroundInterceptor, In if (response != null) { int statusCode = response.code(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/CallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/CallInterceptor.java index 90b15a405..0d0480e62 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/CallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/CallInterceptor.java @@ -80,9 +80,9 @@ public class CallInterceptor implements InstanceMethodsAroundInterceptor { if (response != null) { int statusCode = response.code(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } } ContextManager.stopSpan(); diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/RealCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/RealCallInterceptor.java index c305c556b..b0934c267 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/RealCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common/RealCallInterceptor.java @@ -103,9 +103,9 @@ public class RealCallInterceptor implements InstanceMethodsAroundInterceptor, In if (response != null) { int statusCode = response.code(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } } diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java index bb0ce3b55..cb5864493 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java @@ -78,9 +78,9 @@ public class TracingFilter extends Filter { SpanLayer.asHttp(span); span.prepareForAsync(); CompletionStage stage = next.apply(request).thenApply(result -> { + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, result.status()); if (result.status() >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, result.status()); } try { span.asyncFinish(); diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java index 2930b1993..655adcd50 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java @@ -59,9 +59,9 @@ public class SynchronousDispatcherInterceptor implements InstanceMethodsAroundIn Object ret) throws Throwable { HttpResponse response = (HttpResponse) allArguments[1]; AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); if (response.getStatus() >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); } ContextManager.stopSpan(); return ret; diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/ProducerOperationHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/ProducerOperationHandlerInterceptor.java index 3befb8846..bbd620f40 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/ProducerOperationHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/ProducerOperationHandlerInterceptor.java @@ -58,9 +58,9 @@ public class ProducerOperationHandlerInterceptor implements InstanceMethodsAroun Invocation invocation = (Invocation) allArguments[0]; AbstractSpan span = ContextManager.activeSpan(); int statusCode = invocation.getStatus().getStatusCode(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } ContextManager.stopSpan(); return ret; diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/TransportClientHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/TransportClientHandlerInterceptor.java index c7fc23c9c..74f71aca4 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/TransportClientHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v2/TransportClientHandlerInterceptor.java @@ -67,9 +67,9 @@ public class TransportClientHandlerInterceptor implements InstanceMethodsAroundI } AbstractSpan span = ContextManager.activeSpan(); int statusCode = invocation.getStatus().getStatusCode(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } ContextManager.stopSpan(); return ret; diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/InvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/InvokeInterceptor.java index 7a19cdf3f..17d72f8c4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/InvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/InvokeInterceptor.java @@ -71,9 +71,11 @@ public class InvokeInterceptor implements InstanceMethodsAroundInterceptorV2 { return; } HttpStatus httpStatus = exchange.getResponse().getStatusCode(); - if (httpStatus != null && httpStatus.isError()) { - span.errorOccurred(); + if (httpStatus != null) { Tags.HTTP_RESPONSE_STATUS_CODE.set(span, httpStatus.value()); + if (httpStatus.isError()) { + span.errorOccurred(); + } } span.asyncFinish(); }); diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java index 7a441ad69..a2af3ef54 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java @@ -201,9 +201,11 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround } } - if (statusCode != null && statusCode >= 400) { - span.errorOccurred(); + if (statusCode != null) { Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); + if (statusCode >= 400) { + span.errorOccurred(); + } } runtimeContext.remove(REACTIVE_ASYNC_SPAN_IN_RUNTIME_CONTEXT); diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java index 121444a5b..550a60012 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java @@ -42,9 +42,9 @@ public class RestResponseInterceptor implements InstanceMethodsAroundInterceptor ClientHttpResponse response = (ClientHttpResponse) allArguments[2]; int statusCode = response.getStatusCode().value(); AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); if (statusCode >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode); } return ret; } diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java index 70f2db997..18a9a3c3b 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java @@ -69,9 +69,11 @@ public class Struts2Interceptor implements InstanceMethodsAroundInterceptor { HttpServletResponse response = ServletActionContext.getResponse(); AbstractSpan span = ContextManager.activeSpan(); - if (IS_SERVLET_GET_STATUS_METHOD_EXIST && response.getStatus() >= 400) { - span.errorOccurred(); + if (IS_SERVLET_GET_STATUS_METHOD_EXIST) { Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); + if (response.getStatus() >= 400) { + span.errorOccurred(); + } } ContextManager.stopSpan(); return ret; diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java index e503e257b..29004e6e4 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java @@ -93,9 +93,11 @@ public class TomcatInvokeInterceptor implements InstanceMethodsAroundInterceptor HttpServletResponse response = (HttpServletResponse) allArguments[1]; AbstractSpan span = ContextManager.activeSpan(); - if (IS_SERVLET_GET_STATUS_METHOD_EXIST && response.getStatus() >= 400) { - span.errorOccurred(); + if (IS_SERVLET_GET_STATUS_METHOD_EXIST) { Tags.HTTP_RESPONSE_STATUS_CODE.set(span, response.getStatus()); + if (response.getStatus() >= 400) { + span.errorOccurred(); + } } // Active HTTP parameter collection automatically in the profiling context. if (!TomcatPluginConfig.Plugin.Tomcat.COLLECT_HTTP_PARAMS && span.isProfiling()) { diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java index d41c2992a..e95c1a4c5 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java @@ -70,9 +70,9 @@ public class TracingHandler implements HttpHandler { @Override public void exchangeEvent(HttpServerExchange httpServerExchange, NextListener nextListener) { nextListener.proceed(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, httpServerExchange.getStatusCode()); if (httpServerExchange.getStatusCode() >= 400) { span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, httpServerExchange.getStatusCode()); } span.asyncFinish(); } diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java index 02315107c..caeb9bf70 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java @@ -43,10 +43,10 @@ public class HttpClientParseHttpInterceptor implements InstanceMethodsAroundInte MessageHeader responseHeader = (MessageHeader) allArguments[0]; String statusLine = responseHeader.getValue(0); Integer responseCode = parseResponseCode(statusLine); + AbstractSpan span = ContextManager.activeSpan(); + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, responseCode); if (responseCode >= 400) { - AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, responseCode); } ContextManager.stopSpan(); return ret; @@ -78,4 +78,4 @@ public class HttpClientParseHttpInterceptor implements InstanceMethodsAroundInte return -1; } -} \ No newline at end of file +} diff --git a/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shenyu/v24x/util/CommonUtil.java b/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shenyu/v24x/util/CommonUtil.java index b8e005479..928d43c25 100644 --- a/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shenyu/v24x/util/CommonUtil.java +++ b/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shenyu/v24x/util/CommonUtil.java @@ -66,8 +66,8 @@ public class CommonUtil { return ret; } Optional.ofNullable(exchange.getResponse().getStatusCode()).ifPresent(httpStatus -> { + Tags.HTTP_RESPONSE_STATUS_CODE.set(span, httpStatus.value()); if (httpStatus.isError()) { - Tags.HTTP_RESPONSE_STATUS_CODE.set(span, httpStatus.value()); span.errorOccurred(); } }); diff --git a/docs/en/setup/service-agent/java-agent/Plugin-test.md b/docs/en/setup/service-agent/java-agent/Plugin-test.md index aea2a4534..129f0cdbf 100644 --- a/docs/en/setup/service-agent/java-agent/Plugin-test.md +++ b/docs/en/setup/service-agent/java-agent/Plugin-test.md @@ -20,7 +20,7 @@ The test framework provides `JVM-container` and `Tomcat-container` base images i ### JVM-container Image Introduction -[JVM-container](../../../../../test/plugin/containers/jvm-container) uses `adoptopenjdk/openjdk8:alpine-jre` as the base image. `JVM-container` supports JDK8 and JDK17 as well in CI, which inherits `adoptopenjdk/openjdk8:alpine-jre` and `eclipse-temurin:17-alpine`. +[JVM-container](../../../../../test/plugin/containers/jvm-container) uses `adoptopenjdk/openjdk8:alpine-jre` as the base image. `JVM-container` supports JDK8 and JDK17 as well in CI, which inherits `adoptopenjdk/openjdk8:alpine-jre` and `eclipse-temurin:17-alpine`. It is supported to custom the base Java docker image by specify `base_image_java`. The test case project must be packaged as `project-name.zip`, including `startup.sh` and uber jar, by using `mvn clean package`. @@ -117,7 +117,7 @@ File Name | Descriptions | Option | description | --- | --- -| default | Activate all plugins in `plugin` folder like the official distribution agent. +| default | Activate all plugins in `plugin` folder like the official distribution agent. | with_optional | Activate `default` and plugins in `optional-plugin` by the give selector. | with_bootstrap | Activate `default` and plugins in `bootstrap-plugin` by the give selector. @@ -139,7 +139,7 @@ depends_on: dependencies: service1: image: - hostname: + hostname: expose: ... environment: @@ -222,7 +222,7 @@ segmentItems: | Field | Description -| --- | --- +| --- | --- | serviceName | Service Name. | segmentSize | The number of segments is expected. | segmentId | Trace ID. @@ -263,26 +263,26 @@ segmentItems: ... ``` -| Field | Description -|--- |--- +| Field | Description +|--- |--- | operationName | Span Operation Name. -| parentSpanId | Parent span ID. **Note**: The parent span ID of the first span should be -1. -| spanId | Span ID. **Note**: Start from 0. +| parentSpanId | Parent span ID. **Note**: The parent span ID of the first span should be -1. +| spanId | Span ID. **Note**: Start from 0. | startTime | Span start time. It is impossible to get the accurate time, not 0 should be enough. | endTime | Span finish time. It is impossible to get the accurate time, not 0 should be enough. -| isError | Span status, true or false. -| componentId | Component id for your plugin. +| isError | Span status, true or false. +| componentId | Component id for your plugin. | tags | Span tag list. **Notice**, Keep in the same order as the plugin coded. | logs | Span log list. **Notice**, Keep in the same order as the plugin coded. | SpanLayer | Options, DB, RPC_FRAMEWORK, HTTP, MQ, CACHE. | SpanType | Span type, options, Exit, Entry or Local. -| peer | Remote network address, IP + port mostly. For exit span, this should be required. +| peer | Remote network address, IP + port mostly. For exit span, this should be required. The verify description for SegmentRef -| Field | Description -|---- |---- -| traceId | +| Field | Description +|---- |---- +| traceId | | parentTraceSegmentId | Parent SegmentId, pointing to the segment id in the parent segment. | parentSpanId | Parent SpanID, pointing to the span id in the parent segment. | parentService | The service of parent/downstream service name. @@ -302,7 +302,7 @@ meterItems: ``` | Field | Description -| --- | --- +| --- | --- | serviceName | Service Name. | meterSize | The number of meters is expected. | meters | meter list. Follow the next section to see how to describe every meter. @@ -310,7 +310,7 @@ meterItems: **Expected Data Format Of The Meter** ```yml - meterId: + meterId: name: NAME(string) tags: - {name: TAG_NAME(string), value: TAG_VALUE(string)} @@ -322,8 +322,8 @@ meterItems: The verify description for MeterId -| Field | Description -|--- |--- +| Field | Description +|--- |--- | name | meter name. | tags | meter tags. | tags.name | tag name. @@ -348,7 +348,7 @@ The following system environment variables are available in the shell. > `${agent_opts}` is required to add into your `java -jar` command, which including the parameter injected by test framework, and > make agent installed. All other parameters should be added after `${agent_opts}`. -The test framework will set the service name as the test case folder name by default, but in some cases, there are more +The test framework will set the service name as the test case folder name by default, but in some cases, there are more than one test projects are required to run in different service codes, could set it explicitly like the following example. Example @@ -409,7 +409,7 @@ Then, runs and generates a project, named by `scenario_name`, in `./scenarios`. Heartbeat service is designed for checking the service available status. This service is a simple HTTP service, returning 200 means the target service is ready. Then the traffic generator will access the entry service and verify the expected data. -User should consider to use this service to detect such as whether the dependent services are ready, especially when +User should consider to use this service to detect such as whether the dependent services are ready, especially when dependent services are database or cluster. Notice, because heartbeat service could be traced fully or partially, so, segmentSize in `expectedData.yaml` should use `ge` as the operator, @@ -479,6 +479,7 @@ SegmentA span list should like following tags: - {key: url, value: 'http://127.0.0.1:8080/httpclient-case/case/context-propagate'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: [] peer: 127.0.0.1:8080 - operationName: /httpclient-case/case/httpclient @@ -493,6 +494,7 @@ SegmentA span list should like following tags: - {key: url, value: 'http://localhost:{SERVER_OUTPUT_PORT}/httpclient-case/case/httpclient'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: [] peer: null ``` @@ -510,6 +512,7 @@ SegmentB span list should like following tags: - {key: url, value: 'http://127.0.0.1:8080/httpclient-case/case/context-propagate'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: [] startTime: nq 0 endTime: nq 0 @@ -542,22 +545,22 @@ MeterFactory.histogram("test_histogram").tag("hk1", "hv1").steps(1d, 5d, 10d).bu | Plugin | | Agent core | | | | | +-----|-------+ +---------|--------+ - | | - | | - | Build or operate +-+ - +------------------------> |-| + | | + | | + | Build or operate +-+ + +------------------------> |-| | |-] - | |-| - | |-| | |-| - | |-| - | <--------------------------| - | +-+ - | | - | | - | | - | | - + + + | |-| + | |-| + | |-| + | <--------------------------| + | +-+ + | | + | | + | | + | | + + + ``` #### meterItems diff --git a/test/e2e/case/expected/trace-info-detail.yml b/test/e2e/case/expected/trace-info-detail.yml index 980c6340d..f50b094f5 100644 --- a/test/e2e/case/expected/trace-info-detail.yml +++ b/test/e2e/case/expected/trace-info-detail.yml @@ -42,6 +42,8 @@ spans: value: POST - key: url value: {{ notEmpty .value }} + - key: http.status_code + value: '200' {{- end }} logs: [] {{- end }} diff --git a/test/e2e/case/expected/trace-users-detail.yml b/test/e2e/case/expected/trace-users-detail.yml index 488b55de8..3a1030eea 100644 --- a/test/e2e/case/expected/trace-users-detail.yml +++ b/test/e2e/case/expected/trace-users-detail.yml @@ -36,6 +36,8 @@ spans: value: POST - key: url value: {{ notEmpty .value }} + - key: http.status_code + value: '200' {{- end }} logs: [] - {{- end }} \ No newline at end of file + {{- end }} diff --git a/test/plugin/scenarios/activemq-scenario/config/expectedData.yaml b/test/plugin/scenarios/activemq-scenario/config/expectedData.yaml index 8c6a2e011..918ffb1f5 100644 --- a/test/plugin/scenarios/activemq-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/activemq-scenario/config/expectedData.yaml @@ -46,6 +46,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/activemq-scenario/case/activemq'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: 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 436ddf17e..ab105a82a 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml @@ -208,6 +208,7 @@ segmentItems: - {key: traceID, value: not null} - {key: segmentID, value: not null} - {key: spanID, value: not null} + - {key: http.status_code, value: '200'} skipAnalysis: 'true' refs: - {parentEndpoint: /app, networkAddress: '127.0.0.1:8080', refType: CrossProcess, @@ -230,6 +231,7 @@ segmentItems: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/callable'} - {key: http.method, value: GET} - {key: correlation, value: correlationValueTest} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.CallableWrapper/call, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, @@ -251,6 +253,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/runnable'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'true' - operationName: Thread/org.apache.skywalking.apm.toolkit.trace.RunnableWrapper/run parentSpanId: -1 @@ -282,6 +285,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/callable'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'true' - operationName: Thread/org.apache.skywalking.apm.toolkit.trace.CallableWrapper/call parentSpanId: -1 @@ -314,6 +318,7 @@ segmentItems: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/runnable'} - {key: http.method, value: GET} - {key: correlation, value: correlationValueTest} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.RunnableWrapper/run, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, @@ -335,6 +340,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/supplier'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'true' - operationName: Thread/org.apache.skywalking.apm.toolkit.trace.SupplierWrapper/get parentSpanId: -1 @@ -367,6 +373,7 @@ segmentItems: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/supplier'} - {key: http.method, value: GET} - {key: correlation, value: correlationValueTest} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.SupplierWrapper/get, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, @@ -388,6 +395,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/consumer'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'true' - operationName: Thread/org.apache.skywalking.apm.toolkit.trace.ConsumerWrapper/accept parentSpanId: -1 @@ -420,6 +428,7 @@ segmentItems: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/function'} - {key: http.method, value: GET} - {key: correlation, value: correlationValueTest} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.FunctionWrapper/apply, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, @@ -441,6 +450,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/function'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'true' - operationName: Thread/org.apache.skywalking.apm.toolkit.trace.FunctionWrapper/apply parentSpanId: -1 @@ -473,6 +483,7 @@ segmentItems: - {key: url, value: 'http://localhost:8080/apm-toolkit-trace-scenario/case/asyncVisit/consumer'} - {key: http.method, value: GET} - {key: correlation, value: correlationValueTest} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Thread/org.apache.skywalking.apm.toolkit.trace.ConsumerWrapper/accept, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, diff --git a/test/plugin/scenarios/armeria-0.96minus-scenario/config/expectedData.yaml b/test/plugin/scenarios/armeria-0.96minus-scenario/config/expectedData.yaml index cfe5f360f..09121d31b 100644 --- a/test/plugin/scenarios/armeria-0.96minus-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/armeria-0.96minus-scenario/config/expectedData.yaml @@ -69,4 +69,5 @@ segmentItems: value: |- q1=[v1] chinese=[中文] + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/armeria-0.96plus-scenario/config/expectedData.yaml b/test/plugin/scenarios/armeria-0.96plus-scenario/config/expectedData.yaml index af473ce5d..3f435a786 100644 --- a/test/plugin/scenarios/armeria-0.96plus-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/armeria-0.96plus-scenario/config/expectedData.yaml @@ -65,4 +65,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/greet/skywalking'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/asynchttpclient-scenario/config/expectedData.yaml b/test/plugin/scenarios/asynchttpclient-scenario/config/expectedData.yaml index 5b4e074f5..cce4c90ba 100644 --- a/test/plugin/scenarios/asynchttpclient-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/asynchttpclient-scenario/config/expectedData.yaml @@ -48,6 +48,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/asynchttpclient/case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: GET:/asynchttpclient/back @@ -64,7 +65,8 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/asynchttpclient/back'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/asynchttpclient/case, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, - parentService: asynchttpclient-scenario, traceId: not null} \ No newline at end of file + parentService: asynchttpclient-scenario, traceId: not null} diff --git a/test/plugin/scenarios/avro-scenario/config/expectedData.yaml b/test/plugin/scenarios/avro-scenario/config/expectedData.yaml index aaddcf633..48f1d86ba 100644 --- a/test/plugin/scenarios/avro-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/avro-scenario/config/expectedData.yaml @@ -63,4 +63,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/avro-scenario/case/avro-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/baidu-brpc-scenario/config/expectedData.yaml b/test/plugin/scenarios/baidu-brpc-scenario/config/expectedData.yaml index c14177cfb..cad33da5a 100644 --- a/test/plugin/scenarios/baidu-brpc-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/baidu-brpc-scenario/config/expectedData.yaml @@ -60,4 +60,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/baidu-brpc-scenario/case/brpc'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/canal-scenario/config/expectedData.yaml b/test/plugin/scenarios/canal-scenario/config/expectedData.yaml index 96dad5de2..94bace866 100644 --- a/test/plugin/scenarios/canal-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/canal-scenario/config/expectedData.yaml @@ -46,4 +46,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/canal-scenario/case/canal-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/config/expectedData.yaml index 084accb4e..754d2c727 100644 --- a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/config/expectedData.yaml @@ -428,4 +428,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/cassandra-java-driver-3.x-scenario/case/cassandra'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/clickhouse-0.3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/clickhouse-0.3.x-scenario/config/expectedData.yaml index f940f6498..b712ce597 100644 --- a/test/plugin/scenarios/clickhouse-0.3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/clickhouse-0.3.x-scenario/config/expectedData.yaml @@ -34,6 +34,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/clickhouse-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: ClickHouse/JDBI/Statement/executeQuery @@ -52,6 +53,7 @@ segmentItems: - {key: db.type, value: sql} - {key: db.instance, value: system} - {key: db.statement, value: 'select timezone(), version()'} + - {key: http.status_code, value: '200'} - operationName: ClickHouse/JDBI/Statement/executeQuery operationId: 0 parentSpanId: 0 @@ -68,6 +70,7 @@ segmentItems: - {key: db.type, value: sql} - {key: db.instance, value: system} - {key: db.statement, value: SELECT * FROM clusters} + - {key: http.status_code, value: '200'} - operationName: ClickHouse/JDBI/Statement/execute operationId: 0 parentSpanId: 0 @@ -84,6 +87,7 @@ segmentItems: - {key: db.type, value: sql} - {key: db.instance, value: system} - {key: db.statement, value: SELECT 1} + - {key: http.status_code, value: '200'} - operationName: ClickHouse/JDBI/Connection/close operationId: 0 parentSpanId: 0 @@ -116,6 +120,7 @@ segmentItems: - {key: db.type, value: sql} - {key: db.instance, value: system} - {key: db.statement, value: 'select timezone(), version()'} + - {key: http.status_code, value: '200'} - operationName: ClickHouse/JDBI/PreparedStatement/executeQuery operationId: 0 parentSpanId: 0 @@ -132,6 +137,7 @@ segmentItems: - {key: db.type, value: sql} - {key: db.instance, value: system} - {key: db.statement, value: SELECT * FROM clusters} + - {key: http.status_code, value: '200'} - operationName: ClickHouse/JDBI/Statement/execute operationId: 0 parentSpanId: 0 @@ -148,6 +154,7 @@ segmentItems: - {key: db.type, value: sql} - {key: db.instance, value: system} - {key: db.statement, value: SELECT 1} + - {key: http.status_code, value: '200'} - operationName: ClickHouse/JDBI/Connection/close operationId: 0 parentSpanId: 0 @@ -179,4 +186,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/clickhouse-scenario/case/clickhouse-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} meterItems: [] diff --git a/test/plugin/scenarios/correlation-autotag-scenario/config/expectedData.yaml b/test/plugin/scenarios/correlation-autotag-scenario/config/expectedData.yaml index 219bff5c1..9e81f124a 100644 --- a/test/plugin/scenarios/correlation-autotag-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/correlation-autotag-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/correlation-autotag-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: 78a0cdef42a74b4ba80b48bf72b8558d.37.16042096947740000 spans: - operationName: Greeter.sayHello @@ -62,6 +63,7 @@ segmentItems: - {key: http.method, value: GET} - {key: autotag1, value: '1'} - {key: autotag2, value: '1'} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: Greeter.sayHello @@ -282,4 +284,3 @@ segmentItems: parentServiceInstance: not null, parentService: correlation-autotag-scenario, traceId: not null} meterItems: [] - diff --git a/test/plugin/scenarios/customize-scenario/config/expectedData.yaml b/test/plugin/scenarios/customize-scenario/config/expectedData.yaml index 4cb22e887..86347e8dd 100644 --- a/test/plugin/scenarios/customize-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/customize-scenario/config/expectedData.yaml @@ -188,4 +188,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/customize-scenario/case/customize'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/cxf-scenario/config/expectedData.yaml b/test/plugin/scenarios/cxf-scenario/config/expectedData.yaml index da1466fba..7bd5641cc 100644 --- a/test/plugin/scenarios/cxf-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/cxf-scenario/config/expectedData.yaml @@ -83,4 +83,5 @@ segmentItems: skipAnalysis: false tags: - {key: url, value: 'http://localhost:8080/cxf-scenario/case/cxf-scenario'} - - {key: http.method, value: GET} \ No newline at end of file + - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/dbcp-2.x-scenario/config/expectedData.yaml index 1cfc8dc33..9b831b612 100755 --- a/test/plugin/scenarios/dbcp-2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/dbcp-2.x-scenario/config/expectedData.yaml @@ -221,6 +221,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/dbcp-2.x-scenario/case/dbcp-2.x-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} meterItems: - serviceName: dbcp-2.x-scenario meterSize: 12 diff --git a/test/plugin/scenarios/druid-1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/druid-1.x-scenario/config/expectedData.yaml index a20d9baea..79dd4bdb9 100644 --- a/test/plugin/scenarios/druid-1.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/druid-1.x-scenario/config/expectedData.yaml @@ -203,6 +203,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/druid-1.x-scenario/case/druid-1.x-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} meterItems: - serviceName: druid-1.x-scenario meterSize: 14 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 4752af983..8eaa181c6 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 @@ -64,4 +64,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/dubbo-2.5.x-scenario/case/dubbo'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' 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 de5dbaeb9..10fb8aabe 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 @@ -67,4 +67,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/dubbo-2.7.x-scenario/case/dubbo'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/dubbo-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/dubbo-3.x-scenario/config/expectedData.yaml index 9f92f74cf..057e91d8c 100644 --- a/test/plugin/scenarios/dubbo-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/dubbo-3.x-scenario/config/expectedData.yaml @@ -111,4 +111,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/dubbo-3.x-scenario/case/dubbo'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/ehcache-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/ehcache-2.x-scenario/config/expectedData.yaml index 7a8d9e263..c5a6bca79 100644 --- a/test/plugin/scenarios/ehcache-2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/ehcache-2.x-scenario/config/expectedData.yaml @@ -108,4 +108,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/ehcache-2.x-scenario/case/ehcache'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/elasticjob-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/elasticjob-2.x-scenario/config/expectedData.yaml index f3c2a3645..f3c412149 100644 --- a/test/plugin/scenarios/elasticjob-2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/elasticjob-2.x-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/elasticjob-2.x-scenario/case/call'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: ElasticJob/org.apache.skywalking.apm.testcase.elasticjob.job.DemoSimpleJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} - segmentId: not null @@ -51,6 +52,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/elasticjob-2.x-scenario/case/call'} + - {key: http.status_code, value: '200'} - operationName: ElasticJob/org.apache.skywalking.apm.testcase.elasticjob.job.DemoSimpleJob parentSpanId: -1 spanId: 0 @@ -67,4 +69,4 @@ segmentItems: - {key: item, value: '0'} - {key: taskId, value: not null} - {key: shardingTotalCount, value: '1'} - - {key: shardingItemParameters, value: '{0=test}'} \ No newline at end of file + - {key: shardingItemParameters, value: '{0=test}'} diff --git a/test/plugin/scenarios/elasticjob-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/elasticjob-3.x-scenario/config/expectedData.yaml index d3c5736ed..5c5148b5f 100644 --- a/test/plugin/scenarios/elasticjob-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/elasticjob-3.x-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/elasticjob-3.x-scenario/case/ping'} + - {key: http.status_code, value: '200'} - operationName: ElasticJob/simpleJob parentSpanId: -1 spanId: 0 @@ -49,4 +50,4 @@ segmentItems: - {key: item, value: '0'} - {key: shardingTotalCount, value: '1'} - {key: taskId, value: not null} - - {key: shardingItemParameters, value: '{0=Beijing}'} \ No newline at end of file + - {key: shardingItemParameters, value: '{0=Beijing}'} diff --git a/test/plugin/scenarios/elasticsearch-5.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/elasticsearch-5.x-scenario/config/expectedData.yaml index dfdc0270f..32b766ba6 100644 --- a/test/plugin/scenarios/elasticsearch-5.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/elasticsearch-5.x-scenario/config/expectedData.yaml @@ -145,4 +145,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/elasticsearch-case/case/elasticsearch'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/elasticsearch-7.x-scenario/config/expectedData.yaml index 8e9ae5efd..53a73d5f8 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/config/expectedData.yaml @@ -293,4 +293,5 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/elasticsearch-case/case/elasticsearch' } - { key: http.method, value: GET } - skipAnalysis: 'false' \ No newline at end of file + - {key: http.status_code, value: '200'} + skipAnalysis: 'false' diff --git a/test/plugin/scenarios/elasticsearch-rest-high-level-6.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/elasticsearch-rest-high-level-6.x-scenario/config/expectedData.yaml index fc04efc54..2afb090f7 100644 --- a/test/plugin/scenarios/elasticsearch-rest-high-level-6.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/elasticsearch-rest-high-level-6.x-scenario/config/expectedData.yaml @@ -320,4 +320,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/elasticsearch-case/case/elasticsearch'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/elasticsearch-transport-6.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/elasticsearch-transport-6.x-scenario/config/expectedData.yaml index 65355eff4..30b3c2006 100644 --- a/test/plugin/scenarios/elasticsearch-transport-6.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/elasticsearch-transport-6.x-scenario/config/expectedData.yaml @@ -150,4 +150,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/elasticsearch-case/case/elasticsearch'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml b/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml index c9287919f..8933fb133 100644 --- a/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/exception-checker-spring/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testAnnotatedException @@ -139,3 +140,4 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/exception-checker-spring/case/exceptionchecker'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml b/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml index 300b9d2c5..14985d7e3 100644 --- a/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml @@ -123,4 +123,4 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/exception-checker-tomcat-scenario/case/exceptionchecker'} - {key: http.method, value: GET} - + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/fastjson-scenario/config/expectedData.yaml b/test/plugin/scenarios/fastjson-scenario/config/expectedData.yaml index 480d0cd78..3343e645d 100644 --- a/test/plugin/scenarios/fastjson-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/fastjson-scenario/config/expectedData.yaml @@ -128,3 +128,4 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/fastjson-scenario/case/fastjson-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/feign-scenario/config/expectedData.yaml b/test/plugin/scenarios/feign-scenario/config/expectedData.yaml index 57d4f98af..7a81d6716 100644 --- a/test/plugin/scenarios/feign-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/feign-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/feign-scenario/create/'} - {key: http.method, value: POST} + - {key: http.status_code, value: '201'} refs: - {parentEndpoint: GET:/feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -52,6 +53,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/feign-scenario/get/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not @@ -72,6 +74,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/feign-scenario/update/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not @@ -92,6 +95,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/feign-scenario/modify/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not @@ -112,6 +116,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/feign-scenario/delete/1'} - {key: http.method, value: DELETE} + - {key: http.status_code, value: '204'} refs: - {parentEndpoint: GET:/feign-scenario/case/feign-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, parentServiceInstance: not @@ -133,6 +138,7 @@ segmentItems: - {key: http.method, value: POST} - {key: url, value: 'http://localhost:8080/feign-scenario/create/'} - {key: http.body, value: '{"id": "1", "userName": "test"}'} + - {key: http.status_code, value: '201'} skipAnalysis: 'false' - operationName: /feign-scenario/get/{id} parentSpanId: 0 @@ -147,6 +153,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/feign-scenario/get/1'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /feign-scenario/update/{id} parentSpanId: 0 @@ -162,6 +169,7 @@ segmentItems: - {key: http.method, value: PUT} - {key: url, value: 'http://localhost:8080/feign-scenario/update/1'} - {key: http.body, value: '{"id": "1", "userName": "testA"}'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /feign-scenario/modify/{id} parentSpanId: 0 @@ -177,6 +185,7 @@ segmentItems: - {key: http.method, value: PUT} - {key: url, value: 'http://localhost:8080/feign-scenario/modify/1'} - {key: http.body, value: testA} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /feign-scenario/delete/{id} parentSpanId: 0 @@ -191,6 +200,7 @@ segmentItems: tags: - {key: http.method, value: DELETE} - {key: url, value: 'http://localhost:8080/feign-scenario/delete/1'} + - {key: http.status_code, value: '204'} skipAnalysis: 'false' - operationName: GET:/feign-scenario/case/feign-scenario parentSpanId: -1 @@ -205,4 +215,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/feign-scenario/case/feign-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' 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 60be319b8..c191af0ea 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 @@ -60,4 +60,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/finagle-17.10.x-scenario/case/finagle'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' 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 cd3512da0..9ffa0844a 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 @@ -60,4 +60,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/finagle-6.44.x-scenario/case/finagle'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/gateway-2.0.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/gateway-2.0.x-scenario/config/expectedData.yaml index f317ca684..8373df690 100644 --- a/test/plugin/scenarios/gateway-2.0.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/gateway-2.0.x-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SpringCloudGateway/RoutingFilter, networkAddress: 'localhost:18070', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not diff --git a/test/plugin/scenarios/gateway-2.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/gateway-2.1.x-scenario/config/expectedData.yaml index bcd400521..c312b744a 100644 --- a/test/plugin/scenarios/gateway-2.1.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/gateway-2.1.x-scenario/config/expectedData.yaml @@ -52,6 +52,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SpringCloudGateway/RoutingFilter, networkAddress: 'localhost:18070', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -104,7 +105,7 @@ segmentItems: - { parentEndpoint: '/provider/timeout/error', networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null } - skipAnalysis: 'false' + skipAnalysis: 'false' - segmentId: not null spans: - operationName: SpringCloudGateway/sendRequest @@ -151,4 +152,4 @@ segmentItems: - { key: url, value: 'http://localhost:8080/provider/b/testcase' } - { key: http.method, value: GET } - { key: http.status_code, value: '200' } - skipAnalysis: 'false' \ No newline at end of file + skipAnalysis: 'false' diff --git a/test/plugin/scenarios/gateway-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/gateway-3.x-scenario/config/expectedData.yaml index 2eaea2414..70df54e93 100644 --- a/test/plugin/scenarios/gateway-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/gateway-3.x-scenario/config/expectedData.yaml @@ -52,6 +52,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SpringCloudGateway/RoutingFilter, networkAddress: 'localhost:18070', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not diff --git a/test/plugin/scenarios/graphql-12.x-15.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/graphql-12.x-15.x-scenario/config/expectedData.yaml index 88114dd57..5aa2b8883 100644 --- a/test/plugin/scenarios/graphql-12.x-15.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/graphql-12.x-15.x-scenario/config/expectedData.yaml @@ -84,4 +84,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/graphql-scenario/case/graphql'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/graphql-16plus-scenario/config/expectedData.yaml b/test/plugin/scenarios/graphql-16plus-scenario/config/expectedData.yaml index 7d238e7fe..b398b90a6 100644 --- a/test/plugin/scenarios/graphql-16plus-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/graphql-16plus-scenario/config/expectedData.yaml @@ -84,4 +84,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/graphql-scenario/case/graphql'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/graphql-8.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/graphql-8.x-scenario/config/expectedData.yaml index f71bff954..26bc747a7 100644 --- a/test/plugin/scenarios/graphql-8.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/graphql-8.x-scenario/config/expectedData.yaml @@ -84,4 +84,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/graphql-scenario/case/graphql'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/graphql-9.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/graphql-9.x-scenario/config/expectedData.yaml index 452d04a26..7c3016cb1 100644 --- a/test/plugin/scenarios/graphql-9.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/graphql-9.x-scenario/config/expectedData.yaml @@ -84,4 +84,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/graphql-scenario/case/graphql'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/grpc-generic-call-scenario/config/expectedData.yaml b/test/plugin/scenarios/grpc-generic-call-scenario/config/expectedData.yaml index 5e2d11774..5d965aec9 100644 --- a/test/plugin/scenarios/grpc-generic-call-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/grpc-generic-call-scenario/config/expectedData.yaml @@ -101,5 +101,6 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8888/case/generic-call'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} -meterItems: [] \ No newline at end of file +meterItems: [] diff --git a/test/plugin/scenarios/gson-scenario/config/expectedData.yaml b/test/plugin/scenarios/gson-scenario/config/expectedData.yaml index 930ec2034..34ab87d61 100644 --- a/test/plugin/scenarios/gson-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/gson-scenario/config/expectedData.yaml @@ -57,4 +57,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/gson-scenario/case/gson-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/guava-cache-scenario/config/expectedData.yaml b/test/plugin/scenarios/guava-cache-scenario/config/expectedData.yaml index d19bbc644..b34ec4285 100644 --- a/test/plugin/scenarios/guava-cache-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/guava-cache-scenario/config/expectedData.yaml @@ -117,4 +117,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/guava-cache-scenario/case/guava'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/guava-eventbus-scenario/config/expectedData.yaml b/test/plugin/scenarios/guava-eventbus-scenario/config/expectedData.yaml index f96603fbe..550149fae 100644 --- a/test/plugin/scenarios/guava-eventbus-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/guava-eventbus-scenario/config/expectedData.yaml @@ -46,6 +46,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/guava-eventbus-scenario/case/guava-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: Guava/EventBus/org.apache.skywalking.apm.testcase.guava.eventbus.service.SubscriberService/consumer @@ -65,4 +66,4 @@ segmentItems: refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: guava-eventbus-scenario, traceId: not null } -meterItems: [] \ No newline at end of file +meterItems: [] diff --git a/test/plugin/scenarios/h2-scenario/config/expectedData.yaml b/test/plugin/scenarios/h2-scenario/config/expectedData.yaml index 551771a5e..953455f74 100644 --- a/test/plugin/scenarios/h2-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/h2-scenario/config/expectedData.yaml @@ -94,6 +94,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/h2-scenario/case/h2-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' meterItems: - serviceName: h2-scenario diff --git a/test/plugin/scenarios/hbase-scenario/config/expectedData.yaml b/test/plugin/scenarios/hbase-scenario/config/expectedData.yaml index 9d06eecb7..70d21941f 100644 --- a/test/plugin/scenarios/hbase-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/hbase-scenario/config/expectedData.yaml @@ -89,3 +89,4 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/hbase-scenario/case/hbase-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/hikaricp-scenario/config/expectedData.yaml b/test/plugin/scenarios/hikaricp-scenario/config/expectedData.yaml index afc4c3c5c..9d9991a82 100644 --- a/test/plugin/scenarios/hikaricp-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/hikaricp-scenario/config/expectedData.yaml @@ -203,6 +203,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/hikaricp-scenario/case/hikaricp-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} meterItems: - serviceName: hikaricp-scenario meterSize: 15 diff --git a/test/plugin/scenarios/httpasyncclient-scenario/config/expectedData.yaml b/test/plugin/scenarios/httpasyncclient-scenario/config/expectedData.yaml index 16ea12a56..f41a91282 100644 --- a/test/plugin/scenarios/httpasyncclient-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/httpasyncclient-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/httpasyncclient/case/httpasyncclient'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/httpasyncclient/back'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -58,12 +60,13 @@ segmentItems: startTime: nq 0 endTime: nq 0 componentId: 26 - isError: false + isError: true spanType: Exit peer: 127.0.0.1:8080 tags: - {key: url, value: 'http://127.0.0.1:8080/httpasyncclient/back'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: httpasyncclient/local parentSpanId: -1 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 d0faeb5c6..47bb04637 100644 --- a/test/plugin/scenarios/httpclient-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/httpclient-3.x-scenario/config/expectedData.yaml @@ -36,6 +36,7 @@ segmentItems: value: |- q1=[v1] chinese=[中文] + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/httpclient-3.x-scenario/case/httpclient, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -57,6 +58,7 @@ segmentItems: - {key: url, value: 'http://localhost:8080/httpclient-3.x-scenario/case/context-propagate?q1=v1&chinese=%e4%b8%ad%e6%96%87'} - {key: http.method, value: GET} - {key: http.params, value: q1=v1&chinese=%e4%b8%ad%e6%96%87} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/httpclient-3.x-scenario/case/httpclient parentSpanId: -1 @@ -75,4 +77,5 @@ segmentItems: value: |- q1=[v1] chinese=[中文] + - {key: http.status_code, value: '200'} skipAnalysis: 'false' 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 1e041402c..2b40ba253 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 @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/httpclient-4.3.x-scenario/case/context-propagate'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/httpclient-4.3.x-scenario/case/httpclient, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -52,6 +53,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/httpclient-4.3.x-scenario/case/context-propagate'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/httpclient-4.3.x-scenario/case/httpclient parentSpanId: -1 @@ -66,4 +68,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/httpclient-4.3.x-scenario/case/httpclient'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/httpclient-5.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/httpclient-5.x-scenario/config/expectedData.yaml index db39ffc4b..d1d6e1d04 100644 --- a/test/plugin/scenarios/httpclient-5.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/httpclient-5.x-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/httpclient-5.x/back'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: httpasyncclient/local, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -52,6 +53,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/httpclient-5.x/back'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: httpasyncclient/local parentSpanId: -1 @@ -83,6 +85,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/httpclient-5.x/case/asyncGet'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/httpclient-5.x/case/get, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -103,6 +106,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/httpclient-5.x/case/asyncGet'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/httpclient-5.x/case/get parentSpanId: -1 @@ -117,4 +121,5 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/httpclient-5.x/case/get'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/hutool-http-5.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/hutool-http-5.x-scenario/config/expectedData.yaml index 223b0b022..e2ee9ffa9 100644 --- a/test/plugin/scenarios/hutool-http-5.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/hutool-http-5.x-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/hutool-http-5.x-scenario/case/hutool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/hutool-http-5.x-scenario/case/hutool-http-5.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -67,4 +68,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/hutool-http-5.x-scenario/case/hutool-http-5.x-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml b/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml index f2d1ce819..238cc8591 100644 --- a/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml @@ -83,4 +83,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/hystrix-scenario/case/hystrix-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/influxdb-scenario/config/expectedData.yaml b/test/plugin/scenarios/influxdb-scenario/config/expectedData.yaml index e68687995..89d049406 100644 --- a/test/plugin/scenarios/influxdb-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/influxdb-scenario/config/expectedData.yaml @@ -31,6 +31,7 @@ segmentItems: peer: http://influxdb:8086 tags: - {key: db.type, value: InfluxDB} + - {key: http.status_code, value: '204'} skipAnalysis: 'false' - operationName: HEAD:/influxdb-scenario/case/healthCheck parentSpanId: -1 @@ -46,6 +47,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/influxdb-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: InfluxDB/query @@ -62,6 +64,7 @@ segmentItems: - {key: db.type, value: InfluxDB} - {key: db.instance, value: skywalking} - {key: db.statement, value: 'CREATE DATABASE skywalking'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: InfluxDB/query parentSpanId: 0 @@ -77,6 +80,7 @@ segmentItems: - {key: db.type, value: InfluxDB} - {key: db.instance, value: skywalking} - {key: db.statement, value: 'CREATE RETENTION POLICY one_day ON skywalking DURATION 1d REPLICATION 1 DEFAULT'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: InfluxDB/write parentSpanId: 0 @@ -92,6 +96,7 @@ segmentItems: - {key: db.type, value: InfluxDB} - {key: db.instance, value: skywalking} - {key: db.statement, value: not null} + - {key: http.status_code, value: '204'} skipAnalysis: 'false' - operationName: InfluxDB/query parentSpanId: 0 @@ -107,6 +112,7 @@ segmentItems: - {key: db.type, value: InfluxDB} - {key: db.instance, value: skywalking} - {key: db.statement, value: 'SELECT * FROM heartbeat'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/influxdb-scenario/case/influxdb-scenario parentSpanId: -1 @@ -121,4 +127,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/influxdb-scenario/case/influxdb-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/jackson-scenario/config/expectedData.yaml b/test/plugin/scenarios/jackson-scenario/config/expectedData.yaml index 42e359c76..6c92d210e 100644 --- a/test/plugin/scenarios/jackson-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jackson-scenario/config/expectedData.yaml @@ -148,3 +148,4 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/jackson-scenario/case/jackson-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml index 7cd7fc57f..495be83cd 100644 --- a/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jdk-http-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/jdk-http-scenario/case/receiveContext-0'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/jdk-http-scenario/case/jdk-http-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -52,6 +53,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/jdk-http-scenario/case/receiveContext-0'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/jdk-http-scenario/case/jdk-http-scenario parentSpanId: -1 @@ -66,4 +68,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/jdk-http-scenario/case/jdk-http-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml index fb047bddb..9c512b2ae 100644 --- a/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/greet/skywalking'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: url, value: 'https://github.com/apache/skywalking'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: Threading/test.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$1/run parentSpanId: -1 @@ -79,6 +81,7 @@ segmentItems: tags: - {key: url, value: 'https://github.com/apache/skywalking'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: Threading/test.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$2/call parentSpanId: -1 diff --git a/test/plugin/scenarios/jdk-threadpool-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk-threadpool-scenario/config/expectedData.yaml index 3a78cdd07..21c509cc2 100644 --- a/test/plugin/scenarios/jdk-threadpool-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jdk-threadpool-scenario/config/expectedData.yaml @@ -34,6 +34,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SwRunnableWrapper/http-get-thread, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -56,6 +57,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: SwRunnableWrapper/http-get-thread operationId: 0 parentSpanId: -1 @@ -90,6 +92,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SwCallableWrapper/http-get-thread, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -112,6 +115,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: SwCallableWrapper/http-get-thread operationId: 0 parentSpanId: -1 @@ -146,6 +150,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SwRunnableWrapper/http-get-thread, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -168,6 +173,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: SwRunnableWrapper/http-get-thread operationId: 0 parentSpanId: -1 @@ -202,6 +208,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: SwRunnableWrapper/http-get-thread operationId: 0 parentSpanId: -1 @@ -236,6 +243,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SwCallableWrapper/http-get-thread, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -258,6 +266,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SwRunnableWrapper/http-get-thread, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -280,6 +289,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: SwCallableWrapper/http-get-thread operationId: 0 parentSpanId: -1 @@ -314,6 +324,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: SwRunnableWrapper/http-get-thread operationId: 0 parentSpanId: -1 @@ -348,6 +359,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/greet/skywalking'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: GET:/threadpool @@ -365,8 +377,9 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/threadpool'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SwRunnableWrapper/http-get-thread, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: jdk-threadpool-scenario, - traceId: not null} \ No newline at end of file + traceId: not null} diff --git a/test/plugin/scenarios/jdk17-with-gson-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk17-with-gson-scenario/config/expectedData.yaml index 47502b3b7..22846e58c 100644 --- a/test/plugin/scenarios/jdk17-with-gson-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jdk17-with-gson-scenario/config/expectedData.yaml @@ -70,4 +70,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/gson-scenario/case/gson-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/jedis-scenario/config/expectedData.yaml b/test/plugin/scenarios/jedis-scenario/config/expectedData.yaml index 8c83ed879..5136952b6 100644 --- a/test/plugin/scenarios/jedis-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jedis-scenario/config/expectedData.yaml @@ -158,4 +158,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/jedis-scenario/case/jedis-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml b/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml index c5e038b83..ea3039c06 100644 --- a/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jetty-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:18080/jettyserver-case/case/receiveContext-0'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/jettyclient-case/case/jettyclient-case, networkAddress: 'localhost:18080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -68,4 +69,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/jettyclient-case/case/jettyclient-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/jetty-scenario/support-version.list b/test/plugin/scenarios/jetty-scenario/support-version.list index eba44976f..222131536 100644 --- a/test/plugin/scenarios/jetty-scenario/support-version.list +++ b/test/plugin/scenarios/jetty-scenario/support-version.list @@ -17,4 +17,3 @@ 9.4.8.v20171121 9.3.22.v20171030 9.2.23.v20171218 -9.1.6.v20160112 diff --git a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/config/expectedData.yaml index 7dfe0efa2..5a84507f1 100644 --- a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/config/expectedData.yaml @@ -54,6 +54,7 @@ segmentItems: value: 'http://localhost:8080/jsonrpc4j-1.x-scenario/case/json-rpc', } - { key: http.method, value: GET } + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: /jsonrpc4j-1.x-scenario/path/to/demo-service diff --git a/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml b/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml index 5d539193a..6d549cb5d 100644 --- a/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/kafka-scenario/config/expectedData.yaml @@ -145,6 +145,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/kafka-scenario/case/kafka-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -183,6 +184,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/kafka-scenario/case/kafka-thread2-ping'} + - {key: http.status_code, value: '200'} - operationName: Kafka/test./Consumer/testGroup2 parentSpanId: -1 spanId: 0 @@ -222,6 +224,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/kafka-scenario/case/kafka-thread2-ping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: not null, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -247,4 +250,4 @@ segmentItems: - { parentEndpoint: GET:/case/kafka-case, networkAddress: 'kafka-server:9092', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: 'kafka-scenario', traceId: not null } - skipAnalysis: 'false' \ No newline at end of file + 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 4b98ef0f8..107dbda5e 100644 --- a/test/plugin/scenarios/kotlin-coroutine-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/kotlin-coroutine-scenario/config/expectedData.yaml @@ -108,4 +108,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/kotlin-coroutine-scenario/case/h2'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/config/expectedData.yaml index 7ecf5659f..73dd96bfb 100644 --- a/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/config/expectedData.yaml @@ -78,5 +78,6 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/kylin-jdbc-2.6.x-3.x-4.x-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} logs: [] - skipAnalysis: 'false' \ No newline at end of file + skipAnalysis: 'false' diff --git a/test/plugin/scenarios/lettuce-scenario/config/expectedData.yaml b/test/plugin/scenarios/lettuce-scenario/config/expectedData.yaml index e9a876516..2b0ada8f8 100644 --- a/test/plugin/scenarios/lettuce-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/lettuce-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/lettuce-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: Lettuce/GET @@ -91,3 +92,4 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/lettuce-scenario/case/lettuce-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/mariadb-scenario/config/expectedData.yaml b/test/plugin/scenarios/mariadb-scenario/config/expectedData.yaml index b0d814b3b..6c5762e86 100644 --- a/test/plugin/scenarios/mariadb-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/mariadb-scenario/config/expectedData.yaml @@ -109,5 +109,6 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/mariadb-scenario/case/mariadb-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: [] skipAnalysis: 'false' diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/mongodb-3.x-scenario/config/expectedData.yaml index 572864ed1..e17d7162c 100644 --- a/test/plugin/scenarios/mongodb-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/mongodb-3.x-scenario/config/expectedData.yaml @@ -130,4 +130,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/mongodb-case/case/mongodb'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/mongodb-4.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/mongodb-4.x-scenario/config/expectedData.yaml index 9e539de7c..6f4c9bd26 100644 --- a/test/plugin/scenarios/mongodb-4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/mongodb-4.x-scenario/config/expectedData.yaml @@ -130,4 +130,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/mongodb-4.x-scenario/case/mongodb-4.x-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/mssql-jdbc-scenario/config/expectedData.yaml b/test/plugin/scenarios/mssql-jdbc-scenario/config/expectedData.yaml index 6d016e0fa..a640bc974 100644 --- a/test/plugin/scenarios/mssql-jdbc-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/mssql-jdbc-scenario/config/expectedData.yaml @@ -115,5 +115,6 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/mssql-jdbc-scenario/case/mssql-jdbc-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: [] skipAnalysis: 'false' diff --git a/test/plugin/scenarios/mssql-jtds-scenario/config/expectedData.yaml b/test/plugin/scenarios/mssql-jtds-scenario/config/expectedData.yaml index a578a7201..5e4a4d145 100644 --- a/test/plugin/scenarios/mssql-jtds-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/mssql-jtds-scenario/config/expectedData.yaml @@ -97,5 +97,6 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/mssql-jtds-scenario/case/mssql-jtds-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: [] skipAnalysis: 'false' diff --git a/test/plugin/scenarios/mybatis-3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/mybatis-3.x-scenario/config/expectedData.yaml index d53c6f68a..26811ff38 100644 --- a/test/plugin/scenarios/mybatis-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/mybatis-3.x-scenario/config/expectedData.yaml @@ -118,4 +118,5 @@ segmentItems: skipAnalysis: 'false' tags: - {key: url, value: 'http://localhost:8080/mybatis-3.x-scenario/case/mybatis-case'} - - {key: http.method, value: GET} \ No newline at end of file + - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/mysql-scenario/config/expectedData.yaml b/test/plugin/scenarios/mysql-scenario/config/expectedData.yaml index 27082375a..5b13bae85 100644 --- a/test/plugin/scenarios/mysql-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/mysql-scenario/config/expectedData.yaml @@ -84,7 +84,7 @@ segmentItems: spanType: Exit componentId: 33 peer: mysql-server:3306 - skipAnalysis: 'false' + skipAnalysis: 'false' - operationName: Mysql/JDBI/Statement/executeQuery parentSpanId: 0 spanId: 5 @@ -131,7 +131,7 @@ segmentItems: spanType: Exit componentId: 33 peer: mysql-server:3306 - skipAnalysis: 'false' + skipAnalysis: 'false' - operationName: Mysql/JDBI/Connection/close parentSpanId: 0 spanId: 8 @@ -160,5 +160,6 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/mysql-scenario/case/mysql-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: [] skipAnalysis: 'false' diff --git a/test/plugin/scenarios/neo4j-4.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/neo4j-4.x-scenario/config/expectedData.yaml index cb7907f33..087b9b8cc 100644 --- a/test/plugin/scenarios/neo4j-4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/neo4j-4.x-scenario/config/expectedData.yaml @@ -136,4 +136,5 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/neo4j-scenario/case/neo4j-scenario' } - { key: http.method, value: GET } + - {key: http.status_code, value: '200'} meterItems: [ ] diff --git a/test/plugin/scenarios/netty-socketio-scenario/config/expectedData.yaml b/test/plugin/scenarios/netty-socketio-scenario/config/expectedData.yaml index 46a9fbb53..003418b73 100644 --- a/test/plugin/scenarios/netty-socketio-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/netty-socketio-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/netty-socketio-scenario/case/netty-socketio'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -76,6 +77,7 @@ segmentItems: tags: - { key: http.method, value: not null } - { key: url, value: not null } + - { key: http.status_code, value: '200' } skipAnalysis: 'false' - operationName: Callback/onResponse operationId: 0 diff --git a/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml b/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml index 640777184..d76add8a0 100644 --- a/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml @@ -40,6 +40,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/okhttp-case/case/okhttp-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -55,6 +56,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-0'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Async/execute, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -74,6 +76,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Async/execute, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not @@ -94,6 +97,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-0'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /okhttp-case/case/receiveContext-1 parentSpanId: 2 @@ -109,6 +113,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-1'} + - {key: http.status_code, value: '200'} - {operationName: Callback/onResponse, parentSpanId: 0, spanId: 2, spanLayer: Unknown, startTime: nq 0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '', skipAnalysis: false} diff --git a/test/plugin/scenarios/okhttp2-scenario/config/expectedData.yaml b/test/plugin/scenarios/okhttp2-scenario/config/expectedData.yaml index 4ed87e874..8418ef29b 100644 --- a/test/plugin/scenarios/okhttp2-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/okhttp2-scenario/config/expectedData.yaml @@ -40,6 +40,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/okhttp2-scenario/case/okhttp2-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -55,6 +56,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/okhttp2-scenario/case/receiveContext-0'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Async/execute, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -74,6 +76,7 @@ segmentItems: tags: - {key: url, value: 'http://127.0.0.1:8080/okhttp2-scenario/case/receiveContext-1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: Async/execute, networkAddress: '127.0.0.1:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not @@ -94,6 +97,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://127.0.0.1:8080/okhttp2-scenario/case/receiveContext-0'} + - {key: http.status_code, value: '200'} - operationName: /okhttp2-scenario/case/receiveContext-1 parentSpanId: 2 spanId: 3 @@ -108,6 +112,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://127.0.0.1:8080/okhttp2-scenario/case/receiveContext-1'} + - {key: http.status_code, value: '200'} - {operationName: Callback/onResponse, parentSpanId: 0, spanId: 2, spanLayer: Unknown, startTime: nq 0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '', skipAnalysis: false} diff --git a/test/plugin/scenarios/oracle-scenario/config/expectedData.yaml b/test/plugin/scenarios/oracle-scenario/config/expectedData.yaml index d81ffaeb3..83b3c09ba 100644 --- a/test/plugin/scenarios/oracle-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/oracle-scenario/config/expectedData.yaml @@ -109,4 +109,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/oracle-scenario/case/oracle'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/play-scenario/config/expectedData.yaml b/test/plugin/scenarios/play-scenario/config/expectedData.yaml index 776fc7c70..1cf5d1805 100644 --- a/test/plugin/scenarios/play-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/play-scenario/config/expectedData.yaml @@ -32,4 +32,5 @@ segmentItems: tags: - {key: url, value: 'localhost:9000/play-scenario/case/play-scenario/projects/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/config/expectedData.yaml b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/config/expectedData.yaml index deadf1f06..d0a3b8e7d 100644 --- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/config/expectedData.yaml @@ -94,4 +94,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/postgresql-scenario/case/postgres'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/postgresql-scenario/config/expectedData.yaml b/test/plugin/scenarios/postgresql-scenario/config/expectedData.yaml index 0004ff412..9dc0b738b 100644 --- a/test/plugin/scenarios/postgresql-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/postgresql-scenario/config/expectedData.yaml @@ -93,4 +93,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/postgresql-scenario/case/postgres'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml b/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml index b245bda50..57000dc63 100644 --- a/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/pulsar-scenario/config/expectedData.yaml @@ -60,6 +60,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8088/pulsar-scenario/case/pulsar-case' } - { key: http.method, value: GET } + - { key: http.status_code, value: '200' } skipAnalysis: 'false' - segmentId: not null spans: diff --git a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/config/expectedData.yaml index f06045e50..61a751ce4 100644 --- a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/quartz-scheduler-2.x-scenario/case/call'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: quartz-scheduler/org.apache.skywalking.apm.testcase.quartzscheduler.job.DemoJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} - segmentId: not null @@ -51,6 +52,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/quartz-scheduler-2.x-scenario/case/call'} + - {key: http.status_code, value: '200'} - operationName: quartz-scheduler/org.apache.skywalking.apm.testcase.quartzscheduler.job.DemoJob parentSpanId: -1 spanId: 0 @@ -90,4 +92,4 @@ segmentItems: - {key: event, value: error} - {key: error.kind, value: org.quartz.JobExecutionException} - {key: message, value: not null} - - {key: stack, value: not null} \ No newline at end of file + - {key: stack, value: not null} diff --git a/test/plugin/scenarios/quasar-scenario/config/expectedData.yaml b/test/plugin/scenarios/quasar-scenario/config/expectedData.yaml index bcd3032d1..fc114a392 100644 --- a/test/plugin/scenarios/quasar-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/quasar-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/quasar-scenario/case/quasar-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: /quasar-scenario/case/ping @@ -49,6 +50,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/quasar-scenario/case/ping'} + - {key: http.status_code, value: '200'} - operationName: QUASAR/Fiber parentSpanId: -1 spanId: 0 @@ -64,4 +66,4 @@ segmentItems: - {parentEndpoint: GET:/quasar-scenario/case/quasar-scenario, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: quasar-scenario, - traceId: not null} \ No newline at end of file + traceId: not null} diff --git a/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml b/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml index c458575f6..ba35bc861 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml @@ -69,4 +69,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/rabbitmq-scenario/case/rabbitmq'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/redisson-scenario/config/expectedData.yaml b/test/plugin/scenarios/redisson-scenario/config/expectedData.yaml index a16323649..73b06f1c2 100644 --- a/test/plugin/scenarios/redisson-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/redisson-scenario/config/expectedData.yaml @@ -63,4 +63,5 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/resteasy-4.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/resteasy-4.x-scenario/config/expectedData.yaml index 08dd31dfa..403a2cc2b 100644 --- a/test/plugin/scenarios/resteasy-4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/resteasy-4.x-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/healthCheck' } - { key: http.method, value: HEAD } + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -49,6 +50,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/create/' } - { key: http.method, value: POST } + - {key: http.status_code, value: '201'} refs: - { parentEndpoint: 'GET:/resteasy-4.x-scenario/case/resttemplate', networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -70,6 +72,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/get/1' } - { key: http.method, value: GET } + - {key: http.status_code, value: '200'} refs: - { parentEndpoint: 'GET:/resteasy-4.x-scenario/case/resttemplate', networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not @@ -90,6 +93,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/update/1' } - { key: http.method, value: PUT } + - {key: http.status_code, value: '200'} refs: - { parentEndpoint: 'GET:/resteasy-4.x-scenario/case/resttemplate', networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not @@ -110,6 +114,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/delete/1' } - { key: http.method, value: DELETE } + - {key: http.status_code, value: '204'} refs: - { parentEndpoint: 'GET:/resteasy-4.x-scenario/case/resttemplate', networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not @@ -130,6 +135,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/create/' } - { key: http.method, value: POST } + - {key: http.status_code, value: '201'} skipAnalysis: 'false' - operationName: /resteasy-4.x-scenario/get/1 parentSpanId: 0 @@ -144,6 +150,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/get/1' } - { key: http.method, value: GET } + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /resteasy-4.x-scenario/update/1 parentSpanId: 0 @@ -158,6 +165,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/update/1' } - { key: http.method, value: PUT } + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /resteasy-4.x-scenario/delete/1 parentSpanId: 0 @@ -172,6 +180,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/delete/1' } - { key: http.method, value: DELETE } + - {key: http.status_code, value: '204'} skipAnalysis: 'false' - operationName: GET:/resteasy-4.x-scenario/case/resttemplate operationId: 0 @@ -187,4 +196,5 @@ segmentItems: skipAnalysis: false tags: - { key: url, value: 'http://localhost:8080/resteasy-4.x-scenario/case/resttemplate' } - - { key: http.method, value: GET } \ No newline at end of file + - { key: http.method, value: GET } + - {key: http.status_code, value: '200'} 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 9c41223db..bdbdbef78 100644 --- a/test/plugin/scenarios/resttemplate-4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/resttemplate-4.x-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/resttemplate-4.x-scenario/resttemplate/case/healthcheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/resttemplate-4.x-scenario/resttemplate/asyncback'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/resttemplate-4.x-scenario/resttemplate/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, @@ -69,6 +71,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/resttemplate-4.x-scenario/resttemplate/syncback'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/resttemplate-4.x-scenario/resttemplate/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, @@ -115,6 +118,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/resttemplate-4.x-scenario/resttemplate/syncback'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/resttemplate-4.x-scenario/resttemplate/case/resttemplate parentSpanId: -1 @@ -129,4 +133,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/resttemplate-4.x-scenario/resttemplate/case/resttemplate'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/resttemplate-4.x-scenario/support-version.list b/test/plugin/scenarios/resttemplate-4.x-scenario/support-version.list index 7234a9cb7..26ac170c7 100644 --- a/test/plugin/scenarios/resttemplate-4.x-scenario/support-version.list +++ b/test/plugin/scenarios/resttemplate-4.x-scenario/support-version.list @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -4.0.9.RELEASE 4.1.9.RELEASE 4.2.9.RELEASE -4.3.26.RELEASE \ No newline at end of file +4.3.26.RELEASE diff --git a/test/plugin/scenarios/retransform-class-scenario/config/expectedData.yaml b/test/plugin/scenarios/retransform-class-scenario/config/expectedData.yaml index 9962103c3..f2ede645a 100644 --- a/test/plugin/scenarios/retransform-class-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/retransform-class-scenario/config/expectedData.yaml @@ -32,4 +32,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/case/retransform-class-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/retransform-class-tomcat-scenario/config/expectedData.yaml b/test/plugin/scenarios/retransform-class-tomcat-scenario/config/expectedData.yaml index 8c642ec8a..e9ff13eb9 100644 --- a/test/plugin/scenarios/retransform-class-tomcat-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/retransform-class-tomcat-scenario/config/expectedData.yaml @@ -33,4 +33,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/retransform-class-tomcat-scenario/case/retransform-class'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/sentinel-scenario/config/expectedData.yaml b/test/plugin/scenarios/sentinel-scenario/config/expectedData.yaml index f015d9f98..0f14651d2 100644 --- a/test/plugin/scenarios/sentinel-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/sentinel-scenario/config/expectedData.yaml @@ -34,6 +34,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/sentinel-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: Sentinel/test_SphO_entry @@ -91,4 +92,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/sentinel-scenario/case/sentinel-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} meterItems: [] diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/servicecomb-1.x-scenario/config/expectedData.yaml index 80dacad90..020f6f5e1 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/config/expectedData.yaml @@ -31,6 +31,7 @@ segmentItems: peer: '' tags: - {key: url, value: /sayHi} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: codefirst.codeFirstSpringmvcHelloClient.say, networkAddress: not null, refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not @@ -51,6 +52,7 @@ segmentItems: peer: not null tags: - {key: url, value: /sayHi} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: codefirst.codeFirstSpringmvcHelloClient.say parentSpanId: -1 @@ -64,4 +66,5 @@ segmentItems: peer: '' tags: - {key: url, value: /case} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/servicecomb-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/servicecomb-2.x-scenario/config/expectedData.yaml index 5264ffea8..6742c2ea5 100644 --- a/test/plugin/scenarios/servicecomb-2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/servicecomb-2.x-scenario/config/expectedData.yaml @@ -31,6 +31,7 @@ segmentItems: peer: '' tags: - {key: url, value: /sayHi} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: codefirsttest.codeFirstSpringmvcHelloClient.say, networkAddress: not null, refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not @@ -51,6 +52,7 @@ segmentItems: peer: not null tags: - {key: url, value: /sayHi} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: codefirsttest.codeFirstSpringmvcHelloClient.say parentSpanId: -1 @@ -64,4 +66,5 @@ segmentItems: peer: '' tags: - {key: url, value: /say} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' 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 cbefabb36..e65243a6e 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/config/expectedData.yaml @@ -178,4 +178,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/shardingsphere-3.x-scenario/case/execute'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/config/expectedData.yaml index d805ccc70..9b9fe92ef 100644 --- a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/config/expectedData.yaml @@ -178,4 +178,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/shardingsphere-4.0.x-scenario/case/execute'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/shardingsphere-4.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/shardingsphere-4.x-scenario/config/expectedData.yaml index 9d696dcea..33f3b05b5 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shardingsphere-4.x-scenario/config/expectedData.yaml @@ -178,4 +178,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/shardingsphere-4.x-scenario/case/execute'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml index 448a41f48..23235a83b 100644 --- a/test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml @@ -210,4 +210,5 @@ segmentItems: skipAnalysis: false tags: - { key: url, value: 'http://localhost:8080/shardingsphere-5.0.0-scenario/case/execute' } - - { key: http.method, value: GET } \ No newline at end of file + - { key: http.method, value: GET } + - {key: http.status_code, value: '200'} diff --git a/test/plugin/scenarios/shenyu-2.4.x-dubbo-scenario/config/expectedData.yaml b/test/plugin/scenarios/shenyu-2.4.x-dubbo-scenario/config/expectedData.yaml index 6df4aa21b..40351c90f 100644 --- a/test/plugin/scenarios/shenyu-2.4.x-dubbo-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shenyu-2.4.x-dubbo-scenario/config/expectedData.yaml @@ -43,6 +43,8 @@ segmentItems: spanType: Local peer: '' skipAnalysis: false + tags: + - {key: http.status_code, value: '200'} refs: - { parentEndpoint: /dubbo/findById, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, @@ -116,6 +118,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:9196/dubbo/findById'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: GET:/entry/dubbo-service parentSpanId: -1 spanId: 0 @@ -130,5 +133,6 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8888/entry/dubbo-service'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} -meterItems: [] \ No newline at end of file +meterItems: [] diff --git a/test/plugin/scenarios/shenyu-2.4.x-grpc-scenario/config/expectedData.yaml b/test/plugin/scenarios/shenyu-2.4.x-grpc-scenario/config/expectedData.yaml index bce4b38b9..775da9ef3 100644 --- a/test/plugin/scenarios/shenyu-2.4.x-grpc-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shenyu-2.4.x-grpc-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:9196/grpc/echo' } - { key: http.method, value: POST } + - { key: http.status_code, value: '200' } - operationName: GET:/entry/rpc-service parentSpanId: -1 spanId: 0 @@ -47,6 +48,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8888/entry/rpc-service' } - { key: http.method, value: GET } + - { key: http.status_code, value: '200' } - serviceName: shenyu-gateway @@ -79,6 +81,8 @@ segmentItems: spanType: Local peer: '' skipAnalysis: false + tags: + - {key: http.status_code, value: '200'} refs: - { parentEndpoint: /grpc/echo, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, @@ -163,4 +167,4 @@ segmentItems: -meterItems: [] \ No newline at end of file +meterItems: [] diff --git a/test/plugin/scenarios/shenyu-2.4.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/shenyu-2.4.x-scenario/config/expectedData.yaml index 8916a6b3f..4bd772233 100644 --- a/test/plugin/scenarios/shenyu-2.4.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shenyu-2.4.x-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8189/order/findById'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: /order/findById, networkAddress: 'localhost:8189', refType: CrossProcess, parentSpanId: 0, parentTraceSegmentId: not null, @@ -102,6 +103,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:9195/http/order/findById'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/entry/http-service parentSpanId: -1 @@ -116,5 +118,5 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8888/entry/http-service' } - { key: http.method, value: GET } + - { key: http.status_code, value: '200' } skipAnalysis: 'false' - diff --git a/test/plugin/scenarios/shenyu-2.4.x-sofarpc-scenario/config/expectedData.yaml b/test/plugin/scenarios/shenyu-2.4.x-sofarpc-scenario/config/expectedData.yaml index b154a090c..6e6ac63a2 100644 --- a/test/plugin/scenarios/shenyu-2.4.x-sofarpc-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/shenyu-2.4.x-sofarpc-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:9196/sofa/hello' } - { key: http.method, value: GET } + - { key: http.status_code, value: '200' } - operationName: GET:/entry/rpc-service parentSpanId: -1 spanId: 0 @@ -47,6 +48,7 @@ segmentItems: tags: - { key: url, value: 'http://localhost:8888/entry/rpc-service' } - { key: http.method, value: GET } + - { key: http.status_code, value: '200' } @@ -79,6 +81,8 @@ segmentItems: spanType: Local peer: '' skipAnalysis: false + tags: + - {key: http.status_code, value: '200'} refs: - { parentEndpoint: /sofa/hello, networkAddress: '', refType: CrossThread, parentSpanId: 0, parentTraceSegmentId: not null, @@ -132,4 +136,4 @@ segmentItems: -meterItems: [] \ No newline at end of file +meterItems: [] diff --git a/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml b/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml index 9ab111382..f8d0f4f80 100644 --- a/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml @@ -62,4 +62,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/sofarpc-scenario/case/sofarpc'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/solrj-7.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/solrj-7.x-scenario/config/expectedData.yaml index 52564f64b..3ff59ca31 100644 --- a/test/plugin/scenarios/solrj-7.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/solrj-7.x-scenario/config/expectedData.yaml @@ -31,6 +31,7 @@ segmentItems: peer: solr-server:8983 tags: - {key: db.type, value: Solr} + - {key: http.status_code, value: '200'} - {key: QTime, value: gt 0} skipAnalysis: 'false' - operationName: solrJ/mycore/update/COMMIT @@ -45,6 +46,7 @@ segmentItems: peer: solr-server:8983 tags: - {key: db.type, value: Solr} + - {key: http.status_code, value: '200'} - {key: QTime, value: gt 0} skipAnalysis: 'false' - operationName: solrJ/mycore/update/OPTIMIZE @@ -59,6 +61,7 @@ segmentItems: peer: solr-server:8983 tags: - {key: db.type, value: Solr} + - {key: http.status_code, value: '200'} - {key: QTime, value: gt 0} skipAnalysis: 'false' - operationName: solrJ/mycore/select @@ -75,6 +78,7 @@ segmentItems: - {key: db.type, value: Solr} - {key: start, value: '0'} - {key: qt, value: /select} + - {key: http.status_code, value: '200'} - {key: numFound, value: '100'} skipAnalysis: 'false' - operationName: solrJ/mycore/get @@ -91,6 +95,7 @@ segmentItems: - {key: db.type, value: Solr} - {key: start, value: '0'} - {key: qt, value: /get} + - {key: http.status_code, value: '200'} - {key: numFound, value: '1'} skipAnalysis: 'false' - operationName: solrJ/mycore/update/DELETE_BY_IDS @@ -105,6 +110,7 @@ segmentItems: peer: solr-server:8983 tags: - {key: db.type, value: Solr} + - {key: http.status_code, value: '200'} - {key: QTime, value: gt 0} skipAnalysis: 'false' - operationName: solrJ/mycore/update/DELETE_BY_QUERY @@ -119,6 +125,7 @@ segmentItems: peer: solr-server:8983 tags: - {key: db.type, value: Solr} + - {key: http.status_code, value: '200'} - {key: QTime, value: gt 0} skipAnalysis: 'false' - operationName: GET:/solrj-scenario/case/solrj @@ -134,4 +141,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/solrj-scenario/case/solrj'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml index 39b83825b..18fecf954 100644 --- a/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.0.x-scenario/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: GET:/impl/requestmapping @@ -49,6 +50,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.0.x-scenario/impl/requestmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/spring3, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, @@ -70,6 +72,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.0.x-scenario/impl/restmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/spring3, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 6, parentTraceSegmentId: not null, @@ -163,3 +166,4 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.0.x-scenario/case/spring3'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} 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 1613863bd..6d4b4065b 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 @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod @@ -82,6 +83,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/case/spring3/'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -103,6 +105,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/create/'} - {key: http.method, value: POST} + - {key: http.status_code, value: '201'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, @@ -124,6 +127,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/get/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, @@ -145,6 +149,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/delete/1'} - {key: http.method, value: DELETE} + - {key: http.status_code, value: '204'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, @@ -166,6 +171,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/update/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, @@ -187,6 +193,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/impl/requestmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 6, parentTraceSegmentId: not null, @@ -208,6 +215,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/case/spring3/'} + - {key: http.status_code, value: '200'} - operationName: /spring-3.1.x-scenario/create/ parentSpanId: 0 spanId: 2 @@ -278,6 +286,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/impl/requestmapping'} + - {key: http.status_code, value: '200'} - operationName: /spring-3.1.x-scenario/impl/restmapping parentSpanId: 0 spanId: 7 @@ -292,6 +301,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/impl/restmapping'} + - {key: http.status_code, value: '200'} - operationName: GET:/case/resttemplate parentSpanId: -1 spanId: 0 @@ -310,6 +320,7 @@ segmentItems: value: |- q1=[v1] chinese=[中文] + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: 'GET:/impl/restmapping' @@ -326,6 +337,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-3.1.x-scenario/impl/restmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 7, parentTraceSegmentId: not null, 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 50744ca02..7518565d4 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 @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod @@ -82,6 +83,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/case/spring3/'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -103,6 +105,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/create/'} - {key: http.method, value: POST} + - {key: http.status_code, value: '201'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, @@ -124,6 +127,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/get/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, @@ -145,6 +149,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/update/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, @@ -166,6 +171,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/delete/1'} - {key: http.method, value: DELETE} + - {key: http.status_code, value: '204'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, @@ -187,6 +193,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/impl/requestmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 6, parentTraceSegmentId: not null, @@ -208,6 +215,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/case/spring3/'} + - {key: http.status_code, value: '200'} - operationName: /spring-4.1.x-scenario/create/ parentSpanId: 0 spanId: 2 @@ -222,6 +230,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/create/'} - {key: http.method, value: POST} + - {key: http.status_code, value: '201'} - operationName: /spring-4.1.x-scenario/get/1 parentSpanId: 0 spanId: 3 @@ -236,6 +245,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/get/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - operationName: /spring-4.1.x-scenario/update/1 parentSpanId: 0 spanId: 4 @@ -250,6 +260,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/update/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} - operationName: /spring-4.1.x-scenario/delete/1 parentSpanId: 0 spanId: 5 @@ -264,6 +275,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/delete/1'} - {key: http.method, value: DELETE} + - {key: http.status_code, value: '204'} - operationName: /spring-4.1.x-scenario/impl/requestmapping parentSpanId: 0 spanId: 6 @@ -278,6 +290,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/impl/requestmapping'} + - {key: http.status_code, value: '200'} - operationName: /spring-4.1.x-scenario/impl/restmapping parentSpanId: 0 spanId: 7 @@ -292,6 +305,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/impl/restmapping'} + - {key: http.status_code, value: '200'} - operationName: GET:/case/resttemplate parentSpanId: -1 spanId: 0 @@ -306,6 +320,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/case/resttemplate'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: 'GET:/impl/restmapping' @@ -322,9 +337,9 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.1.x-scenario/impl/restmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 7, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-4.1.x-scenario, traceId: not null} - 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 0cb72a4e3..6b7b59894 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 @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -82,6 +83,7 @@ segmentItems: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/case/spring3/'} - {key: http.method, value: GET} - {key: http.headers, value: 'mock_header=[mock_value]'} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -102,6 +104,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/create/'} - {key: http.method, value: POST} + - {key: http.status_code, value: '201'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, parentTraceSegmentId: not null, parentServiceInstance: not @@ -122,6 +125,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/get/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 3, parentTraceSegmentId: not null, parentServiceInstance: not @@ -142,6 +146,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/update/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, parentTraceSegmentId: not null, parentServiceInstance: not @@ -162,6 +167,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/delete/1'} - {key: http.method, value: DELETE} + - {key: http.status_code, value: '204'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 5, parentTraceSegmentId: not null, parentServiceInstance: not @@ -182,6 +188,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/inherit/child/test'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 6, parentTraceSegmentId: not null, parentServiceInstance: not @@ -202,6 +209,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/impl/requestmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 7, parentTraceSegmentId: not null, parentServiceInstance: not @@ -222,6 +230,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/impl/restmapping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/case/resttemplate, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 8, parentTraceSegmentId: not null, parentServiceInstance: not @@ -242,6 +251,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/case/spring3/'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /spring-4.3.x-scenario/create/ parentSpanId: 0 @@ -256,6 +266,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/create/'} - {key: http.method, value: POST} + - {key: http.status_code, value: '201'} skipAnalysis: 'false' - operationName: /spring-4.3.x-scenario/get/1 parentSpanId: 0 @@ -270,6 +281,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/get/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /spring-4.3.x-scenario/update/1 parentSpanId: 0 @@ -284,6 +296,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/update/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /spring-4.3.x-scenario/delete/1 parentSpanId: 0 @@ -298,6 +311,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/delete/1'} - {key: http.method, value: DELETE} + - {key: http.status_code, value: '204'} skipAnalysis: 'false' - operationName: /spring-4.3.x-scenario/inherit/child/test parentSpanId: 0 @@ -312,6 +326,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/inherit/child/test'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /spring-4.3.x-scenario/impl/requestmapping parentSpanId: 0 @@ -326,6 +341,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/impl/requestmapping'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /spring-4.3.x-scenario/impl/restmapping parentSpanId: 0 @@ -340,6 +356,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/impl/restmapping'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/case/resttemplate parentSpanId: -1 @@ -354,4 +371,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-4.3.x-scenario/case/resttemplate'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml index 25d0a4f00..932b8448d 100644 --- a/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-async-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-async-scenario/case/spring-async'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-async-scenario/case/asyncVisit'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SpringAsync, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -68,6 +70,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-async-scenario/case/asyncVisit'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SpringAsync, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -88,6 +91,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-async-scenario/case/asyncVisit?by=system'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: SpringAsync parentSpanId: -1 @@ -119,6 +123,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-async-scenario/case/asyncVisit?by=customize'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: SpringAsync parentSpanId: -1 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 f4ab611e7..da1c64efe 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 @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.1.x-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.1.x-scenario/get'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/spring-cloud-feign-1.1.x-scenario/case/spring-cloud-feign-1.1.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: not null, @@ -69,6 +71,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.1.x-scenario/get'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: Balancer/spring-cloud-feign-1.1.x-scenario/get parentSpanId: 0 @@ -83,6 +86,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://spring-cloud-feign-1.1.x-scenario/spring-cloud-feign-1.1.x-scenario/get'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/spring-cloud-feign-1.1.x-scenario/case/spring-cloud-feign-1.1.x-scenario parentSpanId: -1 @@ -97,4 +101,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.1.x-scenario/case/spring-cloud-feign-1.1.x-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' 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 b6e80192f..df5562a55 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 @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.2.x-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.2.x-scenario/get'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/spring-cloud-feign-1.2.x-scenario/case/spring-cloud-feign-1.2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: not null, @@ -69,6 +71,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.2.x-scenario/get'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: Balancer/spring-cloud-feign-1.2.x-scenario/get parentSpanId: 0 @@ -83,6 +86,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://spring-cloud-feign-1.2.x-scenario/spring-cloud-feign-1.2.x-scenario/get'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: GET:/spring-cloud-feign-1.2.x-scenario/case/spring-cloud-feign-1.2.x-scenario parentSpanId: -1 @@ -97,4 +101,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-1.2.x-scenario/case/spring-cloud-feign-1.2.x-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' 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 cac686a8b..d7742eb25 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 @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/case/healthCheck'} - {key: http.method, value: HEAD} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: http.method, value: POST} - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/create/'} + - {key: http.status_code, value: '201'} skipAnalysis: 'false' - operationName: Balancer/spring-cloud-feign-2.x-scenario/create/ parentSpanId: 0 @@ -62,6 +64,7 @@ segmentItems: tags: - {key: http.method, value: POST} - {key: url, value: 'http://spring-cloud-feign-2.x-scenario/spring-cloud-feign-2.x-scenario/create/'} + - {key: http.status_code, value: '201'} skipAnalysis: 'false' - operationName: /spring-cloud-feign-2.x-scenario/get/1 parentSpanId: 3 @@ -76,6 +79,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/get/1'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: Balancer/spring-cloud-feign-2.x-scenario/get/{id} parentSpanId: 0 @@ -90,6 +94,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://spring-cloud-feign-2.x-scenario/spring-cloud-feign-2.x-scenario/get/1'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /spring-cloud-feign-2.x-scenario/update/1 parentSpanId: 5 @@ -104,6 +109,7 @@ segmentItems: tags: - {key: http.method, value: PUT} - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/update/1'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: Balancer/spring-cloud-feign-2.x-scenario/update/{id} parentSpanId: 0 @@ -118,6 +124,7 @@ segmentItems: tags: - {key: http.method, value: PUT} - {key: url, value: 'http://spring-cloud-feign-2.x-scenario/spring-cloud-feign-2.x-scenario/update/1'} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /spring-cloud-feign-2.x-scenario/delete/1 parentSpanId: 7 @@ -132,6 +139,7 @@ segmentItems: tags: - {key: http.method, value: DELETE} - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/delete/1'} + - {key: http.status_code, value: '204'} skipAnalysis: 'false' - operationName: Balancer/spring-cloud-feign-2.x-scenario/delete/{id} parentSpanId: 0 @@ -146,6 +154,7 @@ segmentItems: tags: - {key: http.method, value: DELETE} - {key: url, value: 'http://spring-cloud-feign-2.x-scenario/spring-cloud-feign-2.x-scenario/delete/1'} + - {key: http.status_code, value: '204'} skipAnalysis: 'false' - operationName: GET:/spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario parentSpanId: -1 @@ -160,6 +169,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -176,6 +186,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/create/'} - {key: http.method, value: POST} + - {key: http.status_code, value: '201'} refs: - {parentEndpoint: GET:/spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 2, @@ -197,6 +208,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/get/1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 4, @@ -218,6 +230,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/update/1'} - {key: http.method, value: PUT} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: GET:/spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 6, @@ -239,6 +252,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-cloud-feign-2.x-scenario/delete/1'} - {key: http.method, value: DELETE} + - {key: http.status_code, value: '204'} refs: - {parentEndpoint: GET:/spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 8, diff --git a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/config/expectedData.yaml index 6ffcb3d5c..4f0cacd1b 100644 --- a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/config/expectedData.yaml @@ -47,6 +47,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-kafka-1.3.x-scenario/case/spring-kafka-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: GET:/case/spring-kafka-consumer-ping @@ -63,6 +64,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-kafka-1.3.x-scenario/case/spring-kafka-consumer-ping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: 'Kafka/spring_test/Consumer/grop:spring_test', networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -84,6 +86,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-kafka-1.3.x-scenario/case/spring-kafka-consumer-ping'} + - {key: http.status_code, value: '200'} - operationName: Kafka/spring_test/Consumer/grop:spring_test parentSpanId: -1 spanId: 0 diff --git a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/config/expectedData.yaml index 6c3a339b5..667359922 100644 --- a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/config/expectedData.yaml @@ -47,6 +47,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-kafka-2.2.x-scenario/case/spring-kafka-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: GET:/case/spring-kafka-consumer-ping @@ -63,6 +64,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-kafka-2.2.x-scenario/case/spring-kafka-consumer-ping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: 'Kafka/spring_test/Consumer/grop:spring_test', networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -84,6 +86,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-kafka-2.2.x-scenario/case/spring-kafka-consumer-ping'} + - {key: http.status_code, value: '200'} - operationName: Kafka/spring_test/Consumer/grop:spring_test parentSpanId: -1 spanId: 0 diff --git a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/config/expectedData.yaml index 694324ddb..8672e7773 100644 --- a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/config/expectedData.yaml @@ -61,6 +61,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-kafka-2.3.x-scenario/case/spring-kafka-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} - segmentId: not null spans: - operationName: GET:/case/spring-kafka-consumer-ping @@ -77,6 +78,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-kafka-2.3.x-scenario/case/spring-kafka-consumer-ping'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: 'Kafka/spring_test/Consumer/grop:spring_test', networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, @@ -98,6 +100,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-kafka-2.3.x-scenario/case/spring-kafka-consumer-ping'} + - {key: http.status_code, value: '200'} - operationName: Kafka/spring_test/Consumer/grop:spring_test parentSpanId: -1 spanId: 0 @@ -117,4 +120,4 @@ segmentItems: - {parentEndpoint: GET:/case/spring-kafka-case, networkAddress: 'kafka-server:9092', refType: CrossProcess, parentSpanId: not null, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: spring-kafka-2.3.x-scenario, - traceId: not null} \ No newline at end of file + traceId: not null} diff --git a/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml index 362e40cfb..1c5f45888 100644 --- a/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-scheduled-scenario/case/call'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: SpringScheduled/org.apache.skywalking.apm.testcase.spring.scheduled.job.SchedulingJob.work, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} - segmentId: not null @@ -51,6 +52,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/spring-scheduled-scenario/case/call'} + - {key: http.status_code, value: '200'} - operationName: SpringScheduled/org.apache.skywalking.apm.testcase.spring.scheduled.job.SchedulingJob.work parentSpanId: -1 spanId: 0 @@ -63,4 +65,4 @@ segmentItems: peer: '' skipAnalysis: false tags: - - {key: x-le, value: '{"logic-span":true}'} \ No newline at end of file + - {key: x-le, value: '{"logic-span":true}'} diff --git a/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml index 2f8d35e08..3faed6707 100644 --- a/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml @@ -138,4 +138,5 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/spring-tx-scenario/case/spring-tx-case'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/springmvc-reactive-devtools-scenario/config/expectedData.yaml b/test/plugin/scenarios/springmvc-reactive-devtools-scenario/config/expectedData.yaml index 0b4b8c3e6..76cd831a0 100644 --- a/test/plugin/scenarios/springmvc-reactive-devtools-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/springmvc-reactive-devtools-scenario/config/expectedData.yaml @@ -73,6 +73,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -95,4 +96,4 @@ segmentItems: - {key: error.kind, value: not null} - {key: message, value: not null} - {key: stack, value: not null} - skipAnalysis: 'false' \ No newline at end of file + skipAnalysis: 'false' diff --git a/test/plugin/scenarios/springmvc-reactive-scenario/config/expectedData.yaml b/test/plugin/scenarios/springmvc-reactive-scenario/config/expectedData.yaml index 42654a39d..e388c7829 100644 --- a/test/plugin/scenarios/springmvc-reactive-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/springmvc-reactive-scenario/config/expectedData.yaml @@ -73,6 +73,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -95,4 +96,4 @@ segmentItems: - {key: error.kind, value: not null} - {key: message, value: not null} - {key: stack, value: not null} - skipAnalysis: 'false' \ No newline at end of file + 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 897125694..93007dc27 100644 --- a/test/plugin/scenarios/struts2.3-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/struts2.3-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/struts2.3-scenario/struts-scenario/case1.action'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: - logEvent: - {key: forward-url, value: /struts2.3-scenario/jsp/success.jsp} @@ -55,6 +56,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/struts2.3-scenario/struts-scenario/case1.action'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /struts2.3-scenario/struts-scenario/case.action parentSpanId: -1 @@ -69,6 +71,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/struts2.3-scenario/struts-scenario/case.action'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: - logEvent: - {key: forward-url, value: /struts2.3-scenario/jsp/success.jsp} diff --git a/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml b/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml index bdbe17051..30716a473 100644 --- a/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/struts2.5-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/struts2.5-scenario/struts-scenario/case1.action'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: - logEvent: - {key: forward-url, value: /struts2.5-scenario/jsp/success.jsp} @@ -55,6 +56,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/struts2.5-scenario/struts-scenario/case1.action'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /struts2.5-scenario/struts-scenario/case.action parentSpanId: -1 @@ -69,6 +71,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/struts2.5-scenario/struts-scenario/case.action'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} logs: - logEvent: - {key: forward-url, value: /struts2.5-scenario/jsp/success.jsp} diff --git a/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml b/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml index faa84a172..eae0f618a 100644 --- a/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/undertow-scenario/config/expectedData.yaml @@ -32,6 +32,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/undertow-scenario/case/undertow'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - segmentId: not null spans: @@ -48,6 +49,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8081/undertow-routing-scenario/case/undertow'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: UndertowDispatch, networkAddress: 'localhost:8081', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -68,6 +70,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/undertow-scenario/case/undertow1'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: UndertowDispatch, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not @@ -88,6 +91,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8081/undertow-routing-scenario/case/undertow?send=httpHandler'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: UndertowDispatch parentSpanId: -1 @@ -119,6 +123,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/undertow-scenario/case/undertow1?send=runnable'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: UndertowDispatch parentSpanId: -1 diff --git a/test/plugin/scenarios/webflux-scenario/config/expectedData.yaml b/test/plugin/scenarios/webflux-scenario/config/expectedData.yaml index 566afa24c..abea12731 100644 --- a/test/plugin/scenarios/webflux-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/webflux-scenario/config/expectedData.yaml @@ -224,6 +224,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /testcase/annotation/error parentSpanId: 0 @@ -253,6 +254,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:18080/testcase/annotation/foo'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /testcase/annotation/loo parentSpanId: 0 @@ -267,6 +269,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:18080/testcase/annotation/loo'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /testcase/route/success parentSpanId: 0 @@ -281,6 +284,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /testcase/route/error parentSpanId: 0 @@ -325,6 +329,7 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' - operationName: /testcase/webclient/server parentSpanId: 0 @@ -354,4 +359,5 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false' diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml index 468cdb01f..0d5c2d077 100644 --- a/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml @@ -33,6 +33,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/simpleJob'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: xxl-job/SimpleJob/test.apache.skywalking.apm.testcase.xxljob.job.BeanJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} - segmentId: not null @@ -51,6 +52,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/simpleJob'} + - {key: http.status_code, value: '200'} - operationName: xxl-job/SimpleJob/test.apache.skywalking.apm.testcase.xxljob.job.BeanJob parentSpanId: -1 spanId: 0 @@ -81,6 +83,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/methodJob'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: xxl-job/MethodJob/org.apache.skywalking.apm.testcase.xxljob.job.MethodJob.work, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} - segmentId: not null @@ -99,6 +102,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/methodJob'} + - {key: http.status_code, value: '200'} - operationName: xxl-job/MethodJob/org.apache.skywalking.apm.testcase.xxljob.job.MethodJob.work parentSpanId: -1 spanId: 0 @@ -129,6 +133,7 @@ segmentItems: tags: - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/glueJob'} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} refs: - {parentEndpoint: xxl-job/SimpleJob/com.xxl.job.service.handler.GlueJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} - segmentId: not null @@ -147,6 +152,7 @@ segmentItems: tags: - {key: http.method, value: GET} - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/glueJob'} + - {key: http.status_code, value: '200'} - operationName: xxl-job/SimpleJob/com.xxl.job.service.handler.GlueJob parentSpanId: -1 spanId: 0 @@ -176,4 +182,4 @@ segmentItems: skipAnalysis: false tags: - {key: x-le, value: '{"logic-span":true}'} - - {key: jobParam, value: 'k=4'} \ No newline at end of file + - {key: jobParam, value: 'k=4'} diff --git a/test/plugin/scenarios/zookeeper-scenario/config/expectedData.yaml b/test/plugin/scenarios/zookeeper-scenario/config/expectedData.yaml index 386d43374..be4d0b609 100644 --- a/test/plugin/scenarios/zookeeper-scenario/config/expectedData.yaml +++ b/test/plugin/scenarios/zookeeper-scenario/config/expectedData.yaml @@ -108,4 +108,5 @@ segmentItems: tags: - {key: url, value: not null} - {key: http.method, value: GET} + - {key: http.status_code, value: '200'} skipAnalysis: 'false'