Skip to content

Commit 24790e4

Browse files
committed
Rename method jax -> jakarta, remove unecessary enable config
1 parent d25059a commit 24790e4

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

dd-java-agent/instrumentation/jakarta-ws-annotations/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceDecorator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected CharSequence component() {
3030
return JAKARTA_WS_ENDPOINT;
3131
}
3232

33-
public void onJaxWsSpan(final AgentSpan span, final Class<?> target, final String method) {
33+
public void onJakartaWsSpan(final AgentSpan span, final Class<?> target, final String method) {
3434
span.setResourceName(spanNameForMethod(target, method));
3535
}
3636
}

dd-java-agent/instrumentation/jakarta-ws-annotations/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ public WebServiceInstrumentation() {
3434
super("jakarta-ws");
3535
}
3636

37-
@Override
38-
protected boolean defaultEnabled() {
39-
return true;
40-
}
41-
4237
@Override
4338
public String hierarchyMarkerType() {
4439
return null; // bootstrap type
@@ -80,7 +75,7 @@ public static AgentScope beginRequest(
8075

8176
AgentSpan span = startSpan(JAKARTA_WS_REQUEST);
8277
span.setMeasured(true);
83-
DECORATE.onJaxWsSpan(span, thiz.getClass(), method);
78+
DECORATE.onJakartaWsSpan(span, thiz.getClass(), method);
8479
DECORATE.afterStart(span);
8580
return activateSpan(span);
8681
}

dd-java-agent/instrumentation/jakarta-ws-annotations/src/test/groovy/WebServiceTest.groovy

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ import static org.junit.Assert.fail
55

66
class WebServiceTest extends AgentTestRunner {
77

8-
@Override
9-
void configurePreAgent() {
10-
super.configurePreAgent()
11-
// todo figure out sysconfig
12-
// injectSysConfig("dd.integration.jax-ws.enabled", "true")
13-
injectSysConfig("dd.integration.jakarta-ws.enabled", "true")
14-
}
15-
168
def "test successful interface request is traced"() {
179
when:
1810
new TestService1Impl().send("success")

0 commit comments

Comments
 (0)