[#12503] Do not allow the HttpClient to run in an nested

agent-module/agent-testweb/spring-webflux-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SpringWebfluxPluginController.java

@@ -18,7 +18,24 @@
 
 import com.pinpoint.test.common.view.ApiLinkPage;
 import com.pinpoint.test.common.view.HrefTag;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.handler.timeout.WriteTimeoutHandler;
 import org.apache.commons.io.IOUtils;
@@ -56,6 +73,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 @RestController
@@ -305,6 +323,7 @@ public String get() {
 
         return "OK";
     }
+
     @RequestMapping(value = "/jdk/connect/https")
     public String getHttps() {
 
@@ -318,6 +337,7 @@ public String getHttps() {
 
         return "OK";
     }
+
     @RequestMapping(value = "/jdk/connect/duplicated")
     public String getDuplicated() {
 
@@ -351,6 +371,7 @@ public String get2() {
         return "OK";
     }
 
+
     @RequestMapping(value = "/jdk/connect2/https")
     public String get2Https() {
 
@@ -382,4 +403,82 @@ private URL newURL(String spec) {
             throw new IllegalArgumentException("invalid url" + spec, exception);
         }
     }
+
+    @RequestMapping(value = "/netty/listener")
+    public String nettyListener() throws Exception {
+        final CountDownLatch awaitLatch = new CountDownLatch(1);
+        EventLoopGroup workerGroup = new NioEventLoopGroup(2);
+        Bootstrap bootstrap = client(workerGroup);
+        Channel channel = bootstrap.connect("httpbin.org", 80).sync().channel();
+
+        channel.pipeline().addLast(new SimpleChannelInboundHandler<FullHttpResponse>() {
+            @Override
+            protected void channelRead0(ChannelHandlerContext ctx, FullHttpResponse msg) {
+                awaitLatch.countDown();
+            }
+        });
+
+        try {
+            HttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, io.netty.handler.codec.http.HttpMethod.GET, "/");
+            channel.writeAndFlush(request);
+            boolean await = awaitLatch.await(3000, TimeUnit.MILLISECONDS);
+        } finally {
+            channel.close().sync();
+            workerGroup.shutdownGracefully().sync();
+        }
+
+        return "OK";
+    }
+
+    @RequestMapping(value = "/netty/write")
+    public String nettyWrite() throws Exception {
+        final CountDownLatch awaitLatch = new CountDownLatch(1);
+
+        EventLoopGroup workerGroup = new NioEventLoopGroup(2);
+        Bootstrap bootstrap = client(workerGroup);
+        final ChannelFuture connect = bootstrap.connect("httpbin.org", 80);
+
+        connect.addListener(new ChannelFutureListener() {
+            @Override
+            public void operationComplete(ChannelFuture future) throws Exception {
+                if (future.isSuccess()) {
+                    Channel channel = future.channel();
+                    channel.pipeline().addLast(new SimpleChannelInboundHandler() {
+
+                        @Override
+                        protected void channelRead0(ChannelHandlerContext ctx, Object msg) {
+                            awaitLatch.countDown();
+                        }
+
+                    });
+                    HttpRequest request = new DefaultFullHttpRequest(
+                            HttpVersion.HTTP_1_1, io.netty.handler.codec.http.HttpMethod.GET, "/");
+                    future.channel().writeAndFlush(request);
+                }
+            }
+
+        });
+
+        boolean await = awaitLatch.await(3000, TimeUnit.MILLISECONDS);
+
+        final Channel channel = connect.channel();
+        channel.close().sync();
+        workerGroup.shutdownGracefully().sync();
+
+        return "OK";
+    }
+
+    public Bootstrap client(EventLoopGroup workerGroup) {
+        Bootstrap bootstrap = new Bootstrap();
+        bootstrap.group(workerGroup).channel(NioSocketChannel.class)
+                .handler(new ChannelInitializer<SocketChannel>() {
+                    @Override
+                    protected void initChannel(SocketChannel ch) throws Exception {
+                        ch.pipeline().addLast(new HttpClientCodec());
+                        ch.pipeline().addLast(new HttpObjectAggregator(65535));
+                    }
+                });
+        return bootstrap;
+    }
+
 }

agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/context/StackOperation.java

@@ -33,8 +33,8 @@ public interface StackOperation {
     void traceBlockEnd(int stackId);
 
     boolean isRootStack();
-    
+
     int getCallStackFrameId();
 
-    TraceBlock traceBlockBeginAndGet();
+    TraceBlock getTraceBlock();
 }

agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/context/TraceBlock.java

@@ -20,6 +20,10 @@ public interface TraceBlock extends SpanEventRecorder, AutoCloseable {
 
     Trace getTrace();
 
+    void begin();
+
+    boolean isBegin();
+
     @Override
     void close();
 }

agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AsyncContextSpanEventBlockApiIdAwareAroundInterceptor.java

@@ -47,19 +47,24 @@
         // entry scope.
         ScopeUtils.entryAsyncTraceScope(trace);
 
+        final TraceBlock traceBlock = trace.getTraceBlock();
         try {
-            // trace event for default & async.
-            final TraceBlock traceBlock = trace.traceBlockBeginAndGet();
-            beforeTrace(asyncContext, trace, traceBlock, target, apiId, args);
-            doInBeforeTrace(traceBlock, asyncContext, target, apiId, args);
-            return traceBlock;
+            if (checkBeforeTraceBlockBegin(asyncContext, trace, target, apiId, args)) {
+                traceBlock.begin();
+                beforeTrace(asyncContext, trace, traceBlock, target, apiId, args);
+                doInBeforeTrace(traceBlock, asyncContext, target, apiId, args);
+            }
         } catch (Throwable th) {
             if (logger.isWarnEnabled()) {
                 logger.warn("BEFORE. Caused:{}", th.getMessage(), th);
             }
         }
 
-        return null;
+        return traceBlock;
+    }
+
+    protected boolean checkBeforeTraceBlockBegin(AsyncContext asyncContext, Trace trace, Object target, int apiId, Object[] args) {
+        return true;
     }
 
     protected void beforeTrace(final AsyncContext asyncContext, final Trace trace, final SpanEventRecorder recorder, final Object target, int apiId, final Object[] args) {
@@ -98,8 +103,10 @@
         }
 
         try (TraceBlock traceBlock = block) {
-            afterTrace(asyncContext, trace, traceBlock, target, apiId, args, result, throwable);
-            doInAfterTrace(traceBlock, target, apiId, args, result, throwable);
+            if (traceBlock.isBegin()) {
+                afterTrace(asyncContext, trace, traceBlock, target, apiId, args, result, throwable);
+                doInAfterTrace(traceBlock, target, apiId, args, result, throwable);
+            }
         } catch (Throwable th) {
             if (logger.isWarnEnabled()) {
                 logger.warn("AFTER error. Caused:{}", th.getMessage(), th);

agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AsyncContextSpanEventNestedBlockApiIdAwareAroundInterceptor.java → agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AsyncContextSpanEventBlockSimpleAroundInterceptor.java

@@ -16,26 +16,26 @@
 package com.navercorp.pinpoint.bootstrap.interceptor;
 
 import com.navercorp.pinpoint.bootstrap.context.AsyncContext;
+import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
 import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder;
 import com.navercorp.pinpoint.bootstrap.context.Trace;
-import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.context.TraceBlock;
-import com.navercorp.pinpoint.bootstrap.context.scope.TraceScope;
+import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.util.ScopeUtils;
 
 import java.util.Objects;
 
-public abstract class AsyncContextSpanEventNestedBlockApiIdAwareAroundInterceptor extends AbstractAsyncContextSpanEventInterceptor implements BlockApiIdAwareAroundInterceptor {
+public abstract class AsyncContextSpanEventBlockSimpleAroundInterceptor extends AbstractAsyncContextSpanEventInterceptor implements BlockAroundInterceptor {
 
-    private final String traceScopeName;
+    protected final MethodDescriptor methodDescriptor;
 
-    public AsyncContextSpanEventNestedBlockApiIdAwareAroundInterceptor(TraceContext traceContext, String traceScopeName) {
+    public AsyncContextSpanEventBlockSimpleAroundInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) {
         super(traceContext);
-        this.traceScopeName = Objects.requireNonNull(traceScopeName, "traceScopeName");
+        this.methodDescriptor = Objects.requireNonNull(methodDescriptor, "methodDescriptor");
     }
 
     @Override
-    public TraceBlock before(Object target, int apiId, Object[] args) {
+    public TraceBlock before(Object target, Object[] args) {
         if (isDebug) {
             logger.beforeInterceptor(target, args);
         }
@@ -50,39 +50,35 @@
             return null;
         }
 
-        // try entry API.
-        if (Boolean.FALSE == tryEnter(trace)) {
-            if (isDebug) {
-                logger.debug("Skip nested async API.before(), trace={}, traceScopeName={}", trace, traceScopeName);
-            }
-            return null;
-        }
-
-        // entry scope.
         ScopeUtils.entryAsyncTraceScope(trace);
 
+        final TraceBlock traceBlock = trace.getTraceBlock();
         try {
-            // trace event for default & async.
-            final TraceBlock traceBlock = trace.traceBlockBeginAndGet();
-            beforeTrace(asyncContext, trace, traceBlock, target, apiId, args);
-            doInBeforeTrace(traceBlock, asyncContext, target, apiId, args);
-            return traceBlock;
+            if (checkBeforeTraceBlockBegin(asyncContext, trace, target, args)) {
+                traceBlock.begin();
+                beforeTrace(asyncContext, trace, traceBlock, target, args);
+                doInBeforeTrace(traceBlock, asyncContext, target, args);
+            }
         } catch (Throwable th) {
             if (logger.isWarnEnabled()) {
                 logger.warn("BEFORE. Caused:{}", th.getMessage(), th);
             }
         }
 
-        return null;
+        return traceBlock;
+    }
+
+    protected boolean checkBeforeTraceBlockBegin(AsyncContext asyncContext, Trace trace, Object target, Object[] args) {
+        return true;
     }
 
-    protected void beforeTrace(final AsyncContext asyncContext, final Trace trace, final SpanEventRecorder recorder, final Object target, final int apiId, final Object[] args) {
+    protected void beforeTrace(final AsyncContext asyncContext, final Trace trace, final SpanEventRecorder recorder, final Object target, final Object[] args) {
     }
 
-    protected abstract void doInBeforeTrace(SpanEventRecorder recorder, AsyncContext asyncContext, Object target, int apiId, Object[] args);
+    protected abstract void doInBeforeTrace(SpanEventRecorder recorder, AsyncContext asyncContext, Object target, Object[] args);
 
     @Override
-    public void after(TraceBlock block, Object target, int apiId, Object[] args, Object result, Throwable throwable) {
+    public void after(TraceBlock block, Object target, Object[] args, Object result, Throwable throwable) {
         if (isDebug) {
             logger.afterInterceptor(target, args, result, throwable);
         }
@@ -92,15 +88,12 @@
             return;
         }
 
-        final Trace trace = asyncContext.currentAsyncTraceObject();
-        if (trace == null) {
+        if (block == null) {
             return;
         }
 
-        if (Boolean.FALSE == canLeave(trace)) {
-            if (isDebug) {
-                logger.debug("Skip nested async API.after(), trace={}, traceScopeName={}", trace, traceScopeName);
-            }
+        final Trace trace = block.getTrace();
+        if (trace == null) {
             return;
         }
 
@@ -115,8 +108,10 @@
         }
 
         try (TraceBlock traceBlock = block) {
-            afterTrace(asyncContext, trace, traceBlock, target, apiId, args, result, throwable);
-            doInAfterTrace(traceBlock, target, apiId, args, result, throwable);
+            if (traceBlock.isBegin()) {
+                afterTrace(asyncContext, trace, traceBlock, target, args, result, throwable);
+                doInAfterTrace(traceBlock, target, args, result, throwable);
+            }
         } catch (Throwable th) {
             if (logger.isWarnEnabled()) {
                 logger.warn("AFTER error. Caused:{}", th.getMessage(), th);
@@ -128,36 +123,8 @@
         }
     }
 
-    protected void afterTrace(final AsyncContext asyncContext, final Trace trace, final SpanEventRecorder recorder, final Object target, int apiId, final Object[] args, final Object result, final Throwable throwable) {
-    }
-
-    protected abstract void doInAfterTrace(SpanEventRecorder recorder, Object target, int apiId, Object[] args, Object result, Throwable throwable);
-
-    public boolean tryEnter(final Trace trace) {
-        TraceScope scope = trace.getScope(traceScopeName);
-        if (scope == null) {
-            trace.addBoundaryScope(traceScopeName);
-            scope = trace.getScope(traceScopeName);
-        }
-        if (scope != null) {
-            boolean result = scope.tryEnter();
-            return result;
-        }
-        if (isDebug) {
-            logger.debug("Skip to enter, not found scope, scopeName={}", traceScopeName);
-        }
-        return false;
+    protected void afterTrace(final AsyncContext asyncContext, final Trace trace, final SpanEventRecorder recorder, final Object target, final Object[] args, final Object result, final Throwable throwable) {
     }
 
-    public boolean canLeave(final Trace trace) {
-        TraceScope scope = trace.getScope(traceScopeName);
-        if (scope != null) {
-            if (scope.canLeave()) {
-                scope.leave();
-                return true;
-            }
-        }
-
-        return false;
-    }
+    protected abstract void doInAfterTrace(SpanEventRecorder recorder, Object target, Object[] args, Object result, Throwable throwable);
 }