Skip to content

Addresses #1043: add a serviceName attribute to the @Trace annotation #2413

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

Closed
wants to merge 3 commits into from
Closed

Addresses #1043: add a serviceName attribute to the @Trace annotation #2413

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b12f072
Addresses #1043: add a serviceName attribute to the @Trace annotation
msm Feb 15, 2021
4d3d0d4
Fix resourceName in test to match resource name that the test method …
msm Feb 15, 2021
ec0191a
Remove "expected" spanType that wasn't being set in the test
msm Feb 15, 2021
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
6 changes: 6 additions & 0 deletions ...-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ public static AgentScope onEnter(@Advice.Origin final Method method) {
resourceName = DECORATE.spanNameForMethod(method);
}
span.setResourceName(resourceName);

String serviceName = traceAnnotation == null ? null : traceAnnotation.serviceName();
if (serviceName != null && serviceName.length() > 0) {
span.setServiceName(serviceName);
}

DECORATE.afterStart(span);

final AgentScope scope = activateSpan(span);
Expand Down
24 changes: 24 additions & 0 deletions dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,30 @@ class TraceAnnotationsTest extends AgentTestRunner {
}
}

def "test simple case with only service name set"() {
setup:
// Test single span in new trace
SayTracedHello.sayHelloWithServiceName()

expect:
assertTraces(1) {
trace(1) {
span {
serviceName "testServiceName"
resourceName "SayTracedHello.sayHello"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be "SayTracedHello.sayHelloWithServiceName" because the resource name is derived from the method name unless specified, this would make the tests pass.

operationName "trace.annotation"
spanType "DB"
parent()
errored false
tags {
"$Tags.COMPONENT" "trace"
defaultTags()
}
}
}
}
}

def "test simple case with both resource and operation name set"() {
setup:
// Test single span in new trace
Expand Down
5 changes: 5 additions & 0 deletions ...strumentation/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ public static String sayHAWithResource() {
return "HA EARTH!!";
}

@Trace(serviceName = "testServiceName")
public static String sayHelloWithServiceName() {
return "hello!";
}

@Trace(operationName = "NEW_TRACE")
public static String sayHELLOsayHA() {
activeSpan().setTag(DDTags.SERVICE_NAME, "test2");
Expand Down
3 changes: 3 additions & 0 deletions dd-trace-api/src/main/java/datadog/trace/api/Trace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@

/** The resource name. By default it uses the same value as the operation name */
String resourceName() default "";

/** The service name. By default it will inherit the default service name */
String serviceName() default "";
}