Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolves various thread hop problems with Spring Reactor call chaining. #1883

Merged
merged 2 commits into from
May 15, 2024
Merged

Resolves various thread hop problems with Spring Reactor call chaining. #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26e9ac0
Link the thread where the subscribe on takes place. Also copy this a…
jbedell-newrelic May 3, 2024
0315d52
Re-factor. the instrumentation to actually compile it.
jbedell-newrelic May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...y-reactor-0.9.0/src/main/java/reactor/core/publisher/FluxMapFuseable_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* * Copyright 2020 New Relic Corporation. All rights reserved.
* * Copyright 2024 New Relic Corporation. All rights reserved.
* * SPDX-License-Identifier: Apache-2.0
*
*/
Expand Down
49 changes: 49 additions & 0 deletions ...y-reactor-0.9.0/src/main/java/reactor/core/publisher/MonoSubscribeOn_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
*
* * Copyright 2024 New Relic Corporation. All rights reserved.
* * SPDX-License-Identifier: Apache-2.0
*
*/

package reactor.core.publisher;

import com.newrelic.api.agent.NewRelic;
import com.newrelic.api.agent.Token;
import com.newrelic.api.agent.weaver.MatchType;
import com.newrelic.api.agent.weaver.NewField;
import com.newrelic.api.agent.weaver.Weave;
import com.newrelic.api.agent.weaver.WeaveAllConstructors;
import com.newrelic.api.agent.weaver.Weaver;

@Weave(type = MatchType.ExactClass, originalName = "reactor.core.publisher.MonoSubscribeOn")
abstract class MonoSubscribeOn_Instrumentation {

@Weave(type = MatchType.ExactClass, originalName = "reactor.core.publisher.MonoSubscribeOn$SubscribeOnSubscriber")
static final class SubscribeOnSubscriber_Instrumentation {
@NewField
private Token token;

@WeaveAllConstructors
SubscribeOnSubscriber_Instrumentation() {
if (NewRelic.getAgent().getTransaction() != null && token == null) {
token = NewRelic.getAgent().getTransaction().getToken();
}
}

public void run () {
if (token != null) {
Boolean result = token.linkAndExpire();
token = null;
}
Weaver.callOriginal();
}

public void cancel () {
if (token != null) {
token.linkAndExpire();
token = null;
}
Weaver.callOriginal();
}
}
}
58 changes: 58 additions & 0 deletions ...n/reactor-3.3.0/src/main/java/reactor/core/publisher/FluxMapFuseable_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
*
* * Copyright 2024 New Relic Corporation. All rights reserved.
* * SPDX-License-Identifier: Apache-2.0
*
*/

package reactor.core.publisher;

import com.newrelic.agent.bridge.AgentBridge;
import com.newrelic.api.agent.NewRelic;
import com.newrelic.api.agent.Token;
import com.newrelic.api.agent.weaver.MatchType;
import com.newrelic.api.agent.weaver.NewField;
import com.newrelic.api.agent.weaver.Weave;
import com.newrelic.api.agent.weaver.WeaveAllConstructors;
import com.newrelic.api.agent.weaver.Weaver;

@Weave(type = MatchType.ExactClass, originalName = "reactor.core.publisher.FluxMapFuseable")
abstract class FluxMapFuseable_Instrumentation {

@Weave(type = MatchType.ExactClass, originalName = "reactor.core.publisher.FluxMapFuseable$MapFuseableSubscriber")
static final class MapFuseableSubscriber_Instrumentation<T, R> {
@NewField
private Token token;

@WeaveAllConstructors
MapFuseableSubscriber_Instrumentation() {
if (AgentBridge.getAgent().getTransaction(false) != null && token == null) {
token = NewRelic.getAgent().getTransaction().getToken();
}
}

public void onComplete() {
if (token != null) {
token.linkAndExpire();
token = null;
}
Weaver.callOriginal();
}

public void onNext(T t) {
if (token != null) {
token.linkAndExpire();
token = null;
}
Weaver.callOriginal();
}

public void onError(Throwable t) {
if (token != null) {
token.linkAndExpire();
token = null;
}
Weaver.callOriginal();
}
}
}
49 changes: 49 additions & 0 deletions ...n/reactor-3.3.0/src/main/java/reactor/core/publisher/MonoSubscribeOn_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
*
* * Copyright 2024 New Relic Corporation. All rights reserved.
* * SPDX-License-Identifier: Apache-2.0
*
*/

package reactor.core.publisher;

import com.newrelic.api.agent.NewRelic;
import com.newrelic.api.agent.Token;
import com.newrelic.api.agent.weaver.MatchType;
import com.newrelic.api.agent.weaver.NewField;
import com.newrelic.api.agent.weaver.Weave;
import com.newrelic.api.agent.weaver.WeaveAllConstructors;
import com.newrelic.api.agent.weaver.Weaver;

@Weave(type = MatchType.ExactClass, originalName = "reactor.core.publisher.MonoSubscribeOn")
abstract class MonoSubscribeOn_Instrumentation {

@Weave(type = MatchType.ExactClass, originalName = "reactor.core.publisher.MonoSubscribeOn$SubscribeOnSubscriber")
static final class SubscribeOnSubscriber_Instrumentation {
@NewField
private Token token;

@WeaveAllConstructors
SubscribeOnSubscriber_Instrumentation() {
if (NewRelic.getAgent().getTransaction() != null && token == null) {
token = NewRelic.getAgent().getTransaction().getToken();
}
}

public void run () {
if (token != null) {
Boolean result = token.linkAndExpire();
token = null;
}
Weaver.callOriginal();
}

public void cancel () {
if (token != null) {
token.linkAndExpire();
token = null;
}
Weaver.callOriginal();
}
}
}
Loading