Skip to content

Remove HandlerMethodInvokerPointCut #2977

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

Open
jtduffy wants to merge 2 commits into
base: main
Choose a base branch
from
+41 −168
Open

Remove HandlerMethodInvokerPointCut #2977

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
b0772d3
Remove HandlerMethodInvokerPointCut
jtduffy Jul 8, 2026
47428fc
Update unit test
jtduffy Jul 9, 2026
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: 0 additions & 2 deletions functional_test/src/test/java/com/newrelic/agent/instrumentation/ClassTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.newrelic.agent.instrumentation.pointcuts.frameworks.cxf.CXFInvokerPointCut;
import com.newrelic.agent.instrumentation.pointcuts.frameworks.cxf.CXFPointCut;
import com.newrelic.agent.instrumentation.pointcuts.frameworks.cxf.ClientProxyPointCut;
import com.newrelic.agent.instrumentation.pointcuts.frameworks.spring.HandlerMethodInvokerPointCut;
import com.newrelic.agent.instrumentation.pointcuts.frameworks.spring.SpringPointCut;
import com.newrelic.agent.service.ServiceFactory;
import org.junit.Assert;
Expand Down Expand Up @@ -48,7 +47,6 @@ public void test() {
// Spring
new SpringPointCut(classTransformer),
// new SpringWildcardPathPointCut(classTransformer),
new HandlerMethodInvokerPointCut(classTransformer),
// CXF
new CXFPointCut(classTransformer),
new CXFInvokerPointCut(classTransformer),
Expand Down
4 changes: 2 additions & 2 deletions ...handler-method-invoker-3.0.0/build.gradle → ...handler-method-invoker-2.5.2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ dependencies {
}

jar {
manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.spring-handler-method-invoker-3.0.0'}
manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.spring-handler-method-invoker-2.5.2'}
}

verifyInstrumentation {
passesOnly('org.springframework:spring-web:[3.0.0.RELEASE,5.0.0.RELEASE)') {
passesOnly('org.springframework:spring-web:[2.5.2,5.0.0.RELEASE)') {
implementation("org.springframework:spring-webmvc:3.0.0.RELEASE")
}

Expand Down
3 changes: 3 additions & 0 deletions ...HandlerMethodInvoker_Instrumentation.java → ...HandlerMethodInvoker_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import com.newrelic.agent.bridge.AgentBridge;
import com.newrelic.agent.bridge.Transaction;
import com.newrelic.agent.bridge.TransactionNamePriority;
import com.newrelic.api.agent.Trace;
import com.newrelic.api.agent.weaver.MatchType;
import com.newrelic.api.agent.weaver.Weave;
Expand All @@ -33,6 +34,8 @@ public Object invokeHandlerMethod(Method handlerMethod, Object handler,
}

transaction.getTracedMethod().setMetricName("Spring", "Java", controllerName, methodName);
transaction.setTransactionName(TransactionNamePriority.FRAMEWORK, true,
"SpringController", "/" + controllerName + "/" + methodName);
}

return Weaver.callOriginal();
Expand Down
34 changes: 34 additions & 0 deletions ...dlerMethodInvokerInstrumentationTest.java → ...dlerMethodInvokerInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.newrelic.agent.bridge.AgentBridge;
import com.newrelic.agent.bridge.TracedMethod;
import com.newrelic.agent.bridge.Transaction;
import com.newrelic.agent.bridge.TransactionNamePriority;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -53,6 +54,36 @@ public void invokeHandlerMethod_setsMetricName() throws Exception {
"handleRequest");
}

@Test
public void invokeHandlerMethod_setsTransactionName() throws Exception {
when(mockAgent.getTransaction(false)).thenReturn(mockTransaction);
when(mockTransaction.getTracedMethod()).thenReturn(mockTracedMethod);

HandlerMethodInvoker_Instrumentation invoker = new HandlerMethodInvoker_Instrumentation();
Method method = TestController.class.getMethod("handleRequest");

invoker.invokeHandlerMethod(method, new TestController(), null, null);

verify(mockTransaction).setTransactionName(TransactionNamePriority.FRAMEWORK, true,
"SpringController",
"/org.springframework.web.bind.annotation.support.HandlerMethodInvokerInstrumentationTest$TestController/handleRequest");
}

@Test
public void invokeHandlerMethod_stripsProxyClassSuffix() throws Exception {
when(mockAgent.getTransaction(false)).thenReturn(mockTransaction);
when(mockTransaction.getTracedMethod()).thenReturn(mockTracedMethod);

HandlerMethodInvoker_Instrumentation invoker = new HandlerMethodInvoker_Instrumentation();
Method method = TestController.class.getMethod("handleRequest");

invoker.invokeHandlerMethod(method, new TestController$$EnhancerBySpringCGLIB(), null, null);

verify(mockTransaction).setTransactionName(TransactionNamePriority.FRAMEWORK, true,
"SpringController",
"/org.springframework.web.bind.annotation.support.HandlerMethodInvokerInstrumentationTest$TestController/handleRequest");
}

@Test
public void invokeHandlerMethod_noTransaction_doesNotCrash() throws Exception {
when(mockAgent.getTransaction(false)).thenReturn(null);
Expand All @@ -70,4 +101,7 @@ public String handleRequest() {
return "response";
}
}

public static class TestController$$EnhancerBySpringCGLIB extends TestController {
}
}
67 changes: 0 additions & 67 deletions ...relic/agent/instrumentation/pointcuts/frameworks/spring/HandlerMethodInvokerPointCut.java
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions ...com/newrelic/agent/instrumentation/pointcuts/frameworks/spring/MethodInvokerPointCut.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...n/java/com/newrelic/agent/instrumentation/pointcuts/frameworks/spring/SpringPointCut.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ protected void doFinish(int opcode, Object modelView) {

private String getControllerName(Class<?> controller) {
String controllerName = controller.getName();
int indexOf = controllerName.indexOf(MethodInvokerPointCut.TO_REMOVE);
int indexOf = controllerName.indexOf("$$EnhancerBy");
if (indexOf > 0) {
controllerName = controllerName.substring(0, indexOf);
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ include 'instrumentation:spring-batch-4.0.0'
include 'instrumentation:spring-batch-5.0.0'
include 'instrumentation:spring-boot-actuator-3.0.0'
include 'instrumentation:spring-cache-3.1.0'
include 'instrumentation:spring-handler-method-invoker-3.0.0'
include 'instrumentation:spring-handler-method-invoker-2.5.2'
include 'instrumentation:spring-jms-2'
include 'instrumentation:spring-jms-3'
include 'instrumentation:spring-kafka-2.2.0'
Expand Down
Loading