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

Add instrumentation name to startSpan (A-J) #8594

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add instrumentation name to startSpan (A-J) #8594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...ke-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void withMethod(final AgentSpan span, final String methodName) {
}

public AgentSpan startAerospikeSpan(final String methodName) {
final AgentSpan span = startSpan(OPERATION_NAME);
final AgentSpan span = startSpan("aerospike", OPERATION_NAME);
afterStart(span);
withMethod(span, methodName);
return span;
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala/AkkaActors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class Greeter(message: String, receiverActor: ActorRef) extends Actor {
case Greet =>
receiverActor ! Greeting(greeting)
case Leak(leak) =>
val span = startSpan(greeting)
val span = startSpan("akka-concurrent", greeting)
span.setResourceName(leak)
activateSpan(span)
span.finish()
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected Integer compute() {
return parent;
} else {
int next = parent + 1;
AgentSpan span = startSpan(Integer.toString(next));
AgentSpan span = startSpan("akka-concurrent", Integer.toString(next));
try (AgentScope scope = activateSpan(span)) {
LinearTask child = new LinearTask(next, depth);
return child.fork().join();
Expand Down
2 changes: 1 addition & 1 deletion ...tp-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

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

public static final AkkaHttpServerDecorator DECORATE = new AkkaHttpServerDecorator();
public static final CharSequence AKKA_SERVER_REQUEST =
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ public static AgentScope methodEnter(
return null;
}

final AgentSpan span = startSpan(AKKA_CLIENT_REQUEST);
final AgentSpan span =
startSpan(AkkaHttpClientDecorator.AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
DECORATE.afterStart(span);
DECORATE.onRequest(span, request);

Expand Down
4 changes: 3 additions & 1 deletion ...-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
public class DatadogWrapperHelper {
public static AgentScope createSpan(final HttpRequest request) {
final AgentSpanContext.Extracted extractedContext = DECORATE.extract(request);
final AgentSpan span = DECORATE.startSpan(request, extractedContext);
final AgentSpan span =
DECORATE.startSpan(
AkkaHttpServerDecorator.AKKA_HTTP_SERVER.toString(), request, extractedContext);
DECORATE.afterStart(span);
DECORATE.onRequest(span, request, request, extractedContext);

Expand Down
5 changes: 4 additions & 1 deletion ...p-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ public static AgentScope methodEnter(
return null;
}

final AgentSpan span = startSpan(AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST);
final AgentSpan span =
startSpan(
AkkaHttpClientDecorator.AKKA_HTTP_CLIENT.toString(),
AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST);
AkkaHttpClientDecorator.DECORATE.afterStart(span);
AkkaHttpClientDecorator.DECORATE.onRequest(span, request);

Expand Down
2 changes: 1 addition & 1 deletion ...dog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public static AgentSpan methodEnter(
@Advice.Argument(value = 3, readOnly = false) FutureCallback<?> futureCallback) {

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

requestProducer = new DelegatingRequestProducer(clientSpan, requestProducer);
Expand Down
2 changes: 1 addition & 1 deletion ...pclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) {
}

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

DECORATE.afterStart(span);
Expand Down
2 changes: 1 addition & 1 deletion ...datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static AgentScope methodEnter(
@Advice.Argument(value = 4, readOnly = false) FutureCallback<?> futureCallback) {

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

Expand Down
2 changes: 1 addition & 1 deletion ...client-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) {
}

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

DECORATE.afterStart(span);
Expand Down
3 changes: 2 additions & 1 deletion ...java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ public static AgentScope before() {
AgentSpan clientSpan = activeSpan();
if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) {
AgentSpan messageSpan =
startSpan(GRPC_MESSAGE).setTag("message.type", clientSpan.getTag("response.type"));
startSpan("armeria-grpc", GRPC_MESSAGE)
.setTag("message.type", clientSpan.getTag("response.type"));
DECORATE.afterStart(messageSpan);
return activateSpan(messageSpan);
}
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public <ReqT, RespT> AgentSpan startCall(MethodDescriptor<ReqT, RespT> method) {
return null;
}
AgentSpan span =
startSpan(OPERATION_NAME)
startSpan("armeria-grpc", OPERATION_NAME)
.setTag("request.type", requestMessageType(method))
.setTag("response.type", responseMessageType(method))
// method.getServiceName() may not be available on some grpc versions
Expand Down
5 changes: 2 additions & 3 deletions ...main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
spanContext = callIGCallbackRequestStarted(tracer, spanContext);

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

AgentTracer.get()
.getDataStreamsMonitoring()
Expand Down Expand Up @@ -144,7 +143,7 @@ public static final class TracingServerCallListener<ReqT>
@Override
public void onMessage(final ReqT message) {
final AgentSpan msgSpan =
startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.context())
startSpan("armeria-grpc", GRPC_MESSAGE, this.span.context())
.setTag("message.type", message.getClass().getName());
DECORATE.afterStart(msgSpan);
try (AgentScope scope = activateSpan(msgSpan)) {
Expand Down
2 changes: 1 addition & 1 deletion ...-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void beforeRequest(final Request<?> request) {
span.setOperationName(AwsNameCache.spanName(request));
} else {
// this is the most common code path
span = startSpan(AwsNameCache.spanName(request));
span = startSpan("aws-sdk", AwsNameCache.spanName(request));
}
DECORATE.afterStart(span);
DECORATE.onRequest(span, request);
Expand Down
2 changes: 1 addition & 1 deletion ...k-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void beforeExecution(
return; // SQS messages spans are created by aws-java-sqs-2.0
}

final AgentSpan span = startSpan(DECORATE.spanName(executionAttributes));
final AgentSpan span = startSpan("aws-sdk", DECORATE.spanName(executionAttributes));
DECORATE.afterStart(span);
executionAttributes.putAttribute(SPAN_ATTRIBUTE, span);
}
Expand Down
2 changes: 1 addition & 1 deletion ...s-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request
}

private AgentSpan newSpan(AmazonWebServiceRequest request) {
final AgentSpan span = AgentTracer.startSpan("aws.sns.send");
final AgentSpan span = AgentTracer.startSpan("sns", "aws.sns.send");
// pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
// activated
contextStore.put(request, span);
Expand Down
3 changes: 2 additions & 1 deletion ...-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ protected void startNewMessageSpan(Message message) {
if (timeInQueueStart > 0) {
queueSpan =
startSpan(
"sqs",
SQS_TIME_IN_QUEUE_OPERATION,
spanContext,
MILLISECONDS.toMicros(timeInQueueStart));
Expand All @@ -89,7 +90,7 @@ protected void startNewMessageSpan(Message message) {
// re-use this context for any other messages received in this batch
batchContext = spanContext;
}
AgentSpan span = startSpan(SQS_INBOUND_OPERATION, batchContext);
AgentSpan span = startSpan("sqs", SQS_INBOUND_OPERATION, batchContext);

LinkedHashMap<String, String> sortedTags = new LinkedHashMap<>();
sortedTags.put(DIRECTION_TAG, DIRECTION_IN);
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ static AgentScope enter(
AgentSpanContext lambdaContext = AgentTracer.get().notifyExtensionStart(event);
final AgentSpan span;
if (null == lambdaContext) {
span = startSpan(INVOCATION_SPAN_NAME);
span = startSpan("aws-lambda", INVOCATION_SPAN_NAME);
} else {
span = startSpan(INVOCATION_SPAN_NAME, lambdaContext);
span = startSpan("aws-lambda", INVOCATION_SPAN_NAME, lambdaContext);
}
final AgentScope scope = activateSpan(span);
return scope;
Expand Down
4 changes: 2 additions & 2 deletions ...n/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static AgentScope beginProcessingMessage(
@Advice.Argument(0) final MessageContext message) {
// only create a span if the message has a clear action and there's a surrounding request
if (DECORATE.shouldTrace(message)) {
AgentSpan span = startSpan(AXIS2_MESSAGE);
AgentSpan span = startSpan(AxisMessageDecorator.AXIS2.toString(), AXIS2_MESSAGE);
DECORATE.afterStart(span);
DECORATE.onMessage(span, message);
return activateSpan(span);
Expand Down Expand Up @@ -102,7 +102,7 @@ public static AgentScope beginResumingMessage(
message.removeSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY);
// resuming is a distinct operation, so create a new span under the original request
try (AgentScope parentScope = ((AgentScope.Continuation) continuation).activate()) {
AgentSpan span = startSpan(AXIS2_MESSAGE);
AgentSpan span = startSpan(AxisMessageDecorator.AXIS2.toString(), AXIS2_MESSAGE);
DECORATE.afterStart(span);
DECORATE.onMessage(span, message);
return activateSpan(span);
Expand Down
2 changes: 1 addition & 1 deletion ...xis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static final class TransportAdvice {
public static AgentScope beginTransport(@Advice.Argument(0) final MessageContext message) {
// only create a span if the message has a clear action and there's a surrounding request
if (DECORATE.shouldTrace(message)) {
AgentSpan span = startSpan(AXIS2_TRANSPORT);
AgentSpan span = startSpan(AxisMessageDecorator.AXIS2.toString(), AXIS2_TRANSPORT);
DECORATE.afterStart(span);
DECORATE.onTransport(span, message);
DECORATE.onMessage(span, message);
Expand Down
2 changes: 1 addition & 1 deletion ...ntation/axway-api/src/main/java/datadog/trace/instrumentation/axway/HTTPPluginAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class HTTPPluginAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static AgentScope onEnter(@Advice.Argument(value = 2) final Object serverTransaction) {
final AgentSpan span = startSpan(DECORATE.spanName()).setMeasured(true);
final AgentSpan span = startSpan("axway", DECORATE.spanName()).setMeasured(true);
DECORATE.afterStart(span);
// serverTransaction is like request + connection in one object:
DECORATE.onRequest(span, serverTransaction, serverTransaction, null);
Expand Down
2 changes: 1 addition & 1 deletion ...trumentation/axway-api/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public class StateAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static AgentScope onEnter(@Advice.This final Object stateInstance) {
final AgentSpan span = startSpan(AXWAY_TRY_TRANSACTION);
final AgentSpan span = startSpan("axway", AXWAY_TRY_TRANSACTION);
final AgentScope scope = activateSpan(span);
span.setMeasured(true);
DECORATE.onTransaction(span, stateInstance);
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static AgentScope methodEnter(
@Advice.Argument(0) final HttpRequestMessage request,
@Advice.Argument(1) final ExecutionContext context) {
final AgentSpanContext.Extracted extractedContext = DECORATE.extract(request);
final AgentSpan span = DECORATE.startSpan(request, extractedContext);
final AgentSpan span = DECORATE.startSpan("azure-functions", request, extractedContext);
DECORATE.afterStart(span, context.getFunctionName());
DECORATE.onRequest(span, request, request, extractedContext);
HTTP_RESOURCE_DECORATOR.withRoute(
Expand Down
2 changes: 1 addition & 1 deletion ...ava/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMe
return null;
}

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

DECORATE.afterStart(span);
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static AgentScope startMethod(
@Advice.This final ExecutionContext executionContext,
@Advice.Origin("datanucleus.#m") final String operationName) {

final AgentSpan span = startSpan(operationName);
final AgentSpan span = startSpan("datanucleus", operationName);
DECORATE.afterStart(span);

return activateSpan(span);
Expand Down Expand Up @@ -121,7 +121,7 @@ public static AgentScope startMethod(
return null;
}

final AgentSpan span = startSpan(operationName);
final AgentSpan span = startSpan("datanucleus", operationName);
DECORATE.afterStart(span);

return activateSpan(span);
Expand Down Expand Up @@ -151,7 +151,7 @@ public static class FindWithStringClassnameAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static AgentScope startMethod() {

final AgentSpan span = startSpan(DATANUCLEUS_FIND_OBJECT);
final AgentSpan span = startSpan("datanucleus", DATANUCLEUS_FIND_OBJECT);
DECORATE.afterStart(span);

return activateSpan(span);
Expand Down Expand Up @@ -182,7 +182,7 @@ public static class FindWithClassAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static AgentScope startMethod() {

final AgentSpan span = startSpan(DATANUCLEUS_FIND_OBJECT);
final AgentSpan span = startSpan("datanucleus", DATANUCLEUS_FIND_OBJECT);
DECORATE.afterStart(span);

return activateSpan(span);
Expand Down
4 changes: 2 additions & 2 deletions ...us-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public static AgentScope startExecute(@Advice.Origin("#m") final String methodNa

final AgentSpan span =
methodName.startsWith("execute")
? startSpan(DATANUCLEUS_QUERY_EXECUTE)
: startSpan(DATANUCLEUS_QUERY_DELETE);
? startSpan("datanucleus", DATANUCLEUS_QUERY_EXECUTE)
: startSpan("datanucleaus", DATANUCLEUS_QUERY_DELETE);

DECORATE.afterStart(span);

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static class TransactionAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static AgentScope start(
@Advice.Origin("datanucleus.transaction.#m") final String operationName) {
final AgentSpan span = startSpan(operationName);
final AgentSpan span = startSpan("datanucleus", operationName);

DECORATE.afterStart(span);

Expand Down
2 changes: 1 addition & 1 deletion ...ndra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public void run() {
}

private AgentScope startSpanWithScope(final String query) {
final AgentSpan span = startSpan(OPERATION_NAME);
final AgentSpan span = startSpan("cassandra", OPERATION_NAME);
DECORATE.afterStart(span);
DECORATE.onConnection(span, session);
DECORATE.onStatement(span, query);
Expand Down
4 changes: 2 additions & 2 deletions ...dra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public <RequestT extends Request, ResultT> ResultT execute(
}

private ResultSet wrapSyncRequest(Statement request) {
AgentSpan span = startSpan(OPERATION_NAME);
AgentSpan span = startSpan("cassandra", OPERATION_NAME);

DECORATE.afterStart(span);
DECORATE.onConnection(span, getDelegate());
Expand All @@ -78,7 +78,7 @@ private ResultSet wrapSyncRequest(Statement request) {
}

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

DECORATE.afterStart(span);
DECORATE.onConnection(span, getDelegate());
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ public static AgentScope onEnter(
if (activeSpan() == null) {
return null;
}
final AgentSpan span = startSpan("view.render").setTag(Tags.COMPONENT, "dropwizard-view");
final AgentSpan span =
startSpan("dropwizard", "view.render").setTag(Tags.COMPONENT, "dropwizard-view");
span.setResourceName("View " + view.getTemplateName());
return activateSpan(span);
}
Expand Down
2 changes: 1 addition & 1 deletion ...datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static AgentScope onEnter(
@Advice.Argument(1) final String endpoint,
@Advice.Argument(value = 5, readOnly = false) ResponseListener responseListener) {

final AgentSpan span = startSpan(OPERATION_NAME);
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
DECORATE.afterStart(span);
DECORATE.onRequest(span, method, endpoint, null, null);

Expand Down
2 changes: 1 addition & 1 deletion ...tadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static AgentScope onEnter(
@Advice.Argument(0) final Request request,
@Advice.Argument(value = 1, readOnly = false) ResponseListener responseListener) {

final AgentSpan span = startSpan(OPERATION_NAME);
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
DECORATE.afterStart(span);
DECORATE.onRequest(
span,
Expand Down
2 changes: 1 addition & 1 deletion ...datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static AgentScope onEnter(
@Advice.Argument(value = 1, readOnly = false, optional = true)
ResponseListener responseListener) {

final AgentSpan span = startSpan(OPERATION_NAME);
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
DECORATE.afterStart(span);
DECORATE.onRequest(
span,
Expand Down
2 changes: 1 addition & 1 deletion ...og/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static AgentScope onEnter(
@Advice.Argument(value = 2, readOnly = false)
ActionListener<ActionResponse> actionListener) {

final AgentSpan span = startSpan(OPERATION_NAME);
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
DECORATE.afterStart(span);
DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());

Expand Down
2 changes: 1 addition & 1 deletion ...trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static AgentScope onEnter(
@Advice.Argument(value = 2, readOnly = false)
ActionListener<ActionResponse> actionListener) {

final AgentSpan span = startSpan(OPERATION_NAME);
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
DECORATE.afterStart(span);
DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());

Expand Down
Loading