[#9504] Refactor runOnContext trace

pinpoint-apm · Dec 19, 2022 · 7089c1b · 7089c1b
1 parent eb90f39
commit 7089c1b
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 18 deletions.
diff --git a/...vertx-3-plugin-testweb/src/main/java/com/pinpoint/test/plugin/VertxPluginTestStarter.java b/...vertx-3-plugin-testweb/src/main/java/com/pinpoint/test/plugin/VertxPluginTestStarter.java
@@ -86,9 +86,14 @@ public void start(Promise<Void> startPromise) throws Exception {
         router.get("/runOnContext/request").handler(routingContext -> {
             runOnContextRequest(routingContext.request());
         });
-        router.get("/runOnContext/error").handler(routingContext -> {
+        router.get("/runOnContext/throwException").handler(routingContext -> {
             vertx.runOnContext(aVoid -> {
-                throw new RuntimeException("/runOnContext/error");
+                throw new RuntimeException("FAIL");
+            });
+        });
+        router.get("/runOnContext/statusCode500").handler(routingContext -> {
+            vertx.runOnContext(aVoid -> {
+                routingContext.response().setStatusCode(500).end("StatusCode:500");
             });
         });
 
@@ -101,6 +106,13 @@ public void start(Promise<Void> startPromise) throws Exception {
             routingContext.response().end(arg1);
         });
 
+        router.get("/throwException").handler(routingContext ->  {
+            throw new RuntimeException("FAIL");
+        });
+        router.get("/statusCode500").handler(routingContext -> {
+            routingContext.response().setStatusCode(500).end("StatusCode:500");
+        });
+
 
         vertx.createHttpServer().requestHandler(router).listen(18080, http -> {
             if (http.succeeded()) {

diff --git a/...ootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/http/URITemplate.java b/...ootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/http/URITemplate.java
@@ -8,4 +8,5 @@ private URITemplate() {
     }
 
     public static final String NOT_FOUND = "/NOT_FOUND_URI";
+    public static final String NULL_URI = "/NULL";
 }
diff --git a/...navercorp/pinpoint/plugin/vertx/interceptor/AsyncContextSpanEventEndPointInterceptor.java b/...navercorp/pinpoint/plugin/vertx/interceptor/AsyncContextSpanEventEndPointInterceptor.java
@@ -117,6 +117,11 @@ public void after(Object target, Object[] args, Object result, Throwable throwab
             return;
         }
 
+        prepareAfter(trace, target, args, result, throwable);
+        if (!trace.canSampled()) {
+            return;
+        }
+
         try {
             final SpanEventRecorder recorder = trace.currentSpanEventRecorder();
             doInAfterTrace(recorder, target, args, result, throwable);
@@ -136,6 +141,9 @@ public void after(Object target, Object[] args, Object result, Throwable throwab
         }
     }
 
+    protected void prepareAfter(Trace trace, Object target, Object[] args, Object result, Throwable throwable) {
+    }
+
     protected abstract void doInAfterTrace(SpanEventRecorder recorder, Object target, Object[] args, Object result, Throwable throwable);
 
     protected AsyncContext getAsyncContext(Object target) {

diff --git a/...va/com/navercorp/pinpoint/plugin/vertx/interceptor/HttpServerResponseImplInterceptor.java b/...va/com/navercorp/pinpoint/plugin/vertx/interceptor/HttpServerResponseImplInterceptor.java
@@ -42,23 +42,23 @@ public HttpServerResponseImplInterceptor(MethodDescriptor methodDescriptor, Trac
     public void doInBeforeTrace(SpanEventRecorder recorder, AsyncContext asyncContext, Object target, Object[] args) {
     }
 
+    @Override
+    protected void prepareAfter(Trace trace, Object target, Object[] args, Object result, Throwable throwable) {
+        if (target instanceof HttpServerResponse) {
+//            Trace trace = traceContext.currentRawTraceObject();
+            if (trace == null) {
+                return;
+            }
+            final HttpServerResponse response = (HttpServerResponse) target;
+            final SpanRecorder spanRecorder = trace.getSpanRecorder();
+            this.httpStatusCodeRecorder.record(spanRecorder, response.getStatusCode());
+        }
+    }
+
     @Override
     public void doInAfterTrace(SpanEventRecorder recorder, Object target, Object[] args, Object result, Throwable throwable) {
         recorder.recordApi(methodDescriptor);
         recorder.recordServiceType(VertxConstants.VERTX_HTTP_SERVER_INTERNAL);
         recorder.recordException(throwable);
-
-        if (target instanceof HttpServerResponse) {
-            final HttpServerResponse response = (HttpServerResponse) target;
-            // TODO more simple.
-            final AsyncContext asyncContext = getAsyncContext(target);
-            if (asyncContext != null) {
-                final Trace trace = asyncContext.currentAsyncTraceObject();
-                if (trace != null) {
-                    final SpanRecorder spanRecorder = trace.getSpanRecorder();
-                    this.httpStatusCodeRecorder.record(spanRecorder, response.getStatusCode());
-                }
-            }
-        }
     }
 }
diff --git a/...navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java b/...navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java
@@ -28,6 +28,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.RequestRecorderFactory;
+import com.navercorp.pinpoint.bootstrap.plugin.http.HttpStatusCodeRecorder;
 import com.navercorp.pinpoint.bootstrap.plugin.proxy.ProxyRequestRecorder;
 import com.navercorp.pinpoint.bootstrap.plugin.request.RequestAdaptor;
 import com.navercorp.pinpoint.bootstrap.plugin.request.RequestTraceReader;
@@ -67,7 +68,7 @@ public class ServerConnectionHandleRequestInterceptor implements AroundIntercept
     private final TraceContext traceContext;
     private final MethodDescriptor descriptor;
 
-
+    private final HttpStatusCodeRecorder httpStatusCodeRecorder;
 
     public ServerConnectionHandleRequestInterceptor(final TraceContext traceContext,
                                                     final MethodDescriptor methodDescriptor,
@@ -86,6 +87,8 @@ public ServerConnectionHandleRequestInterceptor(final TraceContext traceContext,
         this.serverRequestRecorder = new ServerRequestRecorder<>(requestAdaptor);
         this.requestTraceReader = new RequestTraceReader<>(traceContext, requestAdaptor, true);
         traceContext.cacheApi(VERTX_HTTP_SERVER_METHOD_DESCRIPTOR);
+
+        this.httpStatusCodeRecorder = new HttpStatusCodeRecorder(traceContext.getProfilerConfig().getHttpStatusCodeErrors());
     }
 
 
@@ -203,6 +206,13 @@ public void after(Object target, Object[] args, Object result, Throwable throwab
             return;
         }
 
+        final boolean validate = validate(args);
+        if (validate) {
+            final HttpServerRequest request = (HttpServerRequest) args[0];
+            HttpServerResponse response = request.response();
+            this.httpStatusCodeRecorder.record(trace.getSpanRecorder(), response.getStatusCode());
+        }
+
         if (!trace.canSampled()) {
             deleteTrace(trace);
             return;
@@ -212,7 +222,7 @@ public void after(Object target, Object[] args, Object result, Throwable throwab
             final SpanEventRecorder recorder = trace.currentSpanEventRecorder();
             recorder.recordApi(descriptor);
             recorder.recordException(throwable);
-            if (validate(args)) {
+            if (validate) {
                 final HttpServerRequest request = (HttpServerRequest) args[0];
                 parameterRecorder.record(recorder, request, throwable);
             }

diff --git a/...ain/java/com/navercorp/pinpoint/profiler/context/storage/AsyncQueueingUriStatStorage.java b/...ain/java/com/navercorp/pinpoint/profiler/context/storage/AsyncQueueingUriStatStorage.java
@@ -58,7 +58,7 @@ private AsyncQueueingUriStatStorage(int queueSize, String executorName, Executor
     @Override
     public void store(String uri, boolean status, long startTime, long endTime) {
         if (uri == null) {
-            uri = URITemplate.NOT_FOUND;
+            uri = URITemplate.NULL_URI;
         }
         UriStatInfo uriStatInfo = new UriStatInfo(uri, status, startTime, endTime);
         execute(uriStatInfo);
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,5 @@ private URITemplate() { @@
         }
         public static final String NOT_FOUND = "/NOT_FOUND_URI";
+        public static final String NULL_URI = "/NULL";
     }