[#8883] Rollback reactor plugin PR

pinpoint-apm · May 27, 2022 · ac79fc5 · ac79fc5
1 parent cab4b1f
commit ac79fc5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 139 deletions.
diff --git a/.../navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorSubscribeInterceptor.java b/.../navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorSubscribeInterceptor.java
@@ -32,15 +32,16 @@ public FluxAndMonoOperatorSubscribeInterceptor(TraceContext traceContext, Method
         this.serviceType = serviceType;
     }
 
+    // AsyncContext must exist in Target for tracking.
     public AsyncContext getAsyncContext(Object target, Object[] args) {
         if (checkTargetReactorContextAccessor(target, args)) {
-            return ReactorContextAccessorUtils.getAsyncContext(target);
+            return AsyncContextAccessorUtils.getAsyncContext(target);
         }
         if (checkTargetAsyncContextAccessor(target, args)) {
             return AsyncContextAccessorUtils.getAsyncContext(target);
         }
         if (checkSubscriberReactorContextAccessor(target, args)) {
-            return ReactorContextAccessorUtils.getAsyncContext(target);
+            return AsyncContextAccessorUtils.getAsyncContext(target);
         }
         return AsyncContextAccessorUtils.getAsyncContext(target);
     }

diff --git a/...java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeInterceptor.java b/...java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeInterceptor.java
@@ -32,15 +32,16 @@ public FluxAndMonoSubscribeInterceptor(TraceContext traceContext, MethodDescript
         this.serviceType = serviceType;
     }
 
+    // AsyncContext must exist in Target for tracking.
     public AsyncContext getAsyncContext(Object target, Object[] args) {
         if (checkTargetReactorContextAccessor(target, args)) {
-            return ReactorContextAccessorUtils.getAsyncContext(target);
+            return AsyncContextAccessorUtils.getAsyncContext(target);
         }
         if (checkTargetAsyncContextAccessor(target, args)) {
             return AsyncContextAccessorUtils.getAsyncContext(target);
         }
         if (checkSubscriberReactorContextAccessor(target, args)) {
-            return ReactorContextAccessorUtils.getAsyncContext(target);
+            return AsyncContextAccessorUtils.getAsyncContext(target);
         }
         return AsyncContextAccessorUtils.getAsyncContext(target);
     }

diff --git a/...corp/pinpoint/plugin/reactor/interceptor/FluxAndMonoOperatorSubscribeInterceptorTest.java b/...corp/pinpoint/plugin/reactor/interceptor/FluxAndMonoOperatorSubscribeInterceptorTest.java
diff --git a/...om/navercorp/pinpoint/plugin/reactor/interceptor/FluxAndMonoSubscribeInterceptorTest.java b/...om/navercorp/pinpoint/plugin/reactor/interceptor/FluxAndMonoSubscribeInterceptorTest.java