Skip to content

Commit 90f9dfd

Browse files
amarzialiamarziali
committed
Add instrumentation name to spanStart (A-J)
1 parent 727c7c7 commit 90f9dfd

File tree

96 files changed

+168
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+168
-130
lines changed

Diff for: ‎dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void withMethod(final AgentSpan span, final String methodName) {
9393
}
9494

9595
public AgentSpan startAerospikeSpan(final String methodName) {
96-
final AgentSpan span = startSpan(OPERATION_NAME);
96+
final AgentSpan span = startSpan("aerospike", OPERATION_NAME);
9797
afterStart(span);
9898
withMethod(span, methodName);
9999
return span;

Diff for: ‎dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala/AkkaActors.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class Greeter(message: String, receiverActor: ActorRef) extends Actor {
130130
case Greet =>
131131
receiverActor ! Greeting(greeting)
132132
case Leak(leak) =>
133-
val span = startSpan(greeting)
133+
val span = startSpan("akka-concurrent", greeting)
134134
span.setResourceName(leak)
135135
activateSpan(span)
136136
span.finish()

Diff for: ‎dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected Integer compute() {
3131
return parent;
3232
} else {
3333
int next = parent + 1;
34-
AgentSpan span = startSpan(Integer.toString(next));
34+
AgentSpan span = startSpan("akka-concurrent", Integer.toString(next));
3535
try (AgentScope scope = activateSpan(span)) {
3636
LinearTask child = new LinearTask(next, depth);
3737
return child.fork().join();

Diff for: ‎dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerDecorator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
public class AkkaHttpServerDecorator
1919
extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, HttpRequest> {
20-
private static final CharSequence AKKA_HTTP_SERVER = UTF8BytesString.create("akka-http-server");
20+
public static final CharSequence AKKA_HTTP_SERVER = UTF8BytesString.create("akka-http-server");
2121

2222
public static final AkkaHttpServerDecorator DECORATE = new AkkaHttpServerDecorator();
2323
public static final CharSequence AKKA_SERVER_REQUEST =

Diff for: ‎dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ public static AgentScope methodEnter(
7474
return null;
7575
}
7676

77-
final AgentSpan span = startSpan(AKKA_CLIENT_REQUEST);
77+
final AgentSpan span =
78+
startSpan(AkkaHttpClientDecorator.AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
7879
DECORATE.afterStart(span);
7980
DECORATE.onRequest(span, request);
8081

Diff for: ‎dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
public class DatadogWrapperHelper {
1313
public static AgentScope createSpan(final HttpRequest request) {
1414
final AgentSpanContext.Extracted extractedContext = DECORATE.extract(request);
15-
final AgentSpan span = DECORATE.startSpan(request, extractedContext);
15+
final AgentSpan span =
16+
DECORATE.startSpan(
17+
AkkaHttpServerDecorator.AKKA_HTTP_SERVER.toString(), request, extractedContext);
1618
DECORATE.afterStart(span);
1719
DECORATE.onRequest(span, request, request, extractedContext);
1820

Diff for: ‎dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ public static AgentScope methodEnter(
2424
return null;
2525
}
2626

27-
final AgentSpan span = startSpan(AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST);
27+
final AgentSpan span =
28+
startSpan(
29+
AkkaHttpClientDecorator.AKKA_HTTP_CLIENT.toString(),
30+
AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST);
2831
AkkaHttpClientDecorator.DECORATE.afterStart(span);
2932
AkkaHttpClientDecorator.DECORATE.onRequest(span, request);
3033

Diff for: ‎dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static AgentSpan methodEnter(
9191
@Advice.Argument(value = 3, readOnly = false) FutureCallback<?> futureCallback) {
9292

9393
final AgentScope.Continuation parentContinuation = captureActiveSpan();
94-
final AgentSpan clientSpan = startSpan(HTTP_REQUEST);
94+
final AgentSpan clientSpan = startSpan("apache-http-client", HTTP_REQUEST);
9595
DECORATE.afterStart(clientSpan);
9696

9797
requestProducer = new DelegatingRequestProducer(clientSpan, requestProducer);

Diff for: ‎dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) {
3737
}
3838

3939
private static AgentScope activateHttpSpan(final HttpUriRequest request) {
40-
final AgentSpan span = startSpan(HTTP_REQUEST);
40+
final AgentSpan span = startSpan("apache-http-client", HTTP_REQUEST);
4141
final AgentScope scope = activateSpan(span);
4242

4343
DECORATE.afterStart(span);

Diff for: ‎dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static AgentScope methodEnter(
9797
@Advice.Argument(value = 4, readOnly = false) FutureCallback<?> futureCallback) {
9898

9999
final AgentScope.Continuation parentContinuation = captureActiveSpan();
100-
final AgentSpan clientSpan = startSpan(HTTP_REQUEST);
100+
final AgentSpan clientSpan = startSpan("apache-http-client", HTTP_REQUEST);
101101
final AgentScope clientScope = activateSpan(clientSpan);
102102
DECORATE.afterStart(clientSpan);
103103

Diff for: ‎dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) {
3737
}
3838

3939
private static AgentScope activateHttpSpan(final HttpRequest request) {
40-
final AgentSpan span = startSpan(HTTP_REQUEST);
40+
final AgentSpan span = startSpan("apache-http-client", HTTP_REQUEST);
4141
final AgentScope scope = activateSpan(span);
4242

4343
DECORATE.afterStart(span);

Diff for: ‎dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ public static AgentScope before() {
226226
AgentSpan clientSpan = activeSpan();
227227
if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) {
228228
AgentSpan messageSpan =
229-
startSpan(GRPC_MESSAGE).setTag("message.type", clientSpan.getTag("response.type"));
229+
startSpan("armeria-grpc", GRPC_MESSAGE)
230+
.setTag("message.type", clientSpan.getTag("response.type"));
230231
DECORATE.afterStart(messageSpan);
231232
return activateSpan(messageSpan);
232233
}

Diff for: ‎dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public <ReqT, RespT> AgentSpan startCall(MethodDescriptor<ReqT, RespT> method) {
9696
return null;
9797
}
9898
AgentSpan span =
99-
startSpan(OPERATION_NAME)
99+
startSpan("armeria-grpc", OPERATION_NAME)
100100
.setTag("request.type", requestMessageType(method))
101101
.setTag("response.type", responseMessageType(method))
102102
// method.getServiceName() may not be available on some grpc versions

Diff for: ‎dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
6767
spanContext = callIGCallbackRequestStarted(tracer, spanContext);
6868

6969
CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
70-
final AgentSpan span =
71-
startSpan(DECORATE.instrumentationNames()[0], GRPC_SERVER, spanContext).setMeasured(true);
70+
final AgentSpan span = startSpan("armeria-grpc", GRPC_SERVER, spanContext).setMeasured(true);
7271

7372
AgentTracer.get()
7473
.getDataStreamsMonitoring()
@@ -144,7 +143,7 @@ public static final class TracingServerCallListener<ReqT>
144143
@Override
145144
public void onMessage(final ReqT message) {
146145
final AgentSpan msgSpan =
147-
startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.context())
146+
startSpan("armeria-grpc", GRPC_MESSAGE, this.span.context())
148147
.setTag("message.type", message.getClass().getName());
149148
DECORATE.afterStart(msgSpan);
150149
try (AgentScope scope = activateSpan(msgSpan)) {

Diff for: ‎dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void beforeRequest(final Request<?> request) {
6464
span.setOperationName(AwsNameCache.spanName(request));
6565
} else {
6666
// this is the most common code path
67-
span = startSpan(AwsNameCache.spanName(request));
67+
span = startSpan("aws-sdk", AwsNameCache.spanName(request));
6868
}
6969
DECORATE.afterStart(span);
7070
DECORATE.onRequest(span, request);

Diff for: ‎dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void beforeExecution(
4646
return; // SQS messages spans are created by aws-java-sqs-2.0
4747
}
4848

49-
final AgentSpan span = startSpan(DECORATE.spanName(executionAttributes));
49+
final AgentSpan span = startSpan("aws-sdk", DECORATE.spanName(executionAttributes));
5050
DECORATE.afterStart(span);
5151
executionAttributes.putAttribute(SPAN_ATTRIBUTE, span);
5252
}

Diff for: ‎dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request
107107
}
108108

109109
private AgentSpan newSpan(AmazonWebServiceRequest request) {
110-
final AgentSpan span = AgentTracer.startSpan("aws.sns.send");
110+
final AgentSpan span = AgentTracer.startSpan("sns", "aws.sns.send");
111111
// pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
112112
// activated
113113
contextStore.put(request, span);

Diff for: ‎dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ protected void startNewMessageSpan(Message message) {
7676
if (timeInQueueStart > 0) {
7777
queueSpan =
7878
startSpan(
79+
"sqs",
7980
SQS_TIME_IN_QUEUE_OPERATION,
8081
spanContext,
8182
MILLISECONDS.toMicros(timeInQueueStart));
@@ -89,7 +90,7 @@ protected void startNewMessageSpan(Message message) {
8990
// re-use this context for any other messages received in this batch
9091
batchContext = spanContext;
9192
}
92-
AgentSpan span = startSpan(SQS_INBOUND_OPERATION, batchContext);
93+
AgentSpan span = startSpan("sqs", SQS_INBOUND_OPERATION, batchContext);
9394

9495
LinkedHashMap<String, String> sortedTags = new LinkedHashMap<>();
9596
sortedTags.put(DIRECTION_TAG, DIRECTION_IN);

Diff for: ‎dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ static AgentScope enter(
8989
AgentSpanContext lambdaContext = AgentTracer.get().notifyExtensionStart(event);
9090
final AgentSpan span;
9191
if (null == lambdaContext) {
92-
span = startSpan(INVOCATION_SPAN_NAME);
92+
span = startSpan("aws-lambda", INVOCATION_SPAN_NAME);
9393
} else {
94-
span = startSpan(INVOCATION_SPAN_NAME, lambdaContext);
94+
span = startSpan("aws-lambda", INVOCATION_SPAN_NAME, lambdaContext);
9595
}
9696
final AgentScope scope = activateSpan(span);
9797
return scope;

Diff for: ‎dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static AgentScope beginProcessingMessage(
6767
@Advice.Argument(0) final MessageContext message) {
6868
// only create a span if the message has a clear action and there's a surrounding request
6969
if (DECORATE.shouldTrace(message)) {
70-
AgentSpan span = startSpan(AXIS2_MESSAGE);
70+
AgentSpan span = startSpan(AxisMessageDecorator.AXIS2.toString(), AXIS2_MESSAGE);
7171
DECORATE.afterStart(span);
7272
DECORATE.onMessage(span, message);
7373
return activateSpan(span);
@@ -102,7 +102,7 @@ public static AgentScope beginResumingMessage(
102102
message.removeSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY);
103103
// resuming is a distinct operation, so create a new span under the original request
104104
try (AgentScope parentScope = ((AgentScope.Continuation) continuation).activate()) {
105-
AgentSpan span = startSpan(AXIS2_MESSAGE);
105+
AgentSpan span = startSpan(AxisMessageDecorator.AXIS2.toString(), AXIS2_MESSAGE);
106106
DECORATE.afterStart(span);
107107
DECORATE.onMessage(span, message);
108108
return activateSpan(span);

Diff for: ‎dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static final class TransportAdvice {
6464
public static AgentScope beginTransport(@Advice.Argument(0) final MessageContext message) {
6565
// only create a span if the message has a clear action and there's a surrounding request
6666
if (DECORATE.shouldTrace(message)) {
67-
AgentSpan span = startSpan(AXIS2_TRANSPORT);
67+
AgentSpan span = startSpan(AxisMessageDecorator.AXIS2.toString(), AXIS2_TRANSPORT);
6868
DECORATE.afterStart(span);
6969
DECORATE.onTransport(span, message);
7070
DECORATE.onMessage(span, message);

Diff for: ‎dd-java-agent/instrumentation/axway-api/src/main/java/datadog/trace/instrumentation/axway/HTTPPluginAdvice.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class HTTPPluginAdvice {
1414

1515
@Advice.OnMethodEnter(suppress = Throwable.class)
1616
public static AgentScope onEnter(@Advice.Argument(value = 2) final Object serverTransaction) {
17-
final AgentSpan span = startSpan(DECORATE.spanName()).setMeasured(true);
17+
final AgentSpan span = startSpan("axway", DECORATE.spanName()).setMeasured(true);
1818
DECORATE.afterStart(span);
1919
// serverTransaction is like request + connection in one object:
2020
DECORATE.onRequest(span, serverTransaction, serverTransaction, null);

Diff for: ‎dd-java-agent/instrumentation/axway-api/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class StateAdvice {
2020
@Advice.OnMethodEnter(suppress = Throwable.class)
2121
public static AgentScope onEnter(@Advice.This final Object stateInstance) {
22-
final AgentSpan span = startSpan(AXWAY_TRY_TRANSACTION);
22+
final AgentSpan span = startSpan("axway", AXWAY_TRY_TRANSACTION);
2323
final AgentScope scope = activateSpan(span);
2424
span.setMeasured(true);
2525
DECORATE.onTransaction(span, stateInstance);

Diff for: ‎dd-java-agent/instrumentation/azure-functions/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static AgentScope methodEnter(
6868
@Advice.Argument(0) final HttpRequestMessage request,
6969
@Advice.Argument(1) final ExecutionContext context) {
7070
final AgentSpanContext.Extracted extractedContext = DECORATE.extract(request);
71-
final AgentSpan span = DECORATE.startSpan(request, extractedContext);
71+
final AgentSpan span = DECORATE.startSpan("azure-functions", request, extractedContext);
7272
DECORATE.afterStart(span, context.getFunctionName());
7373
DECORATE.onRequest(span, request, request, extractedContext);
7474
HTTP_RESOURCE_DECORATOR.withRoute(

Diff for: ‎dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMe
6464
return null;
6565
}
6666

67-
final AgentSpan span = startSpan(HTTP_REQUEST);
67+
final AgentSpan span = startSpan("commons-http-client", HTTP_REQUEST);
6868
final AgentScope scope = activateSpan(span);
6969

7070
DECORATE.afterStart(span);

Diff for: ‎dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static AgentScope startMethod(
8888
@Advice.This final ExecutionContext executionContext,
8989
@Advice.Origin("datanucleus.#m") final String operationName) {
9090

91-
final AgentSpan span = startSpan(operationName);
91+
final AgentSpan span = startSpan("datanucleus", operationName);
9292
DECORATE.afterStart(span);
9393

9494
return activateSpan(span);
@@ -121,7 +121,7 @@ public static AgentScope startMethod(
121121
return null;
122122
}
123123

124-
final AgentSpan span = startSpan(operationName);
124+
final AgentSpan span = startSpan("datanucleus", operationName);
125125
DECORATE.afterStart(span);
126126

127127
return activateSpan(span);
@@ -151,7 +151,7 @@ public static class FindWithStringClassnameAdvice {
151151
@Advice.OnMethodEnter(suppress = Throwable.class)
152152
public static AgentScope startMethod() {
153153

154-
final AgentSpan span = startSpan(DATANUCLEUS_FIND_OBJECT);
154+
final AgentSpan span = startSpan("datanucleus", DATANUCLEUS_FIND_OBJECT);
155155
DECORATE.afterStart(span);
156156

157157
return activateSpan(span);
@@ -182,7 +182,7 @@ public static class FindWithClassAdvice {
182182
@Advice.OnMethodEnter(suppress = Throwable.class)
183183
public static AgentScope startMethod() {
184184

185-
final AgentSpan span = startSpan(DATANUCLEUS_FIND_OBJECT);
185+
final AgentSpan span = startSpan("datanucleus", DATANUCLEUS_FIND_OBJECT);
186186
DECORATE.afterStart(span);
187187

188188
return activateSpan(span);

Diff for: ‎dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public static AgentScope startExecute(@Advice.Origin("#m") final String methodNa
7070

7171
final AgentSpan span =
7272
methodName.startsWith("execute")
73-
? startSpan(DATANUCLEUS_QUERY_EXECUTE)
74-
: startSpan(DATANUCLEUS_QUERY_DELETE);
73+
? startSpan("datanucleus", DATANUCLEUS_QUERY_EXECUTE)
74+
: startSpan("datanucleaus", DATANUCLEUS_QUERY_DELETE);
7575

7676
DECORATE.afterStart(span);
7777

Diff for: ‎dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static class TransactionAdvice {
4444
@Advice.OnMethodEnter(suppress = Throwable.class)
4545
public static AgentScope start(
4646
@Advice.Origin("datanucleus.transaction.#m") final String operationName) {
47-
final AgentSpan span = startSpan(operationName);
47+
final AgentSpan span = startSpan("datanucleus", operationName);
4848

4949
DECORATE.afterStart(span);
5050

Diff for: ‎dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public void run() {
252252
}
253253

254254
private AgentScope startSpanWithScope(final String query) {
255-
final AgentSpan span = startSpan(OPERATION_NAME);
255+
final AgentSpan span = startSpan("cassandra", OPERATION_NAME);
256256
DECORATE.afterStart(span);
257257
DECORATE.onConnection(span, session);
258258
DECORATE.onStatement(span, query);

Diff for: ‎dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public <RequestT extends Request, ResultT> ResultT execute(
5454
}
5555

5656
private ResultSet wrapSyncRequest(Statement request) {
57-
AgentSpan span = startSpan(OPERATION_NAME);
57+
AgentSpan span = startSpan("cassandra", OPERATION_NAME);
5858

5959
DECORATE.afterStart(span);
6060
DECORATE.onConnection(span, getDelegate());
@@ -78,7 +78,7 @@ private ResultSet wrapSyncRequest(Statement request) {
7878
}
7979

8080
private CompletionStage<AsyncResultSet> wrapAsyncRequest(Statement request) {
81-
AgentSpan span = startSpan(OPERATION_NAME);
81+
AgentSpan span = startSpan("cassandra", OPERATION_NAME);
8282

8383
DECORATE.afterStart(span);
8484
DECORATE.onConnection(span, getDelegate());

Diff for: ‎dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ public static AgentScope onEnter(
6969
if (activeSpan() == null) {
7070
return null;
7171
}
72-
final AgentSpan span = startSpan("view.render").setTag(Tags.COMPONENT, "dropwizard-view");
72+
final AgentSpan span =
73+
startSpan("dropwizard", "view.render").setTag(Tags.COMPONENT, "dropwizard-view");
7374
span.setResourceName("View " + view.getTemplateName());
7475
return activateSpan(span);
7576
}

Diff for: ‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static AgentScope onEnter(
5959
@Advice.Argument(1) final String endpoint,
6060
@Advice.Argument(value = 5, readOnly = false) ResponseListener responseListener) {
6161

62-
final AgentSpan span = startSpan(OPERATION_NAME);
62+
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
6363
DECORATE.afterStart(span);
6464
DECORATE.onRequest(span, method, endpoint, null, null);
6565

Diff for: ‎dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static AgentScope onEnter(
5757
@Advice.Argument(0) final Request request,
5858
@Advice.Argument(value = 1, readOnly = false) ResponseListener responseListener) {
5959

60-
final AgentSpan span = startSpan(OPERATION_NAME);
60+
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
6161
DECORATE.afterStart(span);
6262
DECORATE.onRequest(
6363
span,

Diff for: ‎dd-java-agent/instrumentation/elasticsearch/rest-7/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static AgentScope onEnter(
7474
@Advice.Argument(value = 1, readOnly = false, optional = true)
7575
ResponseListener responseListener) {
7676

77-
final AgentSpan span = startSpan(OPERATION_NAME);
77+
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
7878
DECORATE.afterStart(span);
7979
DECORATE.onRequest(
8080
span,

Diff for: ‎dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static AgentScope onEnter(
6363
@Advice.Argument(value = 2, readOnly = false)
6464
ActionListener<ActionResponse> actionListener) {
6565

66-
final AgentSpan span = startSpan(OPERATION_NAME);
66+
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
6767
DECORATE.afterStart(span);
6868
DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
6969

Diff for: ‎dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static AgentScope onEnter(
6464
@Advice.Argument(value = 2, readOnly = false)
6565
ActionListener<ActionResponse> actionListener) {
6666

67-
final AgentSpan span = startSpan(OPERATION_NAME);
67+
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
6868
DECORATE.afterStart(span);
6969
DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
7070

0 commit comments

Comments
 (0)