Merge pull request scouter-project#979 from psw0946/feature/reactor-c…

…ore-upgrade [agent.java] reactor-core library version up
VenusIM · Feb 22, 2024 · 2a595d7 · 2a595d7
2 parents 1f9fbc4 + cd7fac0
commit 2a595d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/scouter.agent.java/pom.xml b/scouter.agent.java/pom.xml
@@ -332,7 +332,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.3.8.RELEASE</version>
+            <version>3.4.35</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/scouter.agent.java/src/main/java/reactor/core/publisher/ScouterOptimizableOperatorProxy.java b/scouter.agent.java/src/main/java/reactor/core/publisher/ScouterOptimizableOperatorProxy.java
@@ -54,12 +54,12 @@ public static Tuple.StringLongPair nameOnCheckpoint(Object candidate, int maxSca
                 }
                 if (closeAssembly instanceof MonoOnAssembly) {
                     FluxOnAssembly.AssemblySnapshot snapshot = ((MonoOnAssembly) closeAssembly).stacktrace;
-                    if (snapshot != null && snapshot.checkpointed) {
+                    if (snapshot != null && snapshot.isCheckpoint()) {
                         return new Tuple.StringLongPair(snapshot.cached, snapshot.hashCode());
                     }
                 } else if (closeAssembly instanceof FluxOnAssembly) {
                     FluxOnAssembly.AssemblySnapshot snapshot = ((FluxOnAssembly) closeAssembly).snapshotStack;
-                    if (snapshot != null && snapshot.checkpointed) {
+                    if (snapshot != null && snapshot.isCheckpoint()) {
                         return new Tuple.StringLongPair(snapshot.cached, snapshot.hashCode());
                     }
                 }

diff --git a/scouter.agent.java/src/main/java/scouter/xtra/reactive/ReactiveSupport.java b/scouter.agent.java/src/main/java/scouter/xtra/reactive/ReactiveSupport.java
@@ -58,7 +58,7 @@ public Object subscriptOnContext(Object mono0, final TraceContext traceContext)
             }
             Mono<?> mono = (Mono<?>) mono0;
             traceContext.isReactiveTxidMarked = true;
-            return mono.subscriberContext(new Function<Context, Context>() {
+            return mono.contextWrite(new Function<Context, Context>() {
                 @Override
                 public Context apply(Context context) {
                     return context.put(TraceContext.class, traceContext);

diff --git a/scouter.agent.java/src/main/java/scouter/xtra/reactive/ReactiveSupportWithCoroutine.java b/scouter.agent.java/src/main/java/scouter/xtra/reactive/ReactiveSupportWithCoroutine.java
@@ -61,7 +61,7 @@ public Object subscriptOnContext(Object mono0, final TraceContext traceContext)
             }
             Mono<?> mono = (Mono<?>) mono0;
             traceContext.isReactiveTxidMarked = true;
-            return mono.subscriberContext(new Function<Context, Context>() {
+            return mono.contextWrite(new Function<Context, Context>() {
                 @Override
                 public Context apply(Context context) {
                     return context.put(TraceContext.class, traceContext);