Skip to content

Commit

Permalink
Merge branch 'develop' into feature/reactor34
Browse files Browse the repository at this point in the history
* develop:
  [agent.java] reactor-core library version up

# Conflicts:
#	scouter.agent.java/src/main/java/reactor/core/publisher/ScouterOptimizableOperatorProxy.java
#	scouter.agent.java/src/main/java/scouter/xtra/reactive/ReactiveSupport.java
#	scouter.agent.java/src/main/java/scouter/xtra/reactive/ReactiveSupportWithCoroutine.java
  • Loading branch information
gunlee01 committed Feb 25, 2024
2 parents 2b92f0a + 2a595d7 commit e67e88b
Showing 1 changed file with 1 addition and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,7 @@ public Context apply(Context context) {
};

monoChain = (Mono<?>) subscriberContextMethod.invoke(mono, func);
return monoChain.subscriberContext(new Function<Context, Context>() {
@Override
public Context apply(Context context) {
return context.put(TraceContext.class, traceContext);
}
}).doOnSuccess(new Consumer<Object>() {
return monoChain.doOnSuccess(new Consumer<Object>() {
@Override
public void accept(Object o) {
TraceMain.endHttpService(new TraceMain.Stat(traceContext), null);
Expand Down

0 comments on commit e67e88b

Please sign in to comment.