From fabaa0b97fabe736ce5d0ff642dc1568e0f30b4a Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 22 Apr 2026 15:27:43 +0200 Subject: [PATCH 1/8] Remove deprecated startSpan and use integration name for telemetry --- .../httpurlconnection/HttpUrlState.java | 2 +- .../datadog/trace/agent/tooling/AgentCLI.java | 2 +- .../aerospike4/AerospikeClientDecorator.java | 2 +- .../ApacheHttpAsyncClientInstrumentation.java | 2 +- .../apachehttpclient/HelperMethods.java | 2 +- .../ApacheHttpAsyncClientInstrumentation.java | 2 +- .../apachehttpclient5/HelperMethods.java | 2 +- .../client/ClientCallImplInstrumentation.java | 3 +- .../lambda/LambdaHandlerInstrumentation.java | 4 +-- .../aws/v1/sns/SnsInterceptor.java | 2 +- .../aws/v1/sqs/TracingIterator.java | 3 +- .../aws/v2/sqs/TracingIterator.java | 3 +- .../axis2/AxisEngineInstrumentation.java | 4 +-- .../axis2/AxisTransportInstrumentation.java | 2 +- .../instrumentation/axway/StateAdvice.java | 2 +- .../cics/ECIInteractionInstrumentation.java | 2 +- .../JavaGatewayInterfaceInstrumentation.java | 2 +- .../CommonsHttpClientInstrumentation.java | 2 +- .../ExecutionContextInstrumentation.java | 8 ++--- .../datanucleus/JDOQueryInstrumentation.java | 4 +-- .../JDOTransactionInstrumentation.java | 2 +- .../datastax/cassandra/TracingSession.java | 2 +- .../datastax/cassandra4/TracingSession.java | 4 +-- .../view/DropwizardViewInstrumentation.java | 3 +- ...asticsearch5RestClientInstrumentation.java | 2 +- ...asticsearch6RestClientInstrumentation.java | 2 +- ...asticsearch7RestClientInstrumentation.java | 2 +- ...search2TransportClientInstrumentation.java | 2 +- ...search5TransportClientInstrumentation.java | 2 +- ...earch53TransportClientInstrumentation.java | 2 +- ...search6TransportClientInstrumentation.java | 2 +- ...earch73TransportClientInstrumentation.java | 2 +- .../finatra/FinatraInstrumentation.java | 2 +- .../GoogleHttpClientInstrumentation.java | 6 ++-- .../googlepubsub/PubSubDecorator.java | 2 +- .../PublisherInstrumentation.java | 2 +- .../graphqljava14/GraphQLInstrumentation.java | 7 ++-- .../graphqljava20/GraphQLInstrumentation.java | 7 ++-- .../graphqljava/InstrumentedDataFetcher.java | 2 +- .../AsyncHttpClientInstrumentation.java | 2 +- .../grpc/client/GrpcClientDecorator.java | 2 +- .../MessagesAvailableInstrumentation.java | 3 +- .../grpc/server/TracingServerInterceptor.java | 4 +-- .../DistributedObjectInstrumentation.java | 4 +-- .../ClientInvocationInstrumentation.java | 2 +- .../ClientListenerInstrumentation.java | 2 +- .../hazelcast4/InvocationAdvice.java | 2 +- .../hibernate/SessionMethodUtils.java | 3 +- .../v3_3/SessionFactoryInstrumentation.java | 2 +- .../v4_0/SessionFactoryInstrumentation.java | 2 +- .../IgniteCacheAsyncInstrumentation.java | 4 +-- .../cache/IgniteCacheSyncInstrumentation.java | 6 ++-- .../java/net/UrlInstrumentation.java | 2 +- .../rmi/client/RmiClientInstrumentation.java | 2 +- .../rmi/server/RmiServerInstrumentation.java | 4 +-- ...tractPreparedStatementInstrumentation.java | 8 ++--- .../jdbc/DataSourceInstrumentation.java | 2 +- ...cp2LinkedBlockingDequeInstrumentation.java | 2 +- .../HikariConcurrentBagInstrumentation.java | 2 +- .../jdbc/StatementInstrumentation.java | 6 ++-- .../jedis/JedisInstrumentation.java | 2 +- .../jedis30/JedisInstrumentation.java | 2 +- .../jedis40/JedisInstrumentation.java | 2 +- .../jms/DatadogMessageListener.java | 7 ++-- .../JMSMessageConsumerInstrumentation.java | 6 ++-- .../JMSMessageProducerInstrumentation.java | 4 +-- .../MDBMessageConsumerInstrumentation.java | 2 +- .../jsp/JSPInstrumentation.java | 3 +- ...rJSPCompilationContextInstrumentation.java | 2 +- .../KafkaConsumerInfoInstrumentation.java | 2 +- .../KafkaProducerInstrumentation.java | 4 +-- .../kafka_clients/TracingIterator.java | 9 ++--- .../kafka_clients38/ProducerAdvice.java | 4 +-- .../kafka_clients38/RecordsAdvice.java | 2 +- .../kafka_clients38/TracingIterator.java | 7 ++-- .../KafkaStreamTaskInstrumentation.java | 14 ++++---- .../lettuce4/InstrumentationPoints.java | 4 +-- .../lettuce5/ConnectionFutureAdvice.java | 2 +- .../lettuce5/LettuceAsyncCommandsAdvice.java | 2 +- .../rx/RedisSubscriptionSubscribeAdvice.java | 2 +- .../micronaut/v4_0/ChannelAcceptAdvice.java | 2 +- .../micronaut/v4_0/ChannelAcceptAdvice2.java | 2 +- .../micronaut/ChannelRead0Advice.java | 2 +- .../mongo/MongoCommandListener.java | 2 +- ...aultServerConnection36Instrumentation.java | 2 +- ...aultServerConnection38Instrumentation.java | 2 +- .../instrumentation/mule4/MuleDecorator.java | 4 +-- .../ChannelFutureListenerInstrumentation.java | 2 +- .../ChannelFutureListenerInstrumentation.java | 2 +- .../ChannelFutureListenerInstrumentation.java | 2 +- .../ognl/OgnlInstrumentation.java | 2 +- .../OpensearchRestClientInstrumentation.java | 2 +- ...nsearchTransportClientInstrumentation.java | 2 +- .../QuartzSchedulingInstrumentation.java | 2 +- .../amqp/RabbitChannelInstrumentation.java | 4 +-- .../rabbitmq/amqp/RabbitDecorator.java | 4 ++- .../ratpack/TracingHandler.java | 2 +- .../rediscala/RediscalaInstrumentation.java | 2 +- .../redisson/RedissonInstrumentation.java | 4 +-- .../redisson23/RedissonInstrumentation.java | 4 +-- .../redisson30/RedissonInstrumentation.java | 4 +-- .../RenaissanceInstrumentation.java | 3 +- .../restlet/ResourceInstrumentation.java | 2 +- .../DefaultRequestContextInstrumentation.java | 2 +- .../JakartaRsAnnotationsInstrumentation.java | 2 +- .../jakarta3/RequestFilterHelper.java | 2 +- .../JaxRsAnnotationsInstrumentation.java | 2 +- .../DefaultRequestContextInstrumentation.java | 2 +- .../JaxRsAnnotationsInstrumentation.java | 2 +- .../jaxrs2/RequestFilterHelper.java | 2 +- .../v1/JaxRsClientV1Instrumentation.java | 2 +- .../rxjava/TracedOnSubscribe.java | 3 +- .../servlet3/AsyncContextInstrumentation.java | 2 +- .../servlet/filter/FilterInstrumentation.java | 2 +- .../http/HttpServletInstrumentation.java | 3 +- .../HttpServletResponseInstrumentation.java | 2 +- .../springdata/RepositoryInterceptor.java | 2 +- .../SpringMessageHandlerInstrumentation.java | 2 +- ...ssageListenerContainerInstrumentation.java | 2 +- .../SpannedMethodInvocation.java | 2 +- .../SpringSchedulingRunnableWrapper.java | 4 ++- .../client/WebClientTracingFilter.java | 2 +- .../server/DispatcherHandlerAdvice.java | 2 +- .../DispatcherServletInstrumentation.java | 2 +- .../HandlerAdapterInstrumentation.java | 2 +- .../springweb6/ControllerAdvice.java | 2 +- .../springweb6/RenderAdvice.java | 2 +- .../MemcachedClientInstrumentation.java | 8 ++--- .../SynapseClientInstrumentation.java | 4 +-- .../tibcobw5/JobInstrumentation.java | 2 +- .../tibcobw5/JobPoolInstrumentation.java | 2 +- .../tibcobw5/TaskInstrumentation.java | 4 ++- .../tibcobw6/BehaviorInstrumentation.java | 2 ++ .../tibcobw6/ProcessInstrumentation.java | 2 +- .../twilio/TwilioAsyncInstrumentation.java | 2 +- .../twilio/TwilioSyncInstrumentation.java | 2 +- .../VertxRedisClientDecorator.java | 2 +- .../VertxSqlClientDecorator.java | 2 +- .../vertx_3_4/server/RouteHandlerWrapper.java | 2 +- .../vertx_4_0/server/RouteHandlerWrapper.java | 2 +- .../jakartaws/WebServiceInstrumentation.java | 2 +- .../jaxws1/WebServiceInstrumentation.java | 2 +- .../WebServiceProviderInstrumentation.java | 2 +- .../instrumentation/api/AgentTracer.java | 34 ++----------------- 144 files changed, 221 insertions(+), 224 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java index dbe07e55cbc..0a84ab47a09 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java @@ -16,7 +16,7 @@ public class HttpUrlState { private volatile boolean finished = false; public AgentSpan start(final HttpURLConnection connection) { - span = startSpan(DECORATE.operationName()); + span = startSpan("httpurlconnection", DECORATE.operationName()); try (final AgentScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, connection); diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java index e18aca9da42..861fd92542f 100644 --- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java +++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java @@ -65,7 +65,7 @@ public static void sendSampleTraces(final int count, final double interval) thro int numTraces = 0; while (++numTraces <= count || count < 0) { - AgentSpan span = AgentTracer.startSpan("sample"); + AgentSpan span = AgentTracer.startSpan("datadog", "sample"); try { Thread.sleep(Math.max((long) (1000.0 * interval), 1L)); } catch (InterruptedException ignore) { diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java index 69d160de7c3..c2fc9f1c6f0 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java +++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java @@ -94,7 +94,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; diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java index 316cf60f6f5..62478108fcf 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java @@ -102,7 +102,7 @@ public static AgentSpan methodEnter( } final AgentScope.Continuation parentContinuation = captureActiveSpan(); - final AgentSpan clientSpan = startSpan(HTTP_REQUEST); + final AgentSpan clientSpan = startSpan("httpasyncclient", HTTP_REQUEST); DECORATE.afterStart(clientSpan); ((DelegatingRequestProducer) requestProducer).setSpan(clientSpan); futureCallback = diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java index 758edb5f754..cc466ab4ebb 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java @@ -35,7 +35,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("httpclient", HTTP_REQUEST); final AgentScope scope = activateSpan(span); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java index 3bc8441f2f5..0762004a8b1 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java @@ -113,7 +113,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("httpasyncclient5", HTTP_REQUEST); final AgentScope clientScope = activateSpan(clientSpan); DECORATE.afterStart(clientSpan); diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java index e30233b65da..0c2ee8d15fe 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java @@ -35,7 +35,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("httpclient5", HTTP_REQUEST); final AgentScope scope = activateSpan(span); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java index 5809e6c005c..0b6b5dd4293 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java @@ -211,7 +211,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-client", GRPC_MESSAGE) + .setTag("message.type", clientSpan.getTag("response.type")); DECORATE.afterStart(messageSpan); return activateSpan(messageSpan); } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java index 208a1e5675a..b2997db39af 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java @@ -93,9 +93,9 @@ static AgentScope enter( AgentSpanContext lambdaContext = AgentTracer.get().notifyLambdaStart(in, lambdaRequestId); final AgentSpan span; if (null == lambdaContext) { - span = startSpan(INVOCATION_SPAN_NAME); + span = startSpan("aws-sdk", INVOCATION_SPAN_NAME); } else { - span = startSpan(INVOCATION_SPAN_NAME, lambdaContext); + span = startSpan("aws-sdk", INVOCATION_SPAN_NAME, lambdaContext); } span.setSpanType(InternalSpanTypes.SERVERLESS); span.setTag("request_id", lambdaRequestId); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java index 4a09ad3292c..64a2f8889ae 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java @@ -109,7 +109,7 @@ public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request } private AgentSpan newSpan(AmazonWebServiceRequest request) { - final AgentSpan span = AgentTracer.startSpan("aws.sns.send"); + final AgentSpan span = AgentTracer.startSpan("aws-sdk", "aws.sns.send"); // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched & // activated // TODO If DSM is enabled, add DSM context here too diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java index 2fa550edfa8..aee7bbac434 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java @@ -89,6 +89,7 @@ protected void startNewMessageSpan(Message message) { if (timeInQueueStart > 0) { queueSpan = startSpan( + "aws-sdk", SQS_TIME_IN_QUEUE_OPERATION, spanContext, MILLISECONDS.toMicros(timeInQueueStart)); @@ -102,7 +103,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("aws-sdk", SQS_INBOUND_OPERATION, batchContext); DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl)); AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0)); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java index e54ff9c250f..0ac3ddf1bac 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java @@ -91,6 +91,7 @@ protected void startNewMessageSpan(Message message) { if (timeInQueueStart > 0) { queueSpan = startSpan( + "aws-sdk", SQS_TIME_IN_QUEUE_OPERATION, spanContext, MILLISECONDS.toMicros(timeInQueueStart)); @@ -104,7 +105,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("aws-sdk", SQS_INBOUND_OPERATION, batchContext); DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl)); AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0)); diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java index 64ab5e5391d..a522d76deab 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java +++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java @@ -53,7 +53,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("axis2", AXIS2_MESSAGE); DECORATE.afterStart(span); DECORATE.onMessage(span, message); return activateSpan(span); @@ -88,7 +88,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("axis2", AXIS2_MESSAGE); DECORATE.afterStart(span); DECORATE.onMessage(span, message); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java index 549bce0ba4d..091a34b6a0c 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java +++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java @@ -54,7 +54,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("axis2", AXIS2_TRANSPORT); DECORATE.afterStart(span); DECORATE.onTransport(span, message); DECORATE.onMessage(span, message); diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java index 9c63a5d31d9..a3fc8512758 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java +++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java @@ -20,7 +20,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-http", AXWAY_TRY_TRANSACTION); final AgentScope scope = activateSpan(span); span.setMeasured(true); DECORATE.onTransaction(span, stateInstance); diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java index c554878ba52..4161b084e2b 100644 --- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java +++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java @@ -36,7 +36,7 @@ public static AgentScope enter(@Advice.Argument(0) final Object spec) { return null; } - AgentSpan span = startSpan(ECI_EXECUTE_OPERATION); + AgentSpan span = startSpan("cics", ECI_EXECUTE_OPERATION); DECORATE.afterStart(span); DECORATE.onECIInteraction(span, (ECIInteractionSpec) spec); diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java index 3f80a5741de..555913436ee 100644 --- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java +++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java @@ -53,7 +53,7 @@ public static AgentScope enter( } // Not inside execute() - create a new span - final AgentSpan span = startSpan(GATEWAY_FLOW_OPERATION); + final AgentSpan span = startSpan("cics", GATEWAY_FLOW_OPERATION); DECORATE.afterStart(span); DECORATE.onConnection(span, strAddress, port, ipGateway); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java index db4b5d4d37f..a63ee7c9a82 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java @@ -65,7 +65,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); diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java index 9ddb3d00b32..4f848d5fea4 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java @@ -78,7 +78,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); @@ -111,7 +111,7 @@ public static AgentScope startMethod( return null; } - final AgentSpan span = startSpan(operationName); + final AgentSpan span = startSpan("datanucleus", operationName); DECORATE.afterStart(span); return activateSpan(span); @@ -141,7 +141,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); @@ -172,7 +172,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); diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java index 9f63dd6060a..7296879c5a8 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java @@ -56,8 +56,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("datanucleus", DATANUCLEUS_QUERY_DELETE); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java index 542b43a2c6b..793138c8763 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java @@ -30,7 +30,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); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java index fa2a7a1e3fe..920fdec1dae 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java @@ -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); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java index 36b577fae42..b24c1fb680c 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java @@ -54,7 +54,7 @@ public 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()); @@ -78,7 +78,7 @@ private ResultSet wrapSyncRequest(Statement request) { } private CompletionStage wrapAsyncRequest(Statement request) { - AgentSpan span = startSpan(OPERATION_NAME); + AgentSpan span = startSpan("cassandra", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, getDelegate()); diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java index e185ba86d60..3e88551ebc2 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java @@ -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", "view.render").setTag(Tags.COMPONENT, "dropwizard-view"); span.context().setIntegrationName("dropwizard-view"); span.setResourceName("View " + view.getTemplateName()); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java index cba605edf38..be0132f73a4 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java @@ -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); diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java index 164280f4d67..93ecfa54f36 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java @@ -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, diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java index d4c45939916..84a8290fbc9 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java @@ -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, diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java index 80d266df517..7bb2a8f89d5 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java @@ -63,7 +63,7 @@ public static AgentScope onEnter( @Advice.Argument(value = 2, readOnly = false) ActionListener actionListener) { - final AgentSpan span = startSpan(OPERATION_NAME); + final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onRequest(span, action.getClass(), actionRequest.getClass()); diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java index 266909d9a74..a491d77c89e 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java @@ -63,7 +63,7 @@ public static AgentScope onEnter( @Advice.Argument(value = 2, readOnly = false) ActionListener actionListener) { - final AgentSpan span = startSpan(OPERATION_NAME); + final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onRequest(span, action.getClass(), actionRequest.getClass()); diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java index 059c25482e2..fa840e0a1d3 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java @@ -64,7 +64,7 @@ public static AgentScope onEnter( @Advice.Argument(value = 2, readOnly = false) ActionListener actionListener) { - final AgentSpan span = startSpan(OPERATION_NAME); + final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onRequest(span, action.getClass(), actionRequest.getClass()); diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java index 56edd98b28d..37f7dfc06ae 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java @@ -67,7 +67,7 @@ public static AgentScope onEnter( @Advice.Argument(value = 2, readOnly = false) ActionListener actionListener) { - final AgentSpan span = startSpan(OPERATION_NAME); + final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onRequest(span, action.getClass(), actionRequest.getClass()); diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java index b73ba38195c..2d0a5f4b918 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java @@ -74,7 +74,7 @@ public static AgentScope onEnter( @Advice.Argument(value = 2, readOnly = false) ActionListener actionListener) { - final AgentSpan span = startSpan(OPERATION_NAME); + final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onRequest(span, action.getClass(), actionRequest.getClass()); diff --git a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java index e93d0858dc6..de2a5ab12cf 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java +++ b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java @@ -75,7 +75,7 @@ public static ContextScope nameSpan( parent.setSpanName(DECORATE.spanName()); } - final AgentSpan span = startSpan(FINATRA_CONTROLLER); + final AgentSpan span = startSpan("finatra", FINATRA_CONTROLLER); DECORATE.afterStart(span); span.setResourceName(DECORATE.className(clazz)); diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java index 93edb10af51..52ceab06153 100644 --- a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java @@ -80,7 +80,8 @@ public static AgentScope methodEnter( return null; } } - return activateSpan(DECORATE.prepareSpan(startSpan(HTTP_REQUEST), request)); + return activateSpan( + DECORATE.prepareSpan(startSpan("google-http-client", HTTP_REQUEST), request)); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -108,7 +109,8 @@ public static class GoogleHttpClientAsyncAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter(@Advice.This HttpRequest request) { - return activateSpan(DECORATE.prepareSpan(startSpan(HTTP_REQUEST), request)); + return activateSpan( + DECORATE.prepareSpan(startSpan("google-http-client", HTTP_REQUEST), request)); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java index 05c0a559e41..943a378ec36 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java @@ -124,7 +124,7 @@ protected String spanKind() { public AgentSpan onConsume(final PubsubMessage message, final String subscription) { final AgentSpanContext spanContext = extractContextAndGetSpanContext(message, TextMapExtractAdapter.GETTER); - final AgentSpan span = startSpan(PUBSUB_CONSUME, spanContext); + final AgentSpan span = startSpan("google-pubsub", PUBSUB_CONSUME, spanContext); final CharSequence parsedSubscription = extractSubscription(subscription); DataStreamsTags tags = createWithSubscription("google-pubsub", INBOUND, parsedSubscription.toString()); diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java index a44fd1567ea..d30fc2ffc11 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java @@ -42,7 +42,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class Wrap { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope before(@Advice.This Publisher publisher) { - final AgentSpan span = startSpan(PUBSUB_PRODUCE); + final AgentSpan span = startSpan("google-pubsub", PUBSUB_PRODUCE); final CharSequence topicName = PRODUCER_DECORATE.extractTopic(publisher.getTopicNameString()); PRODUCER_DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java index 2a7edb2f6c7..215cd332ce5 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java @@ -61,7 +61,7 @@ public State createState() { @Override public InstrumentationContext beginExecution( InstrumentationExecutionParameters parameters) { - final AgentSpan requestSpan = startSpan(GRAPHQL_REQUEST); + final AgentSpan requestSpan = startSpan("graphql", GRAPHQL_REQUEST); DECORATE.afterStart(requestSpan); State state = parameters.getInstrumentationState(); @@ -100,7 +100,8 @@ public DataFetcher instrumentDataFetcher( public InstrumentationContext beginParse( InstrumentationExecutionParameters parameters) { State state = parameters.getInstrumentationState(); - final AgentSpan parsingSpan = startSpan(GRAPHQL_PARSING, state.getRequestSpan().context()); + final AgentSpan parsingSpan = + startSpan("graphql", GRAPHQL_PARSING, state.getRequestSpan().context()); DECORATE.afterStart(parsingSpan); return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery()); } @@ -111,7 +112,7 @@ public InstrumentationContext> beginValidation( State state = parameters.getInstrumentationState(); final AgentSpan validationSpan = - startSpan(GRAPHQL_VALIDATION, state.getRequestSpan().context()); + startSpan("graphql", GRAPHQL_VALIDATION, state.getRequestSpan().context()); DECORATE.afterStart(validationSpan); return new ValidationInstrumentationContext(validationSpan); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java index ee18b02750c..819706c4f83 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java @@ -65,7 +65,7 @@ public InstrumentationContext beginExecution( return super.beginExecution(parameters, instrumentationState); } final State state = (State) instrumentationState; - final AgentSpan requestSpan = startSpan(GraphQLDecorator.GRAPHQL_REQUEST); + final AgentSpan requestSpan = startSpan("graphql", GraphQLDecorator.GRAPHQL_REQUEST); GraphQLDecorator.DECORATE.afterStart(requestSpan); state.setRequestSpan(requestSpan); @@ -116,7 +116,8 @@ public InstrumentationContext beginParse( } final State state = (State) instrumentationState; final AgentSpan parsingSpan = - AgentTracer.startSpan(GraphQLDecorator.GRAPHQL_PARSING, state.getRequestSpan().context()); + AgentTracer.startSpan( + "graphql", GraphQLDecorator.GRAPHQL_PARSING, state.getRequestSpan().context()); GraphQLDecorator.DECORATE.afterStart(parsingSpan); return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery()); } @@ -131,7 +132,7 @@ public InstrumentationContext> beginValidation( final AgentSpan validationSpan = AgentTracer.startSpan( - GraphQLDecorator.GRAPHQL_VALIDATION, state.getRequestSpan().context()); + "graphql", GraphQLDecorator.GRAPHQL_VALIDATION, state.getRequestSpan().context()); GraphQLDecorator.DECORATE.afterStart(validationSpan); return new ValidationInstrumentationContext(validationSpan); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java index 1c4ee127a72..a25a9f2accb 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java @@ -34,7 +34,7 @@ public Object get(DataFetchingEnvironment environment) throws Exception { return dataFetcher.get(environment); } } else { - final AgentSpan fieldSpan = startSpan("graphql.field", this.requestSpan.context()); + final AgentSpan fieldSpan = startSpan("graphql", "graphql.field", this.requestSpan.context()); DECORATE.afterStart(fieldSpan); String parentType = GraphQLTypeUtil.simplePrint(environment.getParentType()); String fieldName = environment.getField().getName(); diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java index a8b87193d1c..c4b6e6fa57b 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java @@ -46,7 +46,7 @@ public static AgentScope onEnter( @Advice.Argument(0) final Request request, @Advice.Argument(value = 1, readOnly = false) AsyncHandler handler) { AgentSpan parentSpan = activeSpan(); - AgentSpan span = startSpan(HTTP_REQUEST); + AgentSpan span = startSpan("grizzly-client", HTTP_REQUEST); DECORATE.afterStart(span); DECORATE.onRequest(span, request); handler = new AsyncHandlerAdapter<>(span, parentSpan, handler); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java index db89549e881..ce2c1e3ef25 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java @@ -98,7 +98,7 @@ public AgentSpan startCall(MethodDescriptor method) { return AgentTracer.blackholeSpan(); } AgentSpan span = - startSpan(OPERATION_NAME) + startSpan("grpc", OPERATION_NAME) .setTag("request.type", requestMessageType(method)) .setTag("response.type", responseMessageType(method)) // method.getServiceName() may not be available on some grpc versions diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java index 07ed6545512..40a386958d6 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java @@ -55,7 +55,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("grpc", GRPC_MESSAGE) + .setTag("message.type", clientSpan.getTag("response.type")); DECORATE.afterStart(messageSpan); return activateSpan(messageSpan); } diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java index 5be9e13a5a3..c954982b404 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java @@ -67,7 +67,7 @@ public ServerCall.Listener interceptCall( spanContext = callIGCallbackRequestStarted(tracer, spanContext); CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC); - final AgentSpan span = startSpan(GRPC_SERVER, spanContext).setMeasured(true); + final AgentSpan span = startSpan("grpc", GRPC_SERVER, spanContext).setMeasured(true); AgentTracer.get() .getDataStreamsMonitoring() @@ -143,7 +143,7 @@ static final class TracingServerCallListener @Override public void onMessage(final ReqT message) { final AgentSpan msgSpan = - startSpan(GRPC_MESSAGE, this.span.context()) + startSpan("grpc", GRPC_MESSAGE, this.span.context()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); try (AgentScope scope = activateSpan(msgSpan)) { diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java index bbc4ef477b3..f40d80f12a7 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java @@ -197,7 +197,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan(SPAN_NAME); + final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, that, methodName); @@ -256,7 +256,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan(SPAN_NAME); + final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, that, methodName); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java index 79275d37b1c..1f5978b32cc 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java @@ -68,7 +68,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan(SPAN_NAME); + final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); DECORATE.onHazelcastInstance( span, InstrumentationContext.get(ClientInvocation.class, String.class).get(that)); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java index 95f4b93c925..0615f9967b4 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java @@ -59,7 +59,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan(SPAN_NAME); + final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, operationName, null, correlationId); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java index 77a5ed3dcc6..30e2abfb890 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java @@ -36,7 +36,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan(HazelcastConstants.SPAN_NAME); + final AgentSpan span = startSpan("hazelcast-sdk", HazelcastConstants.SPAN_NAME); span.setTag( HazelcastConstants.HAZELCAST_INSTANCE, diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java index 5931a673415..4397678f693 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java @@ -41,7 +41,8 @@ public static SessionState startScopeFrom( final AgentScope scope; if (createSpan) { - final AgentSpan span = startSpan(operationName, sessionState.getSessionSpan().context()); + final AgentSpan span = + startSpan("hibernate-core", operationName, sessionState.getSessionSpan().context()); DECORATOR.afterStart(span); DECORATOR.onOperation(span, entity); scope = activateSpan(span); diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java index 6f8b9a5fec1..9b0867a516f 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java @@ -57,7 +57,7 @@ public static class SessionFactoryAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void openSession(@Advice.Return final Object session) { - final AgentSpan span = startSpan(HIBERNATE_SESSION); + final AgentSpan span = startSpan("hibernate-core", HIBERNATE_SESSION); DECORATOR.afterStart(span); DECORATOR.onConnection(span, session); diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java index ab95c1ac01e..1e17b921400 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java @@ -51,7 +51,7 @@ public static class SessionFactoryAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void openSession(@Advice.Return final SharedSessionContract session) { - final AgentSpan span = startSpan(HIBERNATE_SESSION); + final AgentSpan span = startSpan("hibernate-core", HIBERNATE_SESSION); DECORATOR.afterStart(span); DECORATOR.onConnection(span, session); diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java index 5f35e1b5129..e8b58c73ec7 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java @@ -68,7 +68,7 @@ public static AgentScope onEnter( return null; } - final AgentSpan span = startSpan(IgniteCacheDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("ignite", IgniteCacheDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onIgnite( span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that)); @@ -124,7 +124,7 @@ public static AgentScope onEnter( return null; } - final AgentSpan span = startSpan(IgniteCacheDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("ignite", IgniteCacheDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onIgnite( span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that)); diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java index b0b580c24bc..2e557fcb51d 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java @@ -81,7 +81,7 @@ public static AgentScope onEnter( return null; } - final AgentSpan span = startSpan(IgniteCacheDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("ignite", IgniteCacheDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onIgnite( span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that)); @@ -122,7 +122,7 @@ public static AgentScope onEnter( return null; } - final AgentSpan span = startSpan(IgniteCacheDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("ignite", IgniteCacheDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onIgnite( span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that)); @@ -162,7 +162,7 @@ public static AgentScope onEnter( return null; } - final AgentSpan span = startSpan(IgniteCacheDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("ignite", IgniteCacheDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onIgnite( span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that)); diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java index f44243b9c97..ce117a93b79 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java @@ -53,7 +53,7 @@ public static void errorSpan( String protocol = url.getProtocol(); protocol = protocol != null ? protocol : "url"; - final AgentSpan span = startSpan(DECORATE.operationName(protocol)); + final AgentSpan span = startSpan("urlconnection", DECORATE.operationName(protocol)); try (final AgentScope scope = activateSpan(span)) { DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java index 299f9189089..d4cdf7f7d16 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java @@ -56,7 +56,7 @@ public static AgentScope onEnter(@Advice.Argument(value = 1) final Method method if (activeSpan() == null) { return null; } - final AgentSpan span = startSpan(RMI_INVOKE); + final AgentSpan span = startSpan("rmi", RMI_INVOKE); DECORATE.afterStart(span); DECORATE.onMethodInvocation(span, method); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java index dab340c3833..f4918369369 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java @@ -57,9 +57,9 @@ public static AgentScope onEnter( final AgentSpan span; if (context == null) { - span = startSpan(RMI_REQUEST); + span = startSpan("rmi", RMI_REQUEST); } else { - span = startSpan(RMI_REQUEST, context); + span = startSpan("rmi", RMI_REQUEST, context); } span.setResourceName(DECORATE.spanNameForMethod(method)); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java index 3108368c29b..623fb485a26 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java @@ -89,16 +89,16 @@ public static AgentScope onEnter(@Advice.This final Statement statement) { span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start(); span.setTag(DBM_TRACE_INJECTED, true); } else if (DECORATE.isPostgres(dbInfo) && DBM_TRACE_PREPARED_STATEMENTS) { - span = startSpan(DATABASE_QUERY); + span = startSpan("jdbc", DATABASE_QUERY); DECORATE.setApplicationName(span, connection); } else if (DECORATE.isOracle(dbInfo)) { - span = startSpan(DATABASE_QUERY); + span = startSpan("jdbc", DATABASE_QUERY); DECORATE.setAction(span, connection); } else { - span = startSpan(DATABASE_QUERY); + span = startSpan("jdbc", DATABASE_QUERY); } } else { - span = startSpan(DATABASE_QUERY); + span = startSpan("jdbc", DATABASE_QUERY); } DECORATE.afterStart(span); DECORATE.onConnection(span, dbInfo); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java index 69f5f92e532..a2c168b6239 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java @@ -64,7 +64,7 @@ public static AgentScope start(@Advice.This final DataSource ds) { return null; } - final AgentSpan span = startSpan(DATABASE_CONNECTION); + final AgentSpan span = startSpan("jdbc-datasource", DATABASE_CONNECTION); DECORATE.afterStart(span); span.setResourceName(DECORATE.spanNameForMethod(ds.getClass(), "getConnection")); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java index 0718f0f4f39..e20c2ce931f 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java @@ -51,7 +51,7 @@ public static class PollFirstAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentSpan onEnter() { if (CallDepthThreadLocalMap.getCallDepth(PoolWaitingDecorator.class) > 0) { - AgentSpan span = startSpan(POOL_WAITING); + AgentSpan span = startSpan("jdbc", POOL_WAITING); DECORATE.afterStart(span); span.setResourceName("dbcp2.waiting"); return span; diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java index 0195ad0222d..77f2df719b7 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java @@ -88,7 +88,7 @@ public static void stopSpan( @Advice.Thrown final Throwable throwable) { if (HikariBlockedTracker.wasBlocked()) { final AgentSpan span = - startSpan(POOL_WAITING, TimeUnit.MILLISECONDS.toMicros(startTimeMillis)); + startSpan("jdbc", POOL_WAITING, TimeUnit.MILLISECONDS.toMicros(startTimeMillis)); DECORATE.afterStart(span); DECORATE.onError(span, throwable); span.setResourceName("hikari.waiting"); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index a4533be500a..a406f517c57 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -100,13 +100,13 @@ public static AgentScope onEnter( // we then force that pre-determined span ID for the span covering the actual query span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start(); } else if (isOracle) { - span = startSpan(DATABASE_QUERY); + span = startSpan("jdbc", DATABASE_QUERY); DECORATE.setAction(span, connection); } else { - span = startSpan(DATABASE_QUERY); + span = startSpan("jdbc", DATABASE_QUERY); } } else { - span = startSpan(DATABASE_QUERY); + span = startSpan("jdbc", DATABASE_QUERY); } DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index c82e3a9c60c..ee2123a0a7c 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -64,7 +64,7 @@ public static AgentScope onEnter( if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) { return null; } - final AgentSpan span = startSpan(JedisClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("jedis", JedisClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, thiz); DECORATE.onStatement(span, command.name()); diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java index d9ff072c6a2..4ceddad42fb 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java @@ -56,7 +56,7 @@ public static AgentScope onEnter( if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) { return null; } - final AgentSpan span = startSpan(JedisClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("jedis", JedisClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, thiz); diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java index a40bc392c00..69da40a5948 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java @@ -56,7 +56,7 @@ public static class JedisAdvice { public static AgentScope onEnter( @Advice.Argument(0) final CommandObject commandObject, @Advice.This final Connection thiz) { - final AgentSpan span = startSpan(JedisClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("jedis", JedisClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, thiz); diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java index b58034f3d88..954dec71ad0 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java @@ -44,12 +44,13 @@ public void onMessage(Message message) { } long startMillis = GETTER.extractTimeInQueueStart(message); if (startMillis == 0 || !TIME_IN_QUEUE_ENABLED) { - span = startSpan(JMS_CONSUME, propagatedContext); + span = startSpan("jms", JMS_CONSUME, propagatedContext); } else { long batchId = GETTER.extractMessageBatchId(message); AgentSpan timeInQueue = consumerState.getTimeInQueueSpan(batchId); if (null == timeInQueue) { - timeInQueue = startSpan(JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis)); + timeInQueue = + startSpan("jms", JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis)); BROKER_DECORATE.afterStart(timeInQueue); BROKER_DECORATE.onTimeInQueue( timeInQueue, @@ -57,7 +58,7 @@ public void onMessage(Message message) { consumerState.getBrokerServiceName()); consumerState.setTimeInQueueSpan(batchId, timeInQueue); } - span = startSpan(JMS_CONSUME, timeInQueue.context()); + span = startSpan("jms", JMS_CONSUME, timeInQueue.context()); } CONSUMER_DECORATE.afterStart(span); CONSUMER_DECORATE.onConsume(span, message, consumerState.getConsumerResourceName()); diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java index c800897b9f0..75a59e7406d 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java @@ -142,13 +142,13 @@ public static void afterReceive( } long startMillis = GETTER.extractTimeInQueueStart(message); if (startMillis == 0 || !TIME_IN_QUEUE_ENABLED) { - span = startSpan(JMS_CONSUME, propagatedContext); + span = startSpan("jms", JMS_CONSUME, propagatedContext); } else { long batchId = GETTER.extractMessageBatchId(message); AgentSpan timeInQueue = consumerState.getTimeInQueueSpan(batchId); if (null == timeInQueue) { timeInQueue = - startSpan(JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis)); + startSpan("jms", JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis)); BROKER_DECORATE.afterStart(timeInQueue); BROKER_DECORATE.onTimeInQueue( timeInQueue, @@ -156,7 +156,7 @@ public static void afterReceive( consumerState.getBrokerServiceName()); consumerState.setTimeInQueueSpan(batchId, timeInQueue); } - span = startSpan(JMS_CONSUME, timeInQueue.context()); + span = startSpan("jms", JMS_CONSUME, timeInQueue.context()); } CONSUMER_DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java index fe412a13a8b..972b4382209 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java @@ -103,7 +103,7 @@ public static AgentScope beforeSend( destinationName = ""; } - final AgentSpan span = startSpan(JMS_PRODUCE); + final AgentSpan span = startSpan("jms", JMS_PRODUCE); PRODUCER_DECORATE.afterStart(span); PRODUCER_DECORATE.onProduce(span, resourceName); @@ -173,7 +173,7 @@ public static AgentScope beforeSend( String destinationName = PRODUCER_DECORATE.getDestinationName(destination); CharSequence resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue); - final AgentSpan span = startSpan(JMS_PRODUCE); + final AgentSpan span = startSpan("jms", JMS_PRODUCE); PRODUCER_DECORATE.afterStart(span); PRODUCER_DECORATE.onProduce(span, resourceName); diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java index c8542eaabce..d9b878f9c69 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java @@ -85,7 +85,7 @@ public static AgentScope methodEnter(@Advice.Argument(0) final Message message) if (CallDepthThreadLocalMap.incrementCallDepth(MessageListener.class) > 0) { return null; } - AgentSpan span = startSpan(JMS_CONSUME); + AgentSpan span = startSpan("jms", JMS_CONSUME); CONSUMER_DECORATE.afterStart(span); CharSequence consumerResourceName; try { diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java index f8e59bee44b..e8e70b07fe0 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java @@ -59,7 +59,8 @@ public static class HttpJspPageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter( @Advice.This final Object obj, @Advice.Argument(0) final HttpServletRequest req) { - final AgentSpan span = startSpan(JSP_RENDER).setTag("servlet.context", req.getContextPath()); + final AgentSpan span = + startSpan("jsp", JSP_RENDER).setTag("servlet.context", req.getContextPath()); DECORATE.afterStart(span); DECORATE.onRender(span, req); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java index 47c7309c354..aaf87ddb26f 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java @@ -48,7 +48,7 @@ public static class JasperJspCompilationContext { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter() { - final AgentSpan span = startSpan(JSP_COMPILE); + final AgentSpan span = startSpan("jsp", JSP_COMPILE); DECORATE.afterStart(span); return activateSpan(span); } diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java index 4fc5afd4d06..6e7dcec75d8 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java @@ -251,7 +251,7 @@ public static AgentScope onEnter(@Advice.This KafkaConsumer consumer) { } if (traceConfig().isDataStreamsEnabled()) { - final AgentSpan span = startSpan(KAFKA_POLL); + final AgentSpan span = startSpan("kafka", KAFKA_POLL); return activateSpan(span); } return null; diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 2bf584932eb..e44c70b56f4 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -160,10 +160,10 @@ public static AgentScope onEnter( final AgentSpan callbackParentSpan; if (extractedContext != null) { - span = startSpan(KAFKA_PRODUCE, extractedContext); + span = startSpan("kafka", KAFKA_PRODUCE, extractedContext); callbackParentSpan = span; } else { - span = startSpan(KAFKA_PRODUCE); + span = startSpan("kafka", KAFKA_PRODUCE); callbackParentSpan = localActiveSpan; } PRODUCER_DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java index fca185438fe..c70832d0afa 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java @@ -104,13 +104,14 @@ protected void startNewRecordSpan(ConsumerRecord val) { extractContextAndGetSpanContext(val.headers(), GETTER); long timeInQueueStart = GETTER.extractTimeInQueueStart(val.headers()); if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) { - span = startSpan(operationName, spanContext); + span = startSpan("kafka", operationName, spanContext); } else { queueSpan = - startSpan(KAFKA_DELIVER, spanContext, MILLISECONDS.toMicros(timeInQueueStart)); + startSpan( + "kafka", KAFKA_DELIVER, spanContext, MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, val); - span = startSpan(operationName, queueSpan.context()); + span = startSpan("kafka", operationName, queueSpan.context()); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode @@ -136,7 +137,7 @@ protected void startNewRecordSpan(ConsumerRecord val) { } } } else { - span = startSpan(operationName, null); + span = startSpan("kafka", operationName, null); } if (val.value() == null) { span.setTag(InstrumentationTags.TOMBSTONE, true); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java index bf9930e8c2b..dda6d1ca539 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java @@ -49,10 +49,10 @@ public static AgentScope onEnter( final AgentSpan callbackParentSpan; if (extractedContext != null) { - span = startSpan(KAFKA_PRODUCE, extractedContext); + span = startSpan("kafka", KAFKA_PRODUCE, extractedContext); callbackParentSpan = span; } else { - span = startSpan(KAFKA_PRODUCE); + span = startSpan("kafka", KAFKA_PRODUCE); callbackParentSpan = localActiveSpan; } PRODUCER_DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java index 26589313106..a94620eeb5a 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java @@ -38,7 +38,7 @@ public static AgentScope onEnter(@Advice.This ConsumerDelegate consumer) { } if (traceConfig().isDataStreamsEnabled()) { - final AgentSpan span = startSpan(KAFKA_POLL); + final AgentSpan span = startSpan("kafka", KAFKA_POLL); return activateSpan(span); } return null; diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java index 28bf79c3c13..54bb0c698d6 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java @@ -100,16 +100,17 @@ protected void startNewRecordSpan(ConsumerRecord val) { extractContextAndGetSpanContext(val.headers(), GETTER); long timeInQueueStart = GETTER.extractTimeInQueueStart(val.headers()); if (timeInQueueStart == 0 || !KafkaDecorator.TIME_IN_QUEUE_ENABLED) { - span = startSpan(operationName, spanContext); + span = startSpan("kafka", operationName, spanContext); } else { queueSpan = startSpan( + "kafka", KafkaDecorator.KAFKA_DELIVER, spanContext, MILLISECONDS.toMicros(timeInQueueStart)); KafkaDecorator.BROKER_DECORATE.afterStart(queueSpan); KafkaDecorator.BROKER_DECORATE.onTimeInQueue(queueSpan, val); - span = startSpan(operationName, queueSpan.context()); + span = startSpan("kafka", operationName, queueSpan.context()); KafkaDecorator.BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode @@ -135,7 +136,7 @@ protected void startNewRecordSpan(ConsumerRecord val) { } } } else { - span = startSpan(operationName, null); + span = startSpan("kafka", operationName, null); } if (val.value() == null) { span.setTag(InstrumentationTags.TOMBSTONE, true); diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java index c677bd1f3f0..72788db3e18 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java @@ -280,12 +280,13 @@ public static void start( InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task); long timeInQueueStart = SR_GETTER.extractTimeInQueueStart(record); if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) { - span = startSpan(KAFKA_CONSUME); + span = startSpan("kafka-streams", KAFKA_CONSUME); } else { - queueSpan = startSpan(KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); + queueSpan = + startSpan("kafka-streams", KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, record); - span = startSpan(KAFKA_CONSUME, queueSpan.context()); + span = startSpan("kafka-streams", KAFKA_CONSUME, queueSpan.context()); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode @@ -344,12 +345,13 @@ public static void start( InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task); long timeInQueueStart = PR_GETTER.extractTimeInQueueStart(record); if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) { - span = startSpan(KAFKA_CONSUME); + span = startSpan("kafka-streams", KAFKA_CONSUME); } else { - queueSpan = startSpan(KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); + queueSpan = + startSpan("kafka-streams", KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, record); - span = startSpan(KAFKA_CONSUME, queueSpan.context()); + span = startSpan("kafka-streams", KAFKA_CONSUME, queueSpan.context()); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java index c1b4df423b2..ba6836e3826 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java @@ -34,7 +34,7 @@ public final class InstrumentationPoints { public static AgentScope beforeCommand( final RedisCommand command, final RedisURI redisURI) { - final AgentSpan span = startSpan(LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, redisURI); DECORATE.onCommand(span, command); @@ -73,7 +73,7 @@ public static void afterCommand( } public static AgentScope beforeConnect(final RedisURI redisURI) { - final AgentSpan span = startSpan(LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, redisURI); span.setResourceName(DECORATE.resourceNameForConnection(redisURI)); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java index 7591dd244c6..b2473d9df52 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java @@ -15,7 +15,7 @@ public class ConnectionFutureAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter(@Advice.Argument(1) final RedisURI redisUri) { - final AgentSpan span = startSpan(LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); span.setResourceName(DECORATE.resourceNameForConnection(redisUri)); DECORATE.onConnection(span, redisUri); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java index 2f18d9df582..e5bef852de5 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java @@ -22,7 +22,7 @@ public static AgentScope onEnter( @Advice.Argument(0) final RedisCommand command, @Advice.This final AbstractRedisAsyncCommands thiz) { - final AgentSpan span = startSpan(LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection( span, diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java index db5a64ef5e2..070427beb11 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java @@ -43,7 +43,7 @@ public static State beforeSubscribe( if (parentSpan != null) { parentScope = activateSpan(parentSpan); } - AgentSpan span = startSpan(LettuceClientDecorator.OPERATION_NAME); + AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); InstrumentationContext.get(RedisCommand.class, AgentSpan.class).put(subscriptionCommand, span); DECORATE.afterStart(span); if (state != null && state.connection != null) { diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java index 8783de962a3..1de61a2b401 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java @@ -21,7 +21,7 @@ public static AgentScope beginRequest( if (request == null || nettySpan == null) { return null; } - final AgentSpan span = startSpan(DECORATE.spanName()).setMeasured(true); + final AgentSpan span = startSpan("micronaut", DECORATE.spanName()).setMeasured(true); DECORATE.afterStart(span); request.setAttribute(SPAN_ATTRIBUTE, span); request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan); diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java index 464410125ed..42e6e6b36a6 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java @@ -20,7 +20,7 @@ public static AgentScope beginRequest(@Advice.Argument(0) final NettyHttpRequest if (request == null || nettySpan == null) { return null; } - final AgentSpan span = startSpan(DECORATE.spanName()).setMeasured(true); + final AgentSpan span = startSpan("micronaut", DECORATE.spanName()).setMeasured(true); DECORATE.afterStart(span); request.setAttribute(SPAN_ATTRIBUTE, span); request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan); diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java index 2650f7d7cb4..614c63c8ca1 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java @@ -20,7 +20,7 @@ public static AgentScope beginRequest(@Advice.Argument(1) final HttpRequest r // Micronaut-netty uses Netty so there needs to be a Netty span return null; } - final AgentSpan span = startSpan(DECORATE.spanName()).setMeasured(true); + final AgentSpan span = startSpan("micronaut", DECORATE.spanName()).setMeasured(true); DECORATE.afterStart(span); request.setAttribute(SPAN_ATTRIBUTE, span); request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan); diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java index e5905ec5241..07a81baba11 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java +++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java @@ -129,7 +129,7 @@ public void commandStarted(final CommandStartedEvent event) { AgentSpan span = activeSpan(); boolean shouldForceCloseSpanScope = true; if (span == null || span.getSpanName() != MongoDecorator.OPERATION_NAME) { - span = startSpan(MongoDecorator.OPERATION_NAME); + span = startSpan("mongo", MongoDecorator.OPERATION_NAME); shouldForceCloseSpanScope = false; } diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java index ff8298a4ce4..f88ce917a4e 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java @@ -70,7 +70,7 @@ public static void onEnter( return; } - AgentSpan span = startSpan(MongoDecorator.OPERATION_NAME); + AgentSpan span = startSpan("mongo", MongoDecorator.OPERATION_NAME); // scope is going to be closed by the MongoCommandListener activateSpanWithoutScope(span); diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java index 089f3cb6973..69b2fb0a3cd 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java @@ -70,7 +70,7 @@ public static void onEnter( return; } - AgentSpan span = startSpan(MongoDecorator.OPERATION_NAME); + AgentSpan span = startSpan("mongo", MongoDecorator.OPERATION_NAME); // scope is going to be closed by the MongoCommandListener activateSpanWithoutScope(span); diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java index ecd17b30a15..dd2645d04db 100644 --- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java +++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java @@ -68,9 +68,9 @@ public AgentSpan onMuleSpan( } final AgentSpan span; if (parentSpan == null) { - span = startSpan(OPERATION_NAME); + span = startSpan("mule", OPERATION_NAME); } else { - span = startSpan(OPERATION_NAME, parentSpan.context()); + span = startSpan("mule", OPERATION_NAME, parentSpan.context()); } // here we have to use the forEachAttribute since each specialized InitialSpanInfo class can add // different things through this method. Using the map version is not the same. diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java index 34281d33a46..ba6060fced0 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java @@ -108,7 +108,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f } final AgentScope parentScope = continuation.activate(); - final AgentSpan errorSpan = startSpan(NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); + final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); errorSpan.context().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { DECORATE.onError(errorSpan, cause); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java index 60834870a8c..b0be195bdfb 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java @@ -93,7 +93,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f } final AgentScope parentScope = continuation.activate(); - final AgentSpan errorSpan = startSpan(NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); + final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); errorSpan.context().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index f0d04a533d2..831166a7923 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -93,7 +93,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f } final AgentScope parentScope = continuation.activate(); - final AgentSpan errorSpan = startSpan(NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); + final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); errorSpan.context().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java index fd7134ef842..32978abf35d 100644 --- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java +++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java @@ -41,7 +41,7 @@ static void before(@Advice.Argument(0) String expression) { return; } - AgentSpan agentSpan = startSpan("ognl.parse", parentSpan.context()); + AgentSpan agentSpan = startSpan("ognl", "ognl.parse", parentSpan.context()); agentSpan.setTag("ognl.expression", expression); agentSpan.finish(); } diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java index ea833363ffe..e2d65f258ef 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java @@ -66,7 +66,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("opensearch", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onRequest( span, diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java index 913ac8431e0..b27bd3bf7d4 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java @@ -70,7 +70,7 @@ public static AgentScope onEnter( @Advice.Argument(value = 2, readOnly = false) ActionListener actionListener) { - final AgentSpan span = startSpan(OPERATION_NAME); + final AgentSpan span = startSpan("opensearch", OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onRequest(span, action.getClass(), actionRequest.getClass()); diff --git a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java index 7e8894cff13..c1291f15593 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java @@ -57,7 +57,7 @@ public static class QuartzSchedulingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope enter(@Advice.Argument(0) JobExecutionContext context) { // create a new trace for every job - final AgentSpan span = startSpan(SCHEDULED_CALL, null); + final AgentSpan span = startSpan("quartz", SCHEDULED_CALL, null); DECORATE.afterStart(span); DECORATE.onExecute(span, context); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java index 0cbb50a4175..e86df471b0f 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java @@ -129,7 +129,7 @@ public static AgentScope onEnter( final Connection connection = channel.getConnection(); - final AgentSpan span = startSpan(OPERATION_AMQP_COMMAND); + final AgentSpan span = startSpan("rabbitmq", OPERATION_AMQP_COMMAND); span.setResourceName(method); CLIENT_DECORATE.setPeerPort(span, connection.getPort()); CLIENT_DECORATE.afterStart(span); @@ -166,7 +166,7 @@ public static AgentScope setResourceNameAddHeaders( final Connection connection = channel.getConnection(); - final AgentSpan span = startSpan(OPERATION_AMQP_OUTBOUND); + final AgentSpan span = startSpan("rabbitmq", OPERATION_AMQP_OUTBOUND); PRODUCER_DECORATE.setPeerPort(span, connection.getPort()); PRODUCER_DECORATE.afterStart(span); PRODUCER_DECORATE.onPeerConnection(span, connection.getAddress()); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java index c8aa381ed29..8eb44ca6309 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java @@ -224,6 +224,7 @@ public static AgentScope startReceivingSpan( queueStartMillis = Math.min(spanStartMillis, queueStartMillis); queueSpan = startSpan( + "rabbitmq", OPERATION_AMQP_DELIVER, parentContext, TimeUnit.MILLISECONDS.toMicros(queueStartMillis)); @@ -234,7 +235,8 @@ public static AgentScope startReceivingSpan( // The queueSpan will be finished after the inner span has been activated to ensure that the // spans are written out together by the TraceStructureWriter when running in strict mode } - final AgentSpan span = startSpan(OPERATION_AMQP_INBOUND, parentContext, spanStartMicros); + final AgentSpan span = + startSpan("rabbitmq", OPERATION_AMQP_INBOUND, parentContext, spanStartMicros); if (null != body) { span.setTag("message.size", body.length); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java index 1043cb5b20b..022af818747 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java @@ -38,7 +38,7 @@ public void handle(final Context ctx) { final AgentSpan nettySpan = nettyContext != null ? fromContext(nettyContext) : null; // Relying on executor instrumentation to assume the netty span is in context as the parent. - final AgentSpan ratpackSpan = startSpan(DECORATE.spanName()).setMeasured(true); + final AgentSpan ratpackSpan = startSpan("ratpack", DECORATE.spanName()).setMeasured(true); DECORATE.afterStart(ratpackSpan); DECORATE.onRequest(ratpackSpan, request, request, root()); ctx.getExecution().add(ratpackSpan); diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java index 97ea2ae91fd..8eb79a8f1b8 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java +++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java @@ -84,7 +84,7 @@ public static class RediscalaAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter(@Advice.Argument(0) final RedisCommand cmd) { - final AgentSpan span = startSpan(RediscalaClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("rediscala", RediscalaClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onStatement(span, DECORATE.className(cmd.getClass())); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java index 48659664bb3..b87a7661b0f 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java @@ -66,7 +66,7 @@ public static AgentScope onEnter( if (command.getPromise() == null) { return null; } - final AgentSpan span = startSpan(RedissonClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redisson", RedissonClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr()); DECORATE.onStatement(span, command.getCommand().getName()); @@ -91,7 +91,7 @@ public static AgentScope onEnter( return null; } - final AgentSpan span = startSpan(RedissonClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redisson", RedissonClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr()); diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java index 604e505d0fe..a2cdd09cc2e 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java @@ -66,7 +66,7 @@ public static AgentScope onEnter( if (command.getPromise() == null) { return null; } - final AgentSpan span = startSpan(RedissonClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redisson", RedissonClientDecorator.OPERATION_NAME); RedissonClientDecorator.DECORATE.afterStart(span); RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr()); RedissonClientDecorator.DECORATE.onStatement(span, command.getCommand().getName()); @@ -92,7 +92,7 @@ public static AgentScope onEnter( return null; } - final AgentSpan span = startSpan(RedissonClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redisson", RedissonClientDecorator.OPERATION_NAME); RedissonClientDecorator.DECORATE.afterStart(span); RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr()); diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java index fafd5292da7..a49a34a0b9d 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java @@ -71,7 +71,7 @@ public static AgentScope onEnter( if (promise == null) { return null; } - final AgentSpan span = startSpan(RedissonClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redisson", RedissonClientDecorator.OPERATION_NAME); RedissonClientDecorator.DECORATE.afterStart(span); RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr()); RedissonClientDecorator.DECORATE.onStatement(span, command.getCommand().getName()); @@ -102,7 +102,7 @@ public static AgentScope onEnter( if (promise == null) { return null; } - final AgentSpan span = startSpan(RedissonClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redisson", RedissonClientDecorator.OPERATION_NAME); RedissonClientDecorator.DECORATE.afterStart(span); RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr()); diff --git a/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java b/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java index c114c46b607..b77b9f983d8 100644 --- a/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java +++ b/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java @@ -45,7 +45,8 @@ public static final class BenchmarkAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter( @Advice.Argument(0) int index, @Advice.FieldValue("benchmarkName") String benchmarkName) { - AgentSpan span = startSpan("renaissance.benchmark").setResourceName(benchmarkName); + AgentSpan span = + startSpan("renaissance", "renaissance.benchmark").setResourceName(benchmarkName); return activateSpan(span); } diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java index 088d8ce3fab..16da9b855be 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java +++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java @@ -62,7 +62,7 @@ public static AgentScope beginRequest( @Advice.Argument(0) final AnnotationInfo annotationInfo) { final AgentSpan parent = activeSpan(); - final AgentSpan span = startSpan(RESTLET_HTTP_OPERATION_NAME); + final AgentSpan span = startSpan("restlet-http", RESTLET_HTTP_OPERATION_NAME); span.setMeasured(true); DECORATE.onRestletSpan(span, parent, serverResource, annotationInfo.getJavaMethod()); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java index 0d1159248f7..02433c8a061 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java @@ -31,7 +31,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo if (context.getProperty(JakartaRsAnnotationsDecorator.ABORT_HANDLED) == null) { final AgentSpan parent = activeSpan(); - final AgentSpan span = startSpan(JAKARTA_RS_REQUEST_ABORT); + final AgentSpan span = startSpan("jakarta-rs", JAKARTA_RS_REQUEST_ABORT); // Save spans so a more specific instrumentation can run later context.setProperty(JakartaRsAnnotationsDecorator.ABORT_PARENT, parent); diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java index a3d385ece97..343635704e2 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java @@ -116,7 +116,7 @@ public static AgentScope nameSpan( // Rename the parent span according to the path represented by these annotations. final AgentSpan parent = activeSpan(); - final AgentSpan span = startSpan(JAKARTA_ENDPOINT_OPERATION_NAME); + final AgentSpan span = startSpan("jakarta-rs", JAKARTA_ENDPOINT_OPERATION_NAME); span.setMeasured(true); DECORATE.onJakartaRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java index e0c66184d92..0291423a33d 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java @@ -26,7 +26,7 @@ public static AgentScope createOrUpdateAbortSpan( if (span == null) { parent = activeSpan(); - span = startSpan(JAKARTA_RS_REQUEST_ABORT); + span = startSpan("jakarta-rs", JAKARTA_RS_REQUEST_ABORT); final AgentScope scope = activateSpan(span); diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java index e2c1abaf19c..509767dea29 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java @@ -93,7 +93,7 @@ public static AgentScope nameSpan( // Rename the parent span according to the path represented by these annotations. final AgentSpan parent = activeSpan(); - final AgentSpan span = startSpan(JAX_ENDPOINT_OPERATION_NAME); + final AgentSpan span = startSpan("jax-rs", JAX_ENDPOINT_OPERATION_NAME); span.setMeasured(true); DECORATE.onJaxRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java index 87f695b6406..3e8230c6d1f 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java @@ -31,7 +31,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null) { final AgentSpan parent = activeSpan(); - final AgentSpan span = startSpan(JAX_RS_REQUEST_ABORT); + final AgentSpan span = startSpan("jax-rs", JAX_RS_REQUEST_ABORT); // Save spans so a more specific instrumentation can run later context.setProperty(JaxRsAnnotationsDecorator.ABORT_PARENT, parent); diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java index 0470d562416..eb8d7ef06f7 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java @@ -124,7 +124,7 @@ public static AgentScope nameSpan( // Rename the parent span according to the path represented by these annotations. final AgentSpan parent = activeSpan(); - final AgentSpan span = startSpan(JAX_ENDPOINT_OPERATION_NAME); + final AgentSpan span = startSpan("jax-rs", JAX_ENDPOINT_OPERATION_NAME); span.setMeasured(true); DECORATE.onJaxRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java index fd19657b90b..e57b39c29e3 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java @@ -25,7 +25,7 @@ public static AgentScope createOrUpdateAbortSpan( if (span == null) { parent = activeSpan(); - span = startSpan(JAX_RS_REQUEST_ABORT); + span = startSpan("jax-rs", JAX_RS_REQUEST_ABORT); final AgentScope scope = activateSpan(span); diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java index 5db42c50be8..cf1e06065d6 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java @@ -72,7 +72,7 @@ public static AgentScope onEnter( // WARNING: this might be a chain...so we only have to trace the first in the chain. final boolean isRootClientHandler = null == request.getProperties().get(DD_CONTEXT_ATTRIBUTE); if (isRootClientHandler) { - final AgentSpan span = startSpan(JAX_RS_CLIENT_CALL); + final AgentSpan span = startSpan("jax-rs", JAX_RS_CLIENT_CALL); DECORATE.afterStart(span); DECORATE.onRequest(span, request); request.getProperties().put(DD_CONTEXT_ATTRIBUTE, span); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java index f5e470c60f8..29c5f09456a 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java @@ -30,7 +30,8 @@ public TracedOnSubscribe( @Override public void call(final Subscriber subscriber) { - final AgentSpan span = startSpan(operationName, parent != null ? parent.context() : null); + final AgentSpan span = + startSpan("rxjava", operationName, parent != null ? parent.context() : null); afterStart(span); try (final AgentScope scope = activateSpan(span)) { diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java index a58d91ddc2a..748b81b3dde 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java @@ -96,7 +96,7 @@ public static boolean enter( return true; } - final AgentSpan span = startSpan(SERVLET_DISPATCH, parent.context()); + final AgentSpan span = startSpan("servlet", SERVLET_DISPATCH, parent.context()); // This span should get finished by Servlet3Advice // However, when using Jetty without servlets (directly org.eclipse.jetty.server.Handler), // that's not the case (see jetty's HandleAdvice) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java index 0abe760a452..3608c7e4190 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java @@ -68,7 +68,7 @@ public static AgentScope start(@Advice.This final Filter filter) { return null; } - final AgentSpan span = startSpan(SERVLET_FILTER); + final AgentSpan span = startSpan("servlet", SERVLET_FILTER); DECORATE.afterStart(span); // Here we use "this" instead of "the method target" to distinguish abstract filter instances. diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java index ecd9654dadd..189ae87eb98 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java @@ -78,7 +78,8 @@ public static AgentScope start(@Advice.Origin final Method method) { } final AgentSpan span = - startSpan(SPAN_NAME_CACHE.computeIfAbsent(method.getName(), SERVLET_PREFIX)); + startSpan( + "servlet-service", SPAN_NAME_CACHE.computeIfAbsent(method.getName(), SERVLET_PREFIX)); DECORATE.afterStart(span); // Here we use the Method instead of "this.class.name" to distinguish calls to "super". diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java index b5afc57e105..41b42e22655 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java @@ -67,7 +67,7 @@ public static AgentScope start( return null; } - final AgentSpan span = startSpan(SERVLET_RESPONSE); + final AgentSpan span = startSpan("servlet", SERVLET_RESPONSE); DECORATE.afterStart(span); span.setResourceName(DECORATE.spanNameForMethod(HttpServletResponse.class, method)); diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java index c4224867615..3a94388e8a6 100644 --- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java +++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java @@ -31,7 +31,7 @@ public Object invoke(final MethodInvocation methodInvocation) throws Throwable { return methodInvocation.proceed(); } - final AgentSpan span = startSpan(REPOSITORY_OPERATION); + final AgentSpan span = startSpan("spring-data", REPOSITORY_OPERATION); DECORATOR.afterStart(span); DECORATOR.onOperation(span, invokedMethod, repositoryInterface); diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java index 48538837dfe..c6e21258171 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java @@ -80,7 +80,7 @@ public static class HandleMessageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter(@Advice.This InvocableHandlerMethod thiz) { - AgentSpan span = startSpan(SPRING_INBOUND); + AgentSpan span = startSpan("spring-messaging", SPRING_INBOUND); DECORATE.afterStart(span); span.setResourceName(DECORATE.spanNameForMethod(thiz.getMethod())); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java index aff08a34f24..4d99632f234 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java @@ -72,7 +72,7 @@ public static AgentScope activate(@Advice.Argument(1) Object data) { AgentScope.Continuation continuation = state.getAndResetContinuation(); if (null != continuation) { try (AgentScope scope = continuation.activate()) { - AgentSpan span = startSpan(AMQP_CONSUME); + AgentSpan span = startSpan("amqp", AMQP_CONSUME); span.setMeasured(true); DECORATE.afterStart(span); DECORATE.onConsume(span, message.getMessageProperties().getConsumerQueue()); diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java index 26c81fdf74d..7e5fbea27c7 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java @@ -48,7 +48,7 @@ private Object invokeWithContinuation(CharSequence spanName) throws Throwable { } private Object invokeWithSpan(CharSequence spanName) throws Throwable { - AgentSpan span = startSpan(spanName); + AgentSpan span = startSpan("spring-scheduling", spanName); try (AgentScope scope = activateSpan(span)) { return delegate.proceed(); } finally { diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java index 1e5b2927e4d..bf0dc7ceced 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java @@ -55,7 +55,9 @@ private SpringSchedulingRunnableWrapper(final Runnable runnable) { @Override public void run() { final AgentSpan span = - LEGACY_TRACING ? startSpan(SCHEDULED_CALL) : startSpan(SCHEDULED_CALL, null); + LEGACY_TRACING + ? startSpan("spring-scheduling", SCHEDULED_CALL) + : startSpan("spring-scheduling", SCHEDULED_CALL, null); DECORATE.afterStart(span); try (final AgentScope scope = activateSpan(span)) { diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java index 32a61f6985d..bfd9c5eb9f1 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java @@ -50,7 +50,7 @@ public MonoWebClientTrace(final ClientRequest request, final ExchangeFunction ne @Override public void subscribe(final CoreSubscriber subscriber) { - AgentSpan span = startSpan(HTTP_REQUEST); + AgentSpan span = startSpan("spring-webflux", HTTP_REQUEST); DECORATE.afterStart(span); DECORATE.onRequest(span, request); AgentSpan parent = activeSpan(); diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java index f599e0321a1..5c14878bf03 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java @@ -33,7 +33,7 @@ public static AgentScope methodEnter(@Advice.Argument(0) final ServerWebExchange exchange.getAttributes().put(AdviceUtils.PARENT_SPAN_ATTRIBUTE, parentSpan); } - final AgentSpan span = startSpan(DISPATCHER_HANDLE_HANDLER); + final AgentSpan span = startSpan("spring-webflux", DISPATCHER_HANDLE_HANDLER); span.setMeasured(true); DECORATE.afterStart(span); exchange.getAttributes().put(AdviceUtils.SPAN_ATTRIBUTE, span); diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java index 8fd5cb59219..9d5d46de6a1 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java @@ -97,7 +97,7 @@ public static class RenderAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static ContextScope onEnter(@Advice.Argument(0) final ModelAndView mv) { - final AgentSpan span = startSpan(RESPONSE_RENDER); + final AgentSpan span = startSpan("spring-web", RESPONSE_RENDER); DECORATE_RENDER.afterStart(span); DECORATE_RENDER.onRender(span, mv); return getCurrentContext().with(span).attach(); diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java index 6558878f8ad..1e2788f49bf 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java @@ -104,7 +104,7 @@ public static ContextScope nameResourceAndStartSpan( return ((Context) existingContext).attach(); } - final AgentSpan span = startSpan(DECORATE.spanName()).setMeasured(true); + final AgentSpan span = startSpan("spring-web", DECORATE.spanName()).setMeasured(true); DECORATE.afterStart(span); DECORATE.onHandle(span, handler); diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java index bb95ff99f8f..92ea80bcc64 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java @@ -55,7 +55,7 @@ public static ContextScope nameResourceAndStartSpan( return ((Context) existingContext).attach(); } - final AgentSpan span = startSpan(DECORATE.spanName()).setMeasured(true); + final AgentSpan span = startSpan("spring-web", DECORATE.spanName()).setMeasured(true); DECORATE.afterStart(span); DECORATE.onHandle(span, handler); diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java index 542af56afda..14becf27d18 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java @@ -13,7 +13,7 @@ public class RenderAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static ContextScope onEnter(@Advice.Argument(0) final ModelAndView mv) { - final AgentSpan span = startSpan(SpringWebHttpServerDecorator.RESPONSE_RENDER); + final AgentSpan span = startSpan("spring-web", SpringWebHttpServerDecorator.RESPONSE_RENDER); SpringWebHttpServerDecorator.DECORATE_RENDER.afterStart(span); SpringWebHttpServerDecorator.DECORATE_RENDER.onRender(span, mv); return getCurrentContext().with(span).attach(); diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java index 779c172c38c..375865b4ed1 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java @@ -78,7 +78,7 @@ public static AgentScope methodEnter() { if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) { return null; } - return activateSpan(startSpan(MemcacheClientDecorator.OPERATION_NAME)); + return activateSpan(startSpan("spymemcached", MemcacheClientDecorator.OPERATION_NAME)); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -107,7 +107,7 @@ public static AgentScope methodEnter() { if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) { return null; } - return activateSpan(startSpan(MemcacheClientDecorator.OPERATION_NAME)); + return activateSpan(startSpan("spymemcached", MemcacheClientDecorator.OPERATION_NAME)); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -136,7 +136,7 @@ public static AgentScope methodEnter() { if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) { return null; } - return activateSpan(startSpan(MemcacheClientDecorator.OPERATION_NAME)); + return activateSpan(startSpan("spymemcached", MemcacheClientDecorator.OPERATION_NAME)); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -165,7 +165,7 @@ public static SyncCompletionListener methodEnter(@Advice.Origin("#m") final Stri if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) { return null; } - final AgentSpan span = startSpan(MemcacheClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("spymemcached", MemcacheClientDecorator.OPERATION_NAME); return new SyncCompletionListener(span, methodName); } diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java index 01f21dd5274..e1035facb56 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java @@ -86,9 +86,9 @@ public static ContextScope beginRequest( AgentSpan span; if (null != parentSpan) { - span = startSpan(SYNAPSE_REQUEST, parentSpan.context()); + span = startSpan("synapse3-client", SYNAPSE_REQUEST, parentSpan.context()); } else { - span = startSpan(SYNAPSE_REQUEST); + span = startSpan("synapse3-client", SYNAPSE_REQUEST); } DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java index 4334f3beb58..e69d7902d73 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java @@ -38,7 +38,7 @@ public static void after( if (suffixIdx > 0) { workflowName = workflowName.substring(0, suffixIdx); } - AgentSpan span = startSpan(TIBCO_PROCESS_OPERATION); + AgentSpan span = startSpan("tibco_bw", TIBCO_PROCESS_OPERATION); DECORATE.afterStart(span); DECORATE.onProcessStart(span, workflowName); Map map = diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java index fc3d771f792..3c3adc6218c 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java @@ -48,7 +48,7 @@ public static void after(@Advice.Argument(value = 0) ProcessContext processConte if (suffixIdx > 0) { workflowName = workflowName.substring(0, suffixIdx); } - AgentSpan span = startSpan(TIBCO_PROCESS_OPERATION); + AgentSpan span = startSpan("tibco_bw", TIBCO_PROCESS_OPERATION); DECORATE.afterStart(span); DECORATE.onProcessStart(span, workflowName); Map map = new HashMap<>(); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java index 295c13d7d79..9d64a23fad7 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java @@ -66,7 +66,9 @@ public static boolean before( AgentSpan span = map.get(ddActivityInfo.id); if (span == null) { AgentSpan parent = map.getOrDefault(ddActivityInfo.parent, activeSpan()); - span = startSpan(TIBCO_ACTIVITY_OPERATION, parent != null ? parent.context() : null); + span = + startSpan( + "tibco_bw", TIBCO_ACTIVITY_OPERATION, parent != null ? parent.context() : null); DECORATE.afterStart(span); DECORATE.onActivityStart(span, ddActivityInfo.name); map.put(ddActivityInfo.id, span); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java index cee20f895a8..c6d968bc7ca 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java @@ -91,6 +91,7 @@ public static AgentScope activityBegin( } AgentSpan span = startSpan( + "tibco_bw", TibcoDecorator.TIBCO_ACTIVITY_OPERATION, parentSpan != null ? parentSpan.context() : null); TibcoDecorator.DECORATE.afterStart(span); @@ -141,6 +142,7 @@ public static void processStarts( } AgentSpan span = startSpan( + "tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION, parent != null ? parentSpan.context() : null); TibcoDecorator.DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java index c7a82a984fa..e6a90077917 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java @@ -66,7 +66,7 @@ public static void onExit( } } try (AgentScope maybeScope = parentSpan != null ? activateSpan(parentSpan) : null) { - AgentSpan span = startSpan(TibcoDecorator.TIBCO_PROCESS_OPERATION); + AgentSpan span = startSpan("tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION); TibcoDecorator.DECORATE.afterStart(span); if (appName != null) { AgentSpan root = span.getLocalRootSpan(); diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java index 458d7274818..5f9c23dec85 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java @@ -102,7 +102,7 @@ public static AgentScope methodEnter( } // Don't automatically close the span with the scope if we're executing an async method - final AgentSpan span = startSpan(TWILIO_SDK); + final AgentSpan span = startSpan("twilio-sdk", TWILIO_SDK); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, that, methodName); diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java index e4dbe7190b0..dd75c5bfafb 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java @@ -85,7 +85,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan(TWILIO_SDK); + final AgentSpan span = startSpan("twilio-sdk", TWILIO_SDK); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, that, methodName); diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java index 8c7bff5ef73..f60745c072b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java @@ -81,7 +81,7 @@ public AgentSpan startAndDecorateSpan( } private AgentSpan innerStartAndDecorateSpan(UTF8BytesString command) { - final AgentSpan span = startSpan(REDIS_COMMAND); + final AgentSpan span = startSpan("vertx", REDIS_COMMAND); DECORATE.afterStart(span); DECORATE.onStatement(span, command); return span; diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java index cb4b5ba0d70..f8393754f55 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java @@ -75,7 +75,7 @@ protected String dbHostname(final DBInfo info) { public AgentSpan startAndDecorateSpanForStatement( T query, ContextStore contextStore, boolean prepared) { CharSequence component = prepared ? VERTX_PREPARED_STATEMENT : VERTX_STATEMENT; - AgentSpan span = startSpan(DATABASE_QUERY); + AgentSpan span = startSpan("vertx", DATABASE_QUERY); if (null == span) { return null; } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java index 1c0d35a0191..37120c2f0cd 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java @@ -44,7 +44,7 @@ public void handle(final RoutingContext routingContext) { AgentSpan parentSpan = activeSpan(); routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan); - span = startSpan(INSTRUMENTATION_NAME); + span = startSpan("vertx", INSTRUMENTATION_NAME); routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span); routingContext.response().endHandler(new EndHandlerWrapper(routingContext)); diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java index a996806a1a8..8706f816e1c 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java @@ -40,7 +40,7 @@ public void handle(final RoutingContext routingContext) { AgentSpan parentSpan = activeSpan(); routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan); - span = startSpan(INSTRUMENTATION_NAME); + span = startSpan("vertx", INSTRUMENTATION_NAME); routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span); routingContext.response().endHandler(new EndHandlerWrapper(routingContext)); diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java index ad82d0001da..41b741ea21f 100644 --- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java @@ -75,7 +75,7 @@ public static AgentScope beginRequest( return null; } - AgentSpan span = startSpan(JAKARTA_WS_REQUEST); + AgentSpan span = startSpan("jakarta-ws", JAKARTA_WS_REQUEST); span.setMeasured(true); DECORATE.onJakartaWsSpan(span, thiz.getClass(), method); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java index e41523fae75..95bca5ca9a2 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java @@ -75,7 +75,7 @@ public static AgentScope beginRequest( return null; } - AgentSpan span = startSpan(JAX_WS_REQUEST); + AgentSpan span = startSpan("jax-ws", JAX_WS_REQUEST); span.setMeasured(true); DECORATE.onJaxWsSpan(span, thiz.getClass(), method); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java index daaa4adcdf4..2a2463cf595 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java @@ -69,7 +69,7 @@ public static AgentScope beginRequest( return null; } - AgentSpan span = startSpan(JAX_WS_REQUEST); + AgentSpan span = startSpan("jax-ws", JAX_WS_REQUEST); span.setMeasured(true); DECORATE.onJaxWsSpan(span, thiz.getClass(), method); DECORATE.afterStart(span); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java index 205cb60bb2b..979abb812d1 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java @@ -25,14 +25,6 @@ import javax.annotation.Nonnull; public class AgentTracer { - private static final String DEFAULT_INSTRUMENTATION_NAME = "datadog"; - - // Implicit parent - /** Deprecated. Use {@link #startSpan(String, CharSequence)} instead. */ - @Deprecated - public static AgentSpan startSpan(final CharSequence spanName) { - return startSpan(DEFAULT_INSTRUMENTATION_NAME, spanName); - } /** * @see TracerAPI#startSpan(String, CharSequence) @@ -41,13 +33,6 @@ public static AgentSpan startSpan(final String instrumentationName, final CharSe return get().startSpan(instrumentationName, spanName); } - // Implicit parent - /** Deprecated. Use {@link #startSpan(String, CharSequence, long)} instead. */ - @Deprecated - public static AgentSpan startSpan(final CharSequence spanName, final long startTimeMicros) { - return startSpan(DEFAULT_INSTRUMENTATION_NAME, spanName, startTimeMicros); - } - /** * @see TracerAPI#startSpan(String, CharSequence, long) */ @@ -56,13 +41,6 @@ public static AgentSpan startSpan( return get().startSpan(instrumentationName, spanName, startTimeMicros); } - // Explicit parent - /** Deprecated. Use {@link #startSpan(String, CharSequence, AgentSpanContext)} instead. */ - @Deprecated - public static AgentSpan startSpan(final CharSequence spanName, final AgentSpanContext parent) { - return startSpan(DEFAULT_INSTRUMENTATION_NAME, spanName, parent); - } - /** * @see TracerAPI#startSpan(String, CharSequence, AgentSpanContext) */ @@ -73,14 +51,6 @@ public static AgentSpan startSpan( return get().startSpan(instrumentationName, spanName, parent); } - // Explicit parent - /** Deprecated. Use {@link #startSpan(String, CharSequence, AgentSpanContext, long)} instead. */ - @Deprecated - public static AgentSpan startSpan( - final CharSequence spanName, final AgentSpanContext parent, final long startTimeMicros) { - return startSpan(DEFAULT_INSTRUMENTATION_NAME, spanName, parent, startTimeMicros); - } - /** * @see TracerAPI#startSpan(String, CharSequence, AgentSpanContext, long) */ @@ -379,12 +349,12 @@ default AgentSpan blackholeSpan() { /** Deprecated. Use {@link #buildSpan(String, CharSequence)} instead. */ @Deprecated default SpanBuilder buildSpan(CharSequence spanName) { - return buildSpan(DEFAULT_INSTRUMENTATION_NAME, spanName); + return buildSpan("datadog", spanName); } @Deprecated default SpanBuilder singleSpanBuilder(CharSequence spanName) { - return singleSpanBuilder(DEFAULT_INSTRUMENTATION_NAME, spanName); + return singleSpanBuilder("datadog", spanName); } /** From a6a3c22fbd1a1b8d3751882917f6a8d9f8298d5f Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 22 Apr 2026 16:17:22 +0200 Subject: [PATCH 2/8] migrate tests/jmh --- .../iast/propagation/AbstractBenchmark.java | 2 +- .../injection/LogContextInjectionTestBase.groovy | 8 ++++---- .../akka-actor-2.5/src/test/java/LinearTask.java | 2 +- .../instrumentation/axis2/AxisEngineTest.groovy | 16 ++++++++-------- .../axis2/AxisTransportForkedTest.groovy | 2 +- .../GrizzlyByteBodyInstrumentationTest.groovy | 2 +- .../GrizzlyCharBodyInstrumentationTest.groovy | 2 +- .../src/test/groovy/SessionTest.groovy | 2 +- .../src/test/groovy/SessionTest.groovy | 2 +- .../recursive/RecursiveThreadPoolExecution.java | 2 +- ...iveThreadPoolMixedSubmissionAndExecution.java | 2 +- .../recursive/RecursiveThreadPoolSubmission.java | 2 +- .../src/test/java/forkjoin/LinearTask.java | 2 +- .../src/test/java/runnable/Descendant.java | 2 +- ...KafkaClientCustomPropagationConfigTest.groovy | 2 +- ...KafkaClientCustomPropagationConfigTest.groovy | 2 +- .../latestDepTest/groovy/ReactorCoreTest.groovy | 6 +++--- .../latestDepTest/groovy/SubscriptionTest.groovy | 2 +- .../src/test/groovy/ReactorCoreTest.groovy | 6 +++--- .../src/test/groovy/SubscriptionTest.groovy | 2 +- .../src/test/groovy/RxJava2Test.groovy | 6 +++--- .../src/test/groovy/SubscriptionTest.groovy | 2 +- .../src/test/java/LinearTask.java | 2 +- .../src/test/groovy/listener/TestListener.groovy | 2 +- .../src/test/kotlin/KafkaBatchCoroutineConfig.kt | 2 +- ...ttpMessageConverterInstrumentationTest.groovy | 2 +- 26 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java index 6b36b1079c7..d6f0a7e7b90 100644 --- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java +++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java @@ -63,7 +63,7 @@ public void start() { if (Config.get().getIastActivation() == ProductActivation.FULLY_ENABLED) { tagContext.withRequestContextDataIast(context.getIastContext()); } - span = AgentTracer.startSpan("benchmark", tagContext); + span = AgentTracer.startSpan("iast", "benchmark", tagContext); scope = AgentTracer.activateSpan(span); } diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy index 372841717b4..a0c9bf9c9bc 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy @@ -41,7 +41,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification def "Log context shows trace and span ids for active scope"() { when: put("foo", "bar") - AgentSpan rootSpan = startSpan("root") + AgentSpan rootSpan = startSpan("test", "root") AgentScope rootScope = activateSpan(rootSpan) then: @@ -50,7 +50,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification get("foo") == "bar" when: - AgentSpan childSpan = startSpan("child") + AgentSpan childSpan = startSpan("test", "child") AgentScope childScope = activateSpan(childSpan) then: @@ -93,7 +93,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification @Override void run() { // other trace in scope - final AgentSpan thread2Span = startSpan("root2") + final AgentSpan thread2Span = startSpan("test", "root2") final AgentScope thread2Scope = activateSpan(thread2Span) try { thread2TraceId.set(get(CorrelationIdentifier.getTraceIdKey())) @@ -104,7 +104,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification } } - final AgentSpan mainSpan = startSpan("root") + final AgentSpan mainSpan = startSpan("test", "root") final AgentScope mainScope = activateSpan(mainSpan) thread1.start() thread2.start() diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java index a60302436db..caffe6096f5 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java @@ -31,7 +31,7 @@ protected Integer compute() { return parent; } else { int next = parent + 1; - AgentSpan span = startSpan(Integer.toString(next)); + AgentSpan span = startSpan("test", Integer.toString(next)); try (AgentScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisEngineTest.groovy b/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisEngineTest.groovy index 29dd033f10c..af355200931 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisEngineTest.groovy +++ b/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisEngineTest.groovy @@ -143,7 +143,7 @@ class AxisEngineTest extends InstrumentationSpecification { def "test send"() { when: - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') activateSpan(span0).withCloseable { def message1 = testMessage() @@ -170,7 +170,7 @@ class AxisEngineTest extends InstrumentationSpecification { when: def message = testMessage() message.setProperty(TRIGGER_PAUSE, true) - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') activateSpan(span0).withCloseable { AxisEngine.send(message) @@ -201,7 +201,7 @@ class AxisEngineTest extends InstrumentationSpecification { when: def message = testMessage() message.setProperty(TRIGGER_FAIL, true) - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') activateSpan(span0).withCloseable { try { @@ -224,7 +224,7 @@ class AxisEngineTest extends InstrumentationSpecification { def "test sendFault"() { when: - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') def faultMessage = createFaultMessageContext(testMessage(), new Exception('internal error')) activateSpan(span0).withCloseable { @@ -243,7 +243,7 @@ class AxisEngineTest extends InstrumentationSpecification { def "test receive"() { when: - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') activateSpan(span0).withCloseable { def message1 = testMessage() @@ -271,7 +271,7 @@ class AxisEngineTest extends InstrumentationSpecification { injectSysConfig("trace.axis.promote.resource-name", "true") when: // emulates AxisServlet behaviour - AgentSpan span0 = startSpan("servlet.request") + AgentSpan span0 = startSpan("test", "servlet.request") span0.setServiceName("testSpan") span0.setResourceName("POST /some/context/services/TestService") activateSpan(span0).withCloseable { @@ -306,7 +306,7 @@ class AxisEngineTest extends InstrumentationSpecification { when: def message = testMessage() message.setProperty(TRIGGER_PAUSE, true) - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') activateSpan(span0).withCloseable { AxisEngine.receive(message) @@ -337,7 +337,7 @@ class AxisEngineTest extends InstrumentationSpecification { when: def message = testMessage() message.setProperty(TRIGGER_FAIL, true) - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') activateSpan(span0).withCloseable { try { diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisTransportForkedTest.groovy b/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisTransportForkedTest.groovy index d210b3785b2..51f7b799e99 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisTransportForkedTest.groovy +++ b/dd-java-agent/instrumentation/axis2-1.3/src/test/groovy/datadog/trace/instrumentation/axis2/AxisTransportForkedTest.groovy @@ -83,7 +83,7 @@ class AxisTransportForkedTest extends InstrumentationSpecification { message1.setProperty("TRANSPORT_HEADERS", ["foo":"bar"] as HashMap) def message2 = testMessage() // no action, expect span to use testDestination - AgentSpan span0 = startSpan('test') + AgentSpan span0 = startSpan('test', 'test') span0.setServiceName('testSpan') activateSpan(span0).withCloseable { AxisEngine.send(message1) diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyByteBodyInstrumentationTest.groovy b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyByteBodyInstrumentationTest.groovy index c9abe1cd3fa..6e3a3cf7b55 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyByteBodyInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyByteBodyInstrumentationTest.groovy @@ -40,7 +40,7 @@ class GrizzlyByteBodyInstrumentationTest extends InstrumentationSpecification { 1 * attributeHolder.setAttribute('datadog.intercepted_request_body', Boolean.TRUE) TagContext ctx = new TagContext().withRequestContextDataAppSec(new Object()) - def agentSpan = AgentTracer.startSpan('test-span', ctx) + def agentSpan = AgentTracer.startSpan('test', 'test-span', ctx) this.scope = AgentTracer.activateSpan(agentSpan) ss.registerCallback(EVENTS.requestBodyStart(), { RequestContext reqContext, StoredBodySupplier sup -> diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyCharBodyInstrumentationTest.groovy b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyCharBodyInstrumentationTest.groovy index 8ab0d014c35..58b253b81e9 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyCharBodyInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/test/groovy/GrizzlyCharBodyInstrumentationTest.groovy @@ -34,7 +34,7 @@ class GrizzlyCharBodyInstrumentationTest extends InstrumentationSpecification { 1 * attributeHolder.setAttribute('datadog.intercepted_request_body', Boolean.TRUE) TagContext ctx = new TagContext().withRequestContextDataAppSec(new Object()) - def agentSpan = AgentTracer.startSpan('test-span', ctx) + def agentSpan = AgentTracer.startSpan('test', 'test-span', ctx) this.scope = AgentTracer.activateSpan(agentSpan) ss.registerCallback(EVENTS.requestBodyStart(), { RequestContext reqContext, StoredBodySupplier sup -> diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy index 430ff87cb32..659e24b9552 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy @@ -540,7 +540,7 @@ class SessionTest extends AbstractHibernateTest { def "test hibernate overlapping Sessions"() { - AgentScope scope = activateSpan(startSpan("overlapping Sessions")) + AgentScope scope = activateSpan(startSpan("test", "overlapping Sessions")) def session1 = sessionFactory.openSession() session1.beginTransaction() diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy index 951f27cc952..9fb814fd8f4 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy @@ -466,7 +466,7 @@ class SessionTest extends AbstractHibernateTest { def "test hibernate overlapping Sessions"() { setup: - AgentScope scope = activateSpan(startSpan("overlapping Sessions")) + AgentScope scope = activateSpan(startSpan("test", "overlapping Sessions")) def session1 = sessionFactory.openSession() session1.beginTransaction() diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java index 59ee9a8d4ec..ce572c0c698 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java @@ -25,7 +25,7 @@ public void run() { if (depth == maxDepth) { return; } - AgentSpan span = startSpan(String.valueOf(depth)); + AgentSpan span = startSpan("test", String.valueOf(depth)); try (AgentScope scope = activateSpan(span)) { executor.execute(new RecursiveThreadPoolExecution(executor, maxDepth, depth + 1)); } finally { diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java index 37478f03891..ca882efd884 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java @@ -26,7 +26,7 @@ public void run() { if (depth == maxDepth) { return; } - AgentSpan span = startSpan(String.valueOf(depth)); + AgentSpan span = startSpan("test", String.valueOf(depth)); try (AgentScope scope = activateSpan(span)) { if (depth % 2 == 0) { executor.submit( diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java index 8cbd05924fd..331062a90ca 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java @@ -25,7 +25,7 @@ public void run() { if (depth == maxDepth) { return; } - AgentSpan span = startSpan(String.valueOf(depth)); + AgentSpan span = startSpan("test", String.valueOf(depth)); try (AgentScope scope = activateSpan(span)) { executor.submit(new RecursiveThreadPoolSubmission(executor, maxDepth, depth + 1)); } finally { diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java index c54fb9db9b7..35a3891bc87 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java @@ -33,7 +33,7 @@ protected Integer compute() { return parent; } else { int next = parent + 1; - AgentSpan span = startSpan(Integer.toString(next)); + AgentSpan span = startSpan("test", Integer.toString(next)); try (AgentScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java index 6e818e18485..3cf7c6e93f2 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java @@ -16,7 +16,7 @@ public Descendant(String parent) { @Override public void run() { - AgentSpan span = startSpan(parent + "-child"); + AgentSpan span = startSpan("test", parent + "-child"); try (AgentScope scope = activateSpan(span)) { } finally { diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy index 9ca7958f129..124ba06ee62 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy @@ -239,7 +239,7 @@ class KafkaClientCustomPropagationConfigTest extends InstrumentationSpecificatio when: Headers header = new RecordHeaders() - AgentSpan span = startSpan(KAFKA_PRODUCE) + AgentSpan span = startSpan("kafka", KAFKA_PRODUCE) activateSpan(span).withCloseable { for (String topic : SHARED_TOPIC) { ProducerRecord record = new ProducerRecord<>( diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy index 245a6365793..787bb5930f5 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy @@ -249,7 +249,7 @@ class KafkaClientCustomPropagationConfigTest extends InstrumentationSpecificatio when: Headers header = new RecordHeaders() - AgentSpan span = startSpan(KAFKA_PRODUCE) + AgentSpan span = startSpan("kafka", KAFKA_PRODUCE) activateSpan(span).withCloseable { for (String topic : SHARED_TOPIC) { ProducerRecord record = new ProducerRecord<>( diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy index ce27953ee37..d2cd1baf58e 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy @@ -303,7 +303,7 @@ class ReactorCoreTest extends InstrumentationSpecification { // The "add one" operations in the publisher created here should be children of the publisher-parent Publisher publisher = publisherSupplier() - AgentSpan intermediate = startSpan("intermediate") + AgentSpan intermediate = startSpan("test", "intermediate") AgentScope scope = activateSpan(intermediate) try { if (publisher instanceof Mono) { @@ -497,7 +497,7 @@ class ReactorCoreTest extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def assemblePublisherUnderTrace(def publisherSupplier) { - def span = startSpan("publisher-parent") + def span = startSpan("test", "publisher-parent") // After this activation, the "add two" operations below should be children of this span def scope = activateSpan(span) @@ -519,7 +519,7 @@ class ReactorCoreTest extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def cancelUnderTrace(def publisherSupplier) { - final AgentSpan span = startSpan("publisher-parent") + final AgentSpan span = startSpan("test", "publisher-parent") AgentScope scope = activateSpan(span) def publisher = publisherSupplier() diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/SubscriptionTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/SubscriptionTest.groovy index 3aba2ac9538..40992938fbd 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/SubscriptionTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/SubscriptionTest.groovy @@ -118,7 +118,7 @@ class SubscriptionTest extends InstrumentationSpecification { static class Connection { static int query() { - def span = AgentTracer.startSpan("Connection.query") + def span = AgentTracer.startSpan("test", "Connection.query") span.finish() return new Random().nextInt() } diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy index 6507485abb9..1245cc641b0 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy @@ -303,7 +303,7 @@ class ReactorCoreTest extends InstrumentationSpecification { // The "add one" operations in the publisher created here should be children of the publisher-parent Publisher publisher = publisherSupplier() - AgentSpan intermediate = startSpan("intermediate") + AgentSpan intermediate = startSpan("test", "intermediate") AgentScope scope = activateSpan(intermediate) try { if (publisher instanceof Mono) { @@ -497,7 +497,7 @@ class ReactorCoreTest extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def assemblePublisherUnderTrace(def publisherSupplier) { - def span = startSpan("publisher-parent") + def span = startSpan("test", "publisher-parent") // After this activation, the "add two" operations below should be children of this span def scope = activateSpan(span) @@ -519,7 +519,7 @@ class ReactorCoreTest extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def cancelUnderTrace(def publisherSupplier) { - final AgentSpan span = startSpan("publisher-parent") + final AgentSpan span = startSpan("test", "publisher-parent") AgentScope scope = activateSpan(span) def publisher = publisherSupplier() diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/SubscriptionTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/SubscriptionTest.groovy index 77e92810ec6..41d0715e1c7 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/SubscriptionTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/SubscriptionTest.groovy @@ -206,7 +206,7 @@ class SubscriptionTest extends InstrumentationSpecification { static class Connection { static int query() { - def span = AgentTracer.startSpan("Connection.query") + def span = AgentTracer.startSpan("test", "Connection.query") span.finish() return new Random().nextInt() } diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy index e97491100be..b7dd68fa1d2 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy @@ -300,7 +300,7 @@ class RxJava2Test extends InstrumentationSpecification { // The "add one" operations in the publisher created here should be children of the publisher-parent def publisher = publisherSupplier() - AgentSpan intermediate = startSpan("intermediate") + AgentSpan intermediate = startSpan("test", "intermediate") AgentScope scope = activateSpan(intermediate) try { if (publisher instanceof Maybe) { @@ -382,7 +382,7 @@ class RxJava2Test extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def assemblePublisherUnderTrace(def publisherSupplier) { - def span = startSpan("publisher-parent") + def span = startSpan("test", "publisher-parent") // After this activation, the "add two" operations below should be children of this span def scope = activateSpan(span) @@ -404,7 +404,7 @@ class RxJava2Test extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def cancelUnderTrace(def publisherSupplier) { - final AgentSpan span = startSpan("publisher-parent") + final AgentSpan span = startSpan("test", "publisher-parent") AgentScope scope = activateSpan(span) def publisher = publisherSupplier() diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/SubscriptionTest.groovy b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/SubscriptionTest.groovy index 11679f1a454..99e8bc53b76 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/SubscriptionTest.groovy +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/SubscriptionTest.groovy @@ -34,7 +34,7 @@ class SubscriptionTest extends InstrumentationSpecification { static class Connection { static int query() { - def span = AgentTracer.startSpan("Connection.query") + def span = AgentTracer.startSpan("test", "Connection.query") span.finish() return new Random().nextInt() } diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java index 08a74a54fb9..c62b49217fe 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java @@ -31,7 +31,7 @@ protected Integer compute() { return parent; } else { int next = parent + 1; - AgentSpan span = startSpan(Integer.toString(next)); + AgentSpan span = startSpan("test", Integer.toString(next)); try (AgentScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/groovy/listener/TestListener.groovy b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/groovy/listener/TestListener.groovy index 77e07a16d2a..665d2e8af04 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/groovy/listener/TestListener.groovy +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/groovy/listener/TestListener.groovy @@ -24,7 +24,7 @@ class TestListener extends AsyncObservationSupport { markAsyncStarted() awaitAsyncRelease() // Asserting spring.consume root span is active during async execution - def childSpan = startSpan("async.child") + def childSpan = startSpan("test", "async.child") def childScope = activateSpan(childSpan) childScope.close() childSpan.finish() diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/kotlin/KafkaBatchCoroutineConfig.kt b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/kotlin/KafkaBatchCoroutineConfig.kt index 71a768778f6..5d25ac3dfe6 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/kotlin/KafkaBatchCoroutineConfig.kt +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/test/kotlin/KafkaBatchCoroutineConfig.kt @@ -89,7 +89,7 @@ class KafkaBatchCoroutineListener : AsyncObservationSupport() { } // Create a child span inside the coroutine body. // It should be linked to spring.consume, which should be linked to kafka.consume. - val childSpan = startSpan("child.work") + val childSpan = startSpan("test", "child.work") records.forEach { receivedValues.add(it.value()) } childSpan.finish() latch.countDown() diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentationTest.groovy b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentationTest.groovy index cc5ab38be28..43309688350 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentationTest.groovy @@ -27,7 +27,7 @@ class HttpMessageConverterInstrumentationTest extends InstrumentationSpecificati def setup() { publishedBodies.clear() TagContext ctx = new TagContext().withRequestContextDataAppSec(new Object()) - def span = AgentTracer.startSpan('test-span', ctx) + def span = AgentTracer.startSpan('test', 'test-span', ctx) scope = AgentTracer.activateSpan(span) ss.registerCallback(EVENTS.requestBodyProcessed(), { RequestContext reqCtx, Object body -> From fdcdecd4e42b06753f29beedc188711a07ee8be9 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 22 Apr 2026 16:30:25 +0200 Subject: [PATCH 3/8] migrate akka tests --- .../akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala | 2 +- .../pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala index c34972a1663..10ab806c329 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala @@ -133,7 +133,7 @@ class Greeter(message: String, receiverActor: ActorRef) extends Actor { case Greet => receiverActor ! Greeting(greeting) case Leak(leak) => - val span = startSpan(greeting) + val span = startSpan("test", greeting) span.setResourceName(leak) activateSpan(span) span.finish() diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala index 2fb3089ad55..b1918acd4fa 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala @@ -137,7 +137,7 @@ class Greeter(message: String, receiverActor: ActorRef) extends Actor { case Greet => receiverActor ! Greeting(greeting) case Leak(leak) => - val span = startSpan(greeting) + val span = startSpan("test", greeting) span.setResourceName(leak) activateSpan(span) span.finish() From 56db67fc29af3ed7a0780b70381f8b10bcecf8f3 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Thu, 23 Apr 2026 17:02:13 +0200 Subject: [PATCH 4/8] Add a two way check with _dd.integration --- .../agent/test/InstrumentationSpecification.groovy | 6 +++++- .../trace/agent/test/asserts/TagsAssert.groovy | 11 +++++++++++ .../datadog/trace/agent/test/utils/TraceUtils.groovy | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy index 4561236e6ff..2f950331608 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy @@ -33,6 +33,7 @@ import datadog.metrics.impl.MonitoringImpl import datadog.metrics.api.statsd.StatsDClient import datadog.instrument.classinject.ClassInjector import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.agent.test.asserts.TagsAssert import datadog.trace.agent.test.datastreams.MockFeaturesDiscovery import datadog.trace.agent.test.datastreams.RecordingDatastreamsPayloadWriter import datadog.trace.agent.tooling.AgentInstaller @@ -405,8 +406,11 @@ abstract class InstrumentationSpecification extends DDSpecification implements A TracerInstaller.forceInstallGlobalTracer(TEST_TRACER) boolean enabledFinishTimingChecks = this.enabledFinishTimingChecks() - TEST_TRACER.startSpan(*_) >> { + TEST_TRACER.startSpan(*_) >> { Object[] args -> AgentSpan agentSpan = callRealMethod() + if (args.length > 0 && args[0] instanceof String) { + TagsAssert.INSTRUMENTATION_NAMES[agentSpan.spanId] = (String) args[0] + } if (!enabledFinishTimingChecks) { return agentSpan } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy index 8c39baf2851..b8d5d355b6c 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy @@ -11,16 +11,22 @@ import datadog.trace.common.writer.ddagent.TraceMapper import datadog.trace.core.DDSpan import groovy.transform.stc.ClosureParams import groovy.transform.stc.SimpleType +import java.util.concurrent.ConcurrentHashMap import java.util.regex.Pattern class TagsAssert { + // Populated by the InstrumentationSpecification spy; keyed by span ID. + static final Map INSTRUMENTATION_NAMES = new ConcurrentHashMap<>() + private final long spanParentId + private final long spanId private final Map tags private final String serviceName private final Set assertedTags = new TreeSet<>() private TagsAssert(DDSpan span) { this.spanParentId = span.parentId + this.spanId = span.spanId this.tags = span.tags this.serviceName = span.getServiceName() } @@ -107,6 +113,11 @@ class TagsAssert { if (assertedTags.add(DDTags.DD_INTEGRATION) && tags[Tags.COMPONENT] != null) { assert tags[Tags.COMPONENT].toString() == tags[DDTags.DD_INTEGRATION].toString() } + String capturedInstrumentationName = INSTRUMENTATION_NAMES.remove(spanId) + if (capturedInstrumentationName != null && capturedInstrumentationName != "test" && tags[DDTags.DD_INTEGRATION] != null) { + assert tags[DDTags.DD_INTEGRATION].toString() == capturedInstrumentationName : + "DD_INTEGRATION '${tags[DDTags.DD_INTEGRATION]}' != instrumentationName '${capturedInstrumentationName}' passed to startSpan()" + } assert tags["thread.name"] != null assert tags["thread.id"] != null diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy index a332ea3182b..db3fa988dd9 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy @@ -3,6 +3,7 @@ package datadog.trace.agent.test.utils import datadog.trace.agent.test.asserts.TraceAssert import datadog.trace.bootstrap.instrumentation.api.AgentScope import datadog.trace.bootstrap.instrumentation.api.AgentSpan +import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator import datadog.trace.core.DDSpan @@ -44,7 +45,7 @@ class TraceUtils { } static T runUnderTrace(final String rootOperationName, final boolean inheritCurrent, final boolean async, final Callable r) { - final AgentSpan span = inheritCurrent ? startSpan(rootOperationName) : startSpan(rootOperationName, null) + final AgentSpan span = inheritCurrent ? startSpan("test", rootOperationName) : startSpan("test", rootOperationName, (AgentSpanContext) null) DECORATOR.afterStart(span) AgentScope scope = activateSpan(span) From d069edd9d303797e72ac5b977263f5b9c59818fe Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Thu, 23 Apr 2026 19:37:23 +0200 Subject: [PATCH 5/8] Patch sofarpc startSpan --- .../sofarpc/AbstractClusterInstrumentation.java | 2 +- .../sofarpc/ProviderProxyInvokerInstrumentation.java | 4 ++-- .../trace/instrumentation/sofarpc/SofaRpcRestTest.java | 2 +- .../datadog/trace/instrumentation/sofarpc/SofaRpcTest.java | 2 +- .../sofarpc/SofaRpcTripleWithGrpcForkedTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java index 41b52996c5f..947bb1efe6e 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java @@ -44,7 +44,7 @@ public static AgentScope enter( @Advice.This AbstractCluster self, @Advice.Argument(0) SofaRequest request) { ConsumerConfig config = self.getConsumerConfig(); String protocol = config != null ? config.getProtocol() : null; - AgentSpan span = startSpan(SOFA_RPC_CLIENT); + AgentSpan span = startSpan("sofarpc", SOFA_RPC_CLIENT); DECORATE.afterStart(span); DECORATE.onRequest(span, request); if (protocol != null) { diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java index ca8baee6f8b..16b696fd0e7 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java @@ -53,8 +53,8 @@ public static AgentScope enter(@Advice.Argument(0) SofaRequest request) { AgentSpanContext parentContext = extractContextAndGetSpanContext(request, GETTER); AgentSpan span = parentContext != null - ? startSpan(SOFA_RPC_SERVER, parentContext) - : startSpan(SOFA_RPC_SERVER); + ? startSpan("sofarpc", SOFA_RPC_SERVER, parentContext) + : startSpan("sofarpc", SOFA_RPC_SERVER); DECORATE.afterStart(span); DECORATE.onRequest(span, request); span.setTag("sofarpc.protocol", protocol); diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java index b8078cb5477..d2e37d64761 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java @@ -79,7 +79,7 @@ void tearDownServers() { void clientAndServerSpansForRestCall() throws InterruptedException, TimeoutException { String serviceUniqueName = RestGreeterService.class.getName() + ":1.0"; - AgentSpan callerSpan = startSpan("caller"); + AgentSpan callerSpan = startSpan("test", "caller"); AgentScope callerScope = activateSpan(callerSpan); String reply; try { diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java index dbfbb91ab8d..1ce32632e97 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java @@ -93,7 +93,7 @@ void tearDownServers() { void clientAndServerSpansForBoltCall() throws InterruptedException, TimeoutException { String serviceUniqueName = GreeterService.class.getName() + ":1.0"; - AgentSpan callerSpan = startSpan("caller"); + AgentSpan callerSpan = startSpan("test", "caller"); AgentScope callerScope = activateSpan(callerSpan); String reply; try { diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java index 438eaee3bc0..1645a809ab8 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java @@ -98,7 +98,7 @@ void tearDownServer() { @Test void tripleServerSpanIsNestedUnderGrpcServer() throws InterruptedException, TimeoutException { - AgentSpan callerSpan = startSpan("caller"); + AgentSpan callerSpan = startSpan("test", "caller"); AgentScope callerScope = activateSpan(callerSpan); String reply; try { From 0f96d0bd08dfdb90e26c04455d6e2608fe5afbdd Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 24 Apr 2026 11:07:05 +0200 Subject: [PATCH 6/8] wip --- .../test/InstrumentationSpecification.groovy | 34 ++++++++++++------- .../lambda/LambdaHandlerInstrumentation.java | 4 +-- .../aws/v0/TracingRequestHandler.java | 2 +- .../aws/v2/TracingExecutionInterceptor.java | 2 +- .../aws/v1/sns/SnsInterceptor.java | 2 +- .../aws/v1/sqs/TracingIterator.java | 2 +- .../aws/v2/sqs/TracingIterator.java | 2 +- .../agent/test/asserts/TagsAssert.groovy | 1 + 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy index 2f950331608..400d029d1ee 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy @@ -56,6 +56,7 @@ import datadog.trace.bootstrap.ActiveSubsystems import datadog.trace.bootstrap.InstrumentationErrors import datadog.trace.bootstrap.debugger.DebuggerContext import datadog.trace.bootstrap.instrumentation.api.AgentSpan +import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext import datadog.trace.bootstrap.instrumentation.api.AgentTracer import datadog.trace.common.metrics.EventListener import datadog.trace.common.metrics.Sink @@ -406,18 +407,17 @@ abstract class InstrumentationSpecification extends DDSpecification implements A TracerInstaller.forceInstallGlobalTracer(TEST_TRACER) boolean enabledFinishTimingChecks = this.enabledFinishTimingChecks() - TEST_TRACER.startSpan(*_) >> { Object[] args -> - AgentSpan agentSpan = callRealMethod() - if (args.length > 0 && args[0] instanceof String) { - TagsAssert.INSTRUMENTATION_NAMES[agentSpan.spanId] = (String) args[0] - } - if (!enabledFinishTimingChecks) { - return agentSpan - } - - def trackingSpan = new TrackingSpanDecorator(agentSpan, spanFinishLocations, originalToTrackingSpan, useStrictTraceWrites()) - originalToTrackingSpan[agentSpan] = trackingSpan - return trackingSpan + TEST_TRACER.startSpan(_ as String, _ as CharSequence) >> { String instrName, CharSequence spanName -> + trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks) + } + TEST_TRACER.startSpan(_ as String, _ as CharSequence, _ as Long) >> { String instrName, CharSequence spanName, long micros -> + trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks) + } + TEST_TRACER.startSpan(_ as String, _ as CharSequence, _ as AgentSpanContext) >> { String instrName, CharSequence spanName, AgentSpanContext ctx -> + trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks) + } + TEST_TRACER.startSpan(_ as String, _ as CharSequence, _ as AgentSpanContext, _ as Long) >> { String instrName, CharSequence spanName, AgentSpanContext ctx, long micros -> + trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks) } ClassInjector.enableClassInjection(INSTRUMENTATION) @@ -575,6 +575,16 @@ abstract class InstrumentationSpecification extends DDSpecification implements A return true } + protected AgentSpan trackStartSpan(AgentSpan span, String instrName, boolean enabledFinishTimingChecks) { + TagsAssert.INSTRUMENTATION_NAMES[span.spanId] = instrName + if (!enabledFinishTimingChecks) { + return span + } + def trackingSpan = new TrackingSpanDecorator(span, spanFinishLocations, originalToTrackingSpan, useStrictTraceWrites()) + originalToTrackingSpan[span] = trackingSpan + return trackingSpan + } + void assertTraces( final int size, @ClosureParams( diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java index b2997db39af..d7407b47b5f 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java @@ -93,9 +93,9 @@ static AgentScope enter( AgentSpanContext lambdaContext = AgentTracer.get().notifyLambdaStart(in, lambdaRequestId); final AgentSpan span; if (null == lambdaContext) { - span = startSpan("aws-sdk", INVOCATION_SPAN_NAME); + span = startSpan("java-aws-sdk", INVOCATION_SPAN_NAME); } else { - span = startSpan("aws-sdk", INVOCATION_SPAN_NAME, lambdaContext); + span = startSpan("java-aws-sdk", INVOCATION_SPAN_NAME, lambdaContext); } span.setSpanType(InternalSpanTypes.SERVERLESS); span.setTag("request_id", lambdaRequestId); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java index 007d4bb8724..624112ff5b7 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java @@ -65,7 +65,7 @@ public void beforeRequest(final Request request) { span.setOperationName(AwsNameCache.spanName(request)); } else { // this is the most common code path - span = startSpan("aws-sdk", AwsNameCache.spanName(request)); + span = startSpan("java-aws-sdk", AwsNameCache.spanName(request)); context = span; // TODO If DSM is enabled, add DSM context here too } DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java index 57bfceab407..b8fc4326479 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java @@ -54,7 +54,7 @@ public void beforeExecution( return; // SQS messages spans are created by aws-java-sqs-2.0 } - final AgentSpan span = startSpan("aws-sdk", DECORATE.spanName(executionAttributes)); + final AgentSpan span = startSpan("java-aws-sdk", DECORATE.spanName(executionAttributes)); // TODO If DSM is enabled, add DSM context here too DECORATE.afterStart(span); executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, span); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java index 64a2f8889ae..25158ae8255 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java @@ -109,7 +109,7 @@ public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request } private AgentSpan newSpan(AmazonWebServiceRequest request) { - final AgentSpan span = AgentTracer.startSpan("aws-sdk", "aws.sns.send"); + final AgentSpan span = AgentTracer.startSpan("java-aws-sdk", "aws.sns.send"); // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched & // activated // TODO If DSM is enabled, add DSM context here too diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java index aee7bbac434..5703cf3e093 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java @@ -103,7 +103,7 @@ protected void startNewMessageSpan(Message message) { // re-use this context for any other messages received in this batch batchContext = spanContext; } - AgentSpan span = startSpan("aws-sdk", SQS_INBOUND_OPERATION, batchContext); + AgentSpan span = startSpan("java-aws-sdk", SQS_INBOUND_OPERATION, batchContext); DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl)); AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0)); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java index 0ac3ddf1bac..7ed679df0af 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java @@ -105,7 +105,7 @@ protected void startNewMessageSpan(Message message) { // re-use this context for any other messages received in this batch batchContext = spanContext; } - AgentSpan span = startSpan("aws-sdk", SQS_INBOUND_OPERATION, batchContext); + AgentSpan span = startSpan("java-aws-sdk", SQS_INBOUND_OPERATION, batchContext); DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl)); AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0)); diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy index b8d5d355b6c..8c355948632 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy @@ -114,6 +114,7 @@ class TagsAssert { assert tags[Tags.COMPONENT].toString() == tags[DDTags.DD_INTEGRATION].toString() } String capturedInstrumentationName = INSTRUMENTATION_NAMES.remove(spanId) + System.err.println("CAPTURED $capturedInstrumentationName") if (capturedInstrumentationName != null && capturedInstrumentationName != "test" && tags[DDTags.DD_INTEGRATION] != null) { assert tags[DDTags.DD_INTEGRATION].toString() == capturedInstrumentationName : "DD_INTEGRATION '${tags[DDTags.DD_INTEGRATION]}' != instrumentationName '${capturedInstrumentationName}' passed to startSpan()" From 60f12cb5a01e945c80fcb737795e3466c15a24db Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 24 Apr 2026 13:06:25 +0200 Subject: [PATCH 7/8] fix more stuff --- .../ApacheHttpAsyncClientInstrumentation.java | 3 ++- .../instrumentation/apachehttpclient/HelperMethods.java | 3 ++- .../ApacheHttpAsyncClientInstrumentation.java | 3 ++- .../instrumentation/apachehttpclient5/HelperMethods.java | 3 ++- .../grpc/client/ClientCallImplInstrumentation.java | 3 ++- .../instrumentation/aws/v0/TracingRequestHandler.java | 3 ++- .../aws/v2/TracingExecutionInterceptor.java | 4 +++- .../trace/instrumentation/aws/v1/sqs/TracingIterator.java | 3 ++- .../trace/instrumentation/aws/v2/sqs/TracingIterator.java | 3 ++- .../datastax/cassandra/TracingSession.java | 3 ++- .../datastax/cassandra4/TracingSession.java | 5 +++-- .../hazelcast36/DistributedObjectInstrumentation.java | 5 +++-- .../hazelcast39/ClientInvocationInstrumentation.java | 3 ++- .../hazelcast4/ClientListenerInstrumentation.java | 3 ++- .../instrumentation/hazelcast4/InvocationAdvice.java | 3 ++- .../jdbc/AbstractPreparedStatementInstrumentation.java | 8 ++++---- .../jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java | 3 ++- .../jdbc/HikariConcurrentBagInstrumentation.java | 6 +++++- .../instrumentation/jdbc/StatementInstrumentation.java | 6 +++--- .../trace/instrumentation/jedis/JedisInstrumentation.java | 4 +++- .../instrumentation/jedis30/JedisInstrumentation.java | 2 +- .../instrumentation/jedis40/JedisInstrumentation.java | 2 +- .../instrumentation/lettuce4/InstrumentationPoints.java | 7 +++++-- .../instrumentation/lettuce5/ConnectionFutureAdvice.java | 4 +++- .../lettuce5/LettuceAsyncCommandsAdvice.java | 4 +++- .../lettuce5/rx/RedisSubscriptionSubscribeAdvice.java | 4 +++- .../SpringMessageHandlerInstrumentation.java | 3 ++- .../datadog/trace/agent/test/asserts/TagsAssert.groovy | 1 - 28 files changed, 68 insertions(+), 36 deletions(-) diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java index 62478108fcf..72617d3ff4d 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureActiveSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.APACHE_HTTPASYNCCLIENT; import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.HTTP_REQUEST; import static java.util.Arrays.asList; @@ -102,7 +103,7 @@ public static AgentSpan methodEnter( } final AgentScope.Continuation parentContinuation = captureActiveSpan(); - final AgentSpan clientSpan = startSpan("httpasyncclient", HTTP_REQUEST); + final AgentSpan clientSpan = startSpan(APACHE_HTTPASYNCCLIENT.toString(), HTTP_REQUEST); DECORATE.afterStart(clientSpan); ((DelegatingRequestProducer) requestProducer).setSpan(clientSpan); futureCallback = diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java index cc466ab4ebb..e1c0d461651 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java @@ -3,6 +3,7 @@ import static datadog.context.Context.current; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.APACHE_HTTP_CLIENT; import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.HTTP_REQUEST; import static datadog.trace.instrumentation.apachehttpclient.HttpHeadersInjectAdapter.SETTER; @@ -35,7 +36,7 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) { } private static AgentScope activateHttpSpan(final HttpUriRequest request) { - final AgentSpan span = startSpan("httpclient", HTTP_REQUEST); + final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST); final AgentScope scope = activateSpan(span); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java index 0762004a8b1..16aea977e5e 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureActiveSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.APACHE_HTTP_CLIENT; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.HTTP_REQUEST; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -113,7 +114,7 @@ public static AgentScope methodEnter( @Advice.Argument(value = 4, readOnly = false) FutureCallback futureCallback) { final AgentScope.Continuation parentContinuation = captureActiveSpan(); - final AgentSpan clientSpan = startSpan("httpasyncclient5", HTTP_REQUEST); + final AgentSpan clientSpan = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST); final AgentScope clientScope = activateSpan(clientSpan); DECORATE.afterStart(clientSpan); diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java index 0c2ee8d15fe..f84f9c18ceb 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java @@ -3,6 +3,7 @@ import static datadog.context.Context.current; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.APACHE_HTTP_CLIENT; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.HTTP_REQUEST; import static datadog.trace.instrumentation.apachehttpclient5.HttpHeadersInjectAdapter.SETTER; @@ -35,7 +36,7 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) { } private static AgentScope activateHttpSpan(final HttpRequest request) { - final AgentSpan span = startSpan("httpclient5", HTTP_REQUEST); + final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST); final AgentScope scope = activateSpan(span); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java index 0b6b5dd4293..7833daeb1c0 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.DECORATE; import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.GRPC_MESSAGE; import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.OPERATION_NAME; @@ -211,7 +212,7 @@ public static AgentScope before() { AgentSpan clientSpan = activeSpan(); if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) { AgentSpan messageSpan = - startSpan("armeria-grpc-client", GRPC_MESSAGE) + startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE) .setTag("message.type", clientSpan.getTag("response.type")); DECORATE.afterStart(messageSpan); return activateSpan(messageSpan); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java index 624112ff5b7..89b49fa2c1b 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java @@ -10,6 +10,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext; import static datadog.trace.instrumentation.aws.v0.AwsSdkClientDecorator.AWS_LEGACY_TRACING; +import static datadog.trace.instrumentation.aws.v0.AwsSdkClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.aws.v0.AwsSdkClientDecorator.DECORATE; import com.amazonaws.AmazonWebServiceRequest; @@ -65,7 +66,7 @@ public void beforeRequest(final Request request) { span.setOperationName(AwsNameCache.spanName(request)); } else { // this is the most common code path - span = startSpan("java-aws-sdk", AwsNameCache.spanName(request)); + span = startSpan(COMPONENT_NAME.toString(), AwsNameCache.spanName(request)); context = span; // TODO If DSM is enabled, add DSM context here too } DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java index b8fc4326479..4969eff41f6 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java @@ -7,6 +7,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.blackholeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator.AWS_LEGACY_TRACING; +import static datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator.DECORATE; import datadog.context.Context; @@ -54,7 +55,8 @@ public void beforeExecution( return; // SQS messages spans are created by aws-java-sqs-2.0 } - final AgentSpan span = startSpan("java-aws-sdk", DECORATE.spanName(executionAttributes)); + final AgentSpan span = + startSpan(COMPONENT_NAME.toString(), DECORATE.spanName(executionAttributes)); // TODO If DSM is enabled, add DSM context here too DECORATE.afterStart(span); executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, span); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java index 5703cf3e093..e7a619e4cf8 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java @@ -12,6 +12,7 @@ import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName; import static datadog.trace.instrumentation.aws.v1.sqs.MessageExtractAdapter.GETTER; import static datadog.trace.instrumentation.aws.v1.sqs.SqsDecorator.BROKER_DECORATE; +import static datadog.trace.instrumentation.aws.v1.sqs.SqsDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.aws.v1.sqs.SqsDecorator.CONSUMER_DECORATE; import static datadog.trace.instrumentation.aws.v1.sqs.SqsDecorator.SQS_INBOUND_OPERATION; import static datadog.trace.instrumentation.aws.v1.sqs.SqsDecorator.SQS_TIME_IN_QUEUE_OPERATION; @@ -103,7 +104,7 @@ protected void startNewMessageSpan(Message message) { // re-use this context for any other messages received in this batch batchContext = spanContext; } - AgentSpan span = startSpan("java-aws-sdk", SQS_INBOUND_OPERATION, batchContext); + AgentSpan span = startSpan(COMPONENT_NAME.toString(), SQS_INBOUND_OPERATION, batchContext); DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl)); AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0)); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java index 7ed679df0af..9c5d3f09934 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java @@ -12,6 +12,7 @@ import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName; import static datadog.trace.instrumentation.aws.v2.sqs.MessageExtractAdapter.GETTER; import static datadog.trace.instrumentation.aws.v2.sqs.SqsDecorator.BROKER_DECORATE; +import static datadog.trace.instrumentation.aws.v2.sqs.SqsDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.aws.v2.sqs.SqsDecorator.CONSUMER_DECORATE; import static datadog.trace.instrumentation.aws.v2.sqs.SqsDecorator.SQS_INBOUND_OPERATION; import static datadog.trace.instrumentation.aws.v2.sqs.SqsDecorator.SQS_TIME_IN_QUEUE_OPERATION; @@ -105,7 +106,7 @@ protected void startNewMessageSpan(Message message) { // re-use this context for any other messages received in this batch batchContext = spanContext; } - AgentSpan span = startSpan("java-aws-sdk", SQS_INBOUND_OPERATION, batchContext); + AgentSpan span = startSpan(COMPONENT_NAME.toString(), SQS_INBOUND_OPERATION, batchContext); DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl)); AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0)); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java index 920fdec1dae..1a30d565298 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.DECORATE; +import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.JAVA_CASSANDRA; import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.OPERATION_NAME; import static datadog.trace.util.AgentThreadFactory.AgentThread.TRACE_CASSANDRA_ASYNC_SESSION; @@ -252,7 +253,7 @@ public void run() { } private AgentScope startSpanWithScope(final String query) { - final AgentSpan span = startSpan("cassandra", OPERATION_NAME); + final AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, session); DECORATE.onStatement(span, query); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java index b24c1fb680c..090f6983310 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.datastax.cassandra4.CassandraClientDecorator.DECORATE; +import static datadog.trace.instrumentation.datastax.cassandra4.CassandraClientDecorator.JAVA_CASSANDRA; import static datadog.trace.instrumentation.datastax.cassandra4.CassandraClientDecorator.OPERATION_NAME; import static datadog.trace.util.AgentThreadFactory.AgentThread.TRACE_CASSANDRA_ASYNC_SESSION; @@ -54,7 +55,7 @@ public ResultT execute( } private ResultSet wrapSyncRequest(Statement request) { - AgentSpan span = startSpan("cassandra", OPERATION_NAME); + AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, getDelegate()); @@ -78,7 +79,7 @@ private ResultSet wrapSyncRequest(Statement request) { } private CompletionStage wrapAsyncRequest(Statement request) { - AgentSpan span = startSpan("cassandra", OPERATION_NAME); + AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, getDelegate()); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java index f40d80f12a7..4f4399b01d8 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.hazelcast36.DistributedObjectDecorator.DECORATE; +import static datadog.trace.instrumentation.hazelcast36.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast36.HazelcastConstants.SPAN_NAME; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -197,7 +198,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); + final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, that, methodName); @@ -256,7 +257,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); + final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, that, methodName); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java index 1f5978b32cc..a3783b1fbb2 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.hazelcast39.ClientInvocationDecorator.DECORATE; +import static datadog.trace.instrumentation.hazelcast39.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast39.HazelcastConstants.SPAN_NAME; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -68,7 +69,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); + final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME); DECORATE.onHazelcastInstance( span, InstrumentationContext.get(ClientInvocation.class, String.class).get(that)); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java index 0615f9967b4..d2b9df11b19 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.hazelcast4.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast4.HazelcastConstants.SPAN_NAME; import static datadog.trace.instrumentation.hazelcast4.HazelcastDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -59,7 +60,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan("hazelcast-sdk", SPAN_NAME); + final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME); DECORATE.afterStart(span); DECORATE.onServiceExecution(span, operationName, null, correlationId); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java index 30e2abfb890..facb9a4e8c4 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.hazelcast4.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast4.HazelcastDecorator.DECORATE; import com.hazelcast.client.impl.protocol.ClientMessage; @@ -36,7 +37,7 @@ public static AgentScope methodEnter( return null; } - final AgentSpan span = startSpan("hazelcast-sdk", HazelcastConstants.SPAN_NAME); + final AgentSpan span = startSpan(COMPONENT_NAME.toString(), HazelcastConstants.SPAN_NAME); span.setTag( HazelcastConstants.HAZELCAST_INSTANCE, diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java index 623fb485a26..fc93e1c8edd 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java @@ -89,16 +89,16 @@ public static AgentScope onEnter(@Advice.This final Statement statement) { span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start(); span.setTag(DBM_TRACE_INJECTED, true); } else if (DECORATE.isPostgres(dbInfo) && DBM_TRACE_PREPARED_STATEMENTS) { - span = startSpan("jdbc", DATABASE_QUERY); + span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY); DECORATE.setApplicationName(span, connection); } else if (DECORATE.isOracle(dbInfo)) { - span = startSpan("jdbc", DATABASE_QUERY); + span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY); DECORATE.setAction(span, connection); } else { - span = startSpan("jdbc", DATABASE_QUERY); + span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY); } } else { - span = startSpan("jdbc", DATABASE_QUERY); + span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY); } DECORATE.afterStart(span); DECORATE.onConnection(span, dbInfo); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java index e20c2ce931f..816d9b6f86d 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.jdbc.PoolWaitingDecorator.DECORATE; +import static datadog.trace.instrumentation.jdbc.PoolWaitingDecorator.JAVA_JDBC_POOL_WAITING; import static datadog.trace.instrumentation.jdbc.PoolWaitingDecorator.POOL_WAITING; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; @@ -51,7 +52,7 @@ public static class PollFirstAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentSpan onEnter() { if (CallDepthThreadLocalMap.getCallDepth(PoolWaitingDecorator.class) > 0) { - AgentSpan span = startSpan("jdbc", POOL_WAITING); + AgentSpan span = startSpan(JAVA_JDBC_POOL_WAITING.toString(), POOL_WAITING); DECORATE.afterStart(span); span.setResourceName("dbcp2.waiting"); return span; diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java index 77f2df719b7..bc60aeb15cb 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Tags.DB_POOL_NAME; import static datadog.trace.instrumentation.jdbc.PoolWaitingDecorator.DECORATE; +import static datadog.trace.instrumentation.jdbc.PoolWaitingDecorator.JAVA_JDBC_POOL_WAITING; import static datadog.trace.instrumentation.jdbc.PoolWaitingDecorator.POOL_WAITING; import static java.util.Collections.singletonMap; @@ -88,7 +89,10 @@ public static void stopSpan( @Advice.Thrown final Throwable throwable) { if (HikariBlockedTracker.wasBlocked()) { final AgentSpan span = - startSpan("jdbc", POOL_WAITING, TimeUnit.MILLISECONDS.toMicros(startTimeMillis)); + startSpan( + JAVA_JDBC_POOL_WAITING.toString(), + POOL_WAITING, + TimeUnit.MILLISECONDS.toMicros(startTimeMillis)); DECORATE.afterStart(span); DECORATE.onError(span, throwable); span.setResourceName("hikari.waiting"); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index a406f517c57..5e565470572 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -100,13 +100,13 @@ public static AgentScope onEnter( // we then force that pre-determined span ID for the span covering the actual query span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start(); } else if (isOracle) { - span = startSpan("jdbc", DATABASE_QUERY); + span = startSpan("java-jdbc-statement", DATABASE_QUERY); DECORATE.setAction(span, connection); } else { - span = startSpan("jdbc", DATABASE_QUERY); + span = startSpan("java-jdbc-statement", DATABASE_QUERY); } } else { - span = startSpan("jdbc", DATABASE_QUERY); + span = startSpan("java-jdbc-statement", DATABASE_QUERY); } DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index ee2123a0a7c..a24f12030ac 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.jedis.JedisClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.jedis.JedisClientDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.not; @@ -64,7 +65,8 @@ public static AgentScope onEnter( if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) { return null; } - final AgentSpan span = startSpan("jedis", JedisClientDecorator.OPERATION_NAME); + final AgentSpan span = + startSpan(COMPONENT_NAME.toString(), JedisClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, thiz); DECORATE.onStatement(span, command.name()); diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java index 4ceddad42fb..371e84a784a 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java @@ -56,7 +56,7 @@ public static AgentScope onEnter( if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) { return null; } - final AgentSpan span = startSpan("jedis", JedisClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redis-command", JedisClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, thiz); diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java index 69da40a5948..24350a6a3a6 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java @@ -56,7 +56,7 @@ public static class JedisAdvice { public static AgentScope onEnter( @Advice.Argument(0) final CommandObject commandObject, @Advice.This final Connection thiz) { - final AgentSpan span = startSpan("jedis", JedisClientDecorator.OPERATION_NAME); + final AgentSpan span = startSpan("redis-command", JedisClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, thiz); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java index ba6836e3826..921696fb964 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java @@ -11,6 +11,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.lettuce4.LettuceClientDecorator.DECORATE; +import static datadog.trace.instrumentation.lettuce4.LettuceClientDecorator.REDIS_CLIENT; import com.lambdaworks.redis.RedisURI; import com.lambdaworks.redis.protocol.AsyncCommand; @@ -34,7 +35,8 @@ public final class InstrumentationPoints { public static AgentScope beforeCommand( final RedisCommand command, final RedisURI redisURI) { - final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = + startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, redisURI); DECORATE.onCommand(span, command); @@ -73,7 +75,8 @@ public static void afterCommand( } public static AgentScope beforeConnect(final RedisURI redisURI) { - final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = + startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection(span, redisURI); span.setResourceName(DECORATE.resourceNameForConnection(redisURI)); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java index b2473d9df52..fd9c335af54 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java @@ -15,7 +15,9 @@ public class ConnectionFutureAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter(@Advice.Argument(1) final RedisURI redisUri) { - final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = + startSpan( + LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); span.setResourceName(DECORATE.resourceNameForConnection(redisUri)); DECORATE.onConnection(span, redisUri); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java index e5bef852de5..8c201abd048 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java @@ -22,7 +22,9 @@ public static AgentScope onEnter( @Advice.Argument(0) final RedisCommand command, @Advice.This final AbstractRedisAsyncCommands thiz) { - final AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); + final AgentSpan span = + startSpan( + LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onConnection( span, diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java index 070427beb11..32333a81cd2 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java @@ -43,7 +43,9 @@ public static State beforeSubscribe( if (parentSpan != null) { parentScope = activateSpan(parentSpan); } - AgentSpan span = startSpan("lettuce", LettuceClientDecorator.OPERATION_NAME); + AgentSpan span = + startSpan( + LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); InstrumentationContext.get(RedisCommand.class, AgentSpan.class).put(subscriptionCommand, span); DECORATE.afterStart(span); if (state != null && state.connection != null) { diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java index c6e21258171..47106e41cc0 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java @@ -7,6 +7,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getRootContext; +import static datadog.trace.instrumentation.springmessaging.SpringMessageDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.springmessaging.SpringMessageDecorator.DECORATE; import static datadog.trace.instrumentation.springmessaging.SpringMessageDecorator.SPRING_INBOUND; import static datadog.trace.instrumentation.springmessaging.SpringMessageExtractAdapter.GETTER; @@ -80,7 +81,7 @@ public static class HandleMessageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter(@Advice.This InvocableHandlerMethod thiz) { - AgentSpan span = startSpan("spring-messaging", SPRING_INBOUND); + AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPRING_INBOUND); DECORATE.afterStart(span); span.setResourceName(DECORATE.spanNameForMethod(thiz.getMethod())); return activateSpan(span); diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy index 8c355948632..b8d5d355b6c 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy @@ -114,7 +114,6 @@ class TagsAssert { assert tags[Tags.COMPONENT].toString() == tags[DDTags.DD_INTEGRATION].toString() } String capturedInstrumentationName = INSTRUMENTATION_NAMES.remove(spanId) - System.err.println("CAPTURED $capturedInstrumentationName") if (capturedInstrumentationName != null && capturedInstrumentationName != "test" && tags[DDTags.DD_INTEGRATION] != null) { assert tags[DDTags.DD_INTEGRATION].toString() == capturedInstrumentationName : "DD_INTEGRATION '${tags[DDTags.DD_INTEGRATION]}' != instrumentationName '${capturedInstrumentationName}' passed to startSpan()" From 70e7c698551999bcb1a9d57edbc425d1310e9c6a Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 24 Apr 2026 16:56:49 +0200 Subject: [PATCH 8/8] fixes --- .../instrumentation/decorator/HttpServerDecorator.java | 2 +- .../armeria/grpc/client/GrpcClientDecorator.java | 2 +- .../datanucleus/ExecutionContextInstrumentation.java | 9 +++++---- .../datanucleus/JDOQueryInstrumentation.java | 5 +++-- .../datanucleus/JDOTransactionInstrumentation.java | 3 ++- .../instrumentation/grpc/client/GrpcClientDecorator.java | 2 +- .../grpc/client/MessagesAvailableInstrumentation.java | 3 ++- .../grpc/server/TracingServerInterceptor.java | 6 ++++-- .../instrumentation/hibernate/SessionMethodUtils.java | 2 +- .../core/v3_3/SessionFactoryInstrumentation.java | 2 +- .../core/v4_0/SessionFactoryInstrumentation.java | 2 +- .../netty38/client/HttpClientRequestTracingHandler.java | 3 ++- .../netty40/client/HttpClientRequestTracingHandler.java | 3 ++- .../netty41/client/HttpClientRequestTracingHandler.java | 3 ++- .../datadog/trace/instrumentation/play23/PlayAdvice.java | 3 ++- .../datadog/trace/instrumentation/play24/PlayAdvice.java | 3 ++- .../datadog/trace/instrumentation/play26/PlayAdvice.java | 3 ++- .../rabbitmq/amqp/RabbitChannelInstrumentation.java | 5 +++-- .../instrumentation/rabbitmq/amqp/RabbitDecorator.java | 4 ++-- .../servlet3/AsyncContextInstrumentation.java | 4 +++- .../dispatcher/RequestDispatcherInstrumentation.java | 6 +++++- .../servlet/filter/FilterInstrumentation.java | 3 ++- .../servlet/http/HttpServletResponseInstrumentation.java | 3 ++- .../sofarpc/AbstractClusterInstrumentation.java | 2 +- .../sofarpc/ProviderProxyInvokerInstrumentation.java | 4 ++-- 25 files changed, 54 insertions(+), 33 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java index cd17c39ddc6..31ebacedec8 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java @@ -166,7 +166,7 @@ public Context extract(REQUEST_CARRIER carrier) { * @return A new context bundling the span, child of the given parent context. */ public Context startSpan(REQUEST_CARRIER carrier, Context parentContext) { - String instrumentationName = primaryInstrumentationName(); + String instrumentationName = component().toString(); AgentSpanContext extracted = getExtractedSpanContext(parentContext); // Call IG callbacks extracted = callIGCallbackStart(extracted); diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java index cfc1ca9f560..ef945048118 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java @@ -95,7 +95,7 @@ public AgentSpan startCall(MethodDescriptor method) { return AgentTracer.blackholeSpan(); } AgentSpan span = - startSpan("grpc", OPERATION_NAME) + startSpan(COMPONENT_NAME.toString(), OPERATION_NAME) .setTag("request.type", requestMessageType(method)) .setTag("response.type", responseMessageType(method)) // method.getServiceName() may not be available on some grpc versions diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java index 4f848d5fea4..573e51aff53 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java @@ -7,6 +7,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DATANUCLEUS_FIND_OBJECT; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DECORATE; +import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.JAVA_DATANUCLEUS; import static java.util.Collections.singleton; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -78,7 +79,7 @@ public static AgentScope startMethod( @Advice.This final ExecutionContext executionContext, @Advice.Origin("datanucleus.#m") final String operationName) { - final AgentSpan span = startSpan("datanucleus", operationName); + final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName); DECORATE.afterStart(span); return activateSpan(span); @@ -111,7 +112,7 @@ public static AgentScope startMethod( return null; } - final AgentSpan span = startSpan("datanucleus", operationName); + final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName); DECORATE.afterStart(span); return activateSpan(span); @@ -141,7 +142,7 @@ public static class FindWithStringClassnameAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope startMethod() { - final AgentSpan span = startSpan("datanucleus", DATANUCLEUS_FIND_OBJECT); + final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT); DECORATE.afterStart(span); return activateSpan(span); @@ -172,7 +173,7 @@ public static class FindWithClassAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope startMethod() { - final AgentSpan span = startSpan("datanucleus", DATANUCLEUS_FIND_OBJECT); + final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT); DECORATE.afterStart(span); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java index 7296879c5a8..1fec8683117 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DATANUCLEUS_QUERY_DELETE; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DATANUCLEUS_QUERY_EXECUTE; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DECORATE; +import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.JAVA_DATANUCLEUS; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import datadog.trace.agent.tooling.Instrumenter; @@ -56,8 +57,8 @@ public static AgentScope startExecute(@Advice.Origin("#m") final String methodNa final AgentSpan span = methodName.startsWith("execute") - ? startSpan("datanucleus", DATANUCLEUS_QUERY_EXECUTE) - : startSpan("datanucleus", DATANUCLEUS_QUERY_DELETE); + ? startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_QUERY_EXECUTE) + : startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_QUERY_DELETE); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java index 793138c8763..196da352374 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DECORATE; +import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.JAVA_DATANUCLEUS; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import datadog.trace.agent.tooling.Instrumenter; @@ -30,7 +31,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("datanucleus", operationName); + final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java index ce2c1e3ef25..94ca56566f9 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java @@ -98,7 +98,7 @@ public AgentSpan startCall(MethodDescriptor method) { return AgentTracer.blackholeSpan(); } AgentSpan span = - startSpan("grpc", OPERATION_NAME) + startSpan(COMPONENT_NAME.toString(), OPERATION_NAME) .setTag("request.type", requestMessageType(method)) .setTag("response.type", responseMessageType(method)) // method.getServiceName() may not be available on some grpc versions diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java index 40a386958d6..a967b00c170 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.DECORATE; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.GRPC_MESSAGE; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.OPERATION_NAME; @@ -55,7 +56,7 @@ public static AgentScope before() { AgentSpan clientSpan = activeSpan(); if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) { AgentSpan messageSpan = - startSpan("grpc", GRPC_MESSAGE) + startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE) .setTag("message.type", clientSpan.getTag("response.type")); DECORATE.afterStart(messageSpan); return activateSpan(messageSpan); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java index c954982b404..c259940dc87 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.grpc.server.GrpcExtractAdapter.GETTER; +import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.DECORATE; import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.GRPC_MESSAGE; import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.GRPC_SERVER; @@ -67,7 +68,8 @@ public ServerCall.Listener interceptCall( spanContext = callIGCallbackRequestStarted(tracer, spanContext); CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC); - final AgentSpan span = startSpan("grpc", GRPC_SERVER, spanContext).setMeasured(true); + final AgentSpan span = + startSpan(COMPONENT_NAME.toString(), GRPC_SERVER, spanContext).setMeasured(true); AgentTracer.get() .getDataStreamsMonitoring() @@ -143,7 +145,7 @@ static final class TracingServerCallListener @Override public void onMessage(final ReqT message) { final AgentSpan msgSpan = - startSpan("grpc", GRPC_MESSAGE, this.span.context()) + startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.context()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); try (AgentScope scope = activateSpan(msgSpan)) { diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java index 4397678f693..2b95ae67ea9 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java @@ -42,7 +42,7 @@ public static SessionState startScopeFrom( final AgentScope scope; if (createSpan) { final AgentSpan span = - startSpan("hibernate-core", operationName, sessionState.getSessionSpan().context()); + startSpan("java-hibernate", operationName, sessionState.getSessionSpan().context()); DECORATOR.afterStart(span); DECORATOR.onOperation(span, entity); scope = activateSpan(span); diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java index 9b0867a516f..ade78a85eed 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java @@ -57,7 +57,7 @@ public static class SessionFactoryAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void openSession(@Advice.Return final Object session) { - final AgentSpan span = startSpan("hibernate-core", HIBERNATE_SESSION); + final AgentSpan span = startSpan("java-hibernate", HIBERNATE_SESSION); DECORATOR.afterStart(span); DECORATOR.onConnection(span, session); diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java index 1e17b921400..66b2910d592 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java @@ -51,7 +51,7 @@ public static class SessionFactoryAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void openSession(@Advice.Return final SharedSessionContract session) { - final AgentSpan span = startSpan("hibernate-core", HIBERNATE_SESSION); + final AgentSpan span = startSpan("java-hibernate", HIBERNATE_SESSION); DECORATOR.afterStart(span); DECORATOR.onConnection(span, session); diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java index 6c008148c12..7a5ae7d1dff 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.DECORATE_SECURE; +import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.NETTY_CLIENT; import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.NETTY_CLIENT_REQUEST; import static datadog.trace.instrumentation.netty38.client.NettyResponseInjectAdapter.SETTER; @@ -54,7 +55,7 @@ public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent m boolean isSecure = ctx.getPipeline().get("sslHandler") != null; NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE; - final AgentSpan span = startSpan("netty", NETTY_CLIENT_REQUEST); + final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); try (final AgentScope scope = activateSpan(span)) { decorate.afterStart(span); decorate.onRequest(span, request); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java index cd000aaead4..fc20990ffc8 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java @@ -10,6 +10,7 @@ import static datadog.trace.instrumentation.netty40.AttributeKeys.CONTEXT_ATTRIBUTE_KEY; import static datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator.DECORATE_SECURE; +import static datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator.NETTY_CLIENT; import static datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator.NETTY_CLIENT_REQUEST; import static datadog.trace.instrumentation.netty40.client.NettyResponseInjectAdapter.SETTER; @@ -77,7 +78,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann boolean isSecure = SSL_HANDLER != null && ctx.pipeline().get(SSL_HANDLER) != null; NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE; - final AgentSpan span = startSpan("netty", NETTY_CLIENT_REQUEST); + final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); final Context context = getCurrentContext().with(span); try (final AgentScope scope = activateSpan(span)) { decorate.afterStart(span); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java index 89e6f151bff..6c35a87edbb 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java @@ -10,6 +10,7 @@ import static datadog.trace.instrumentation.netty41.AttributeKeys.CONTEXT_ATTRIBUTE_KEY; import static datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator.DECORATE_SECURE; +import static datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator.NETTY_CLIENT; import static datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator.NETTY_CLIENT_REQUEST; import static datadog.trace.instrumentation.netty41.client.NettyResponseInjectAdapter.SETTER; @@ -78,7 +79,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann boolean isSecure = SSL_HANDLER != null && ctx.pipeline().get(SSL_HANDLER) != null; NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE; - final AgentSpan span = startSpan("netty", NETTY_CLIENT_REQUEST); + final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); final Context context = getCurrentContext().with(span); try (final AgentScope scope = activateSpan(span)) { decorate.afterStart(span); diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java index fdb8cef5f9a..8532f467fa5 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java +++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getRootContext; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext; import static datadog.trace.instrumentation.play23.PlayHttpServerDecorator.DECORATE; +import static datadog.trace.instrumentation.play23.PlayHttpServerDecorator.PLAY_ACTION; import static datadog.trace.instrumentation.play23.PlayHttpServerDecorator.PLAY_REQUEST; import static datadog.trace.instrumentation.play23.PlayHttpServerDecorator.REPORT_HTTP_STATUS; @@ -32,7 +33,7 @@ public static ContextScope onEnter(@Advice.Argument(0) final Request req) { } else { // An upstream framework (e.g. akka-http, netty) has already started the span. // Do not extract the context. - span = startSpan("play", PLAY_REQUEST); + span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST); span.setMeasured(true); scope = span.attachWithCurrent(); } diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java index 0ef4a00ea88..d606525c005 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java +++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getRootContext; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext; import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.DECORATE; +import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.PLAY_ACTION; import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.PLAY_REQUEST; import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.REPORT_HTTP_STATUS; @@ -38,7 +39,7 @@ public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false) } else { // An upstream framework (e.g. akka-http, netty) has already started the span. // Do not extract the context. - span = startSpan("play", PLAY_REQUEST); + span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST); span.setMeasured(true); scope = span.attachWithCurrent(); } diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java index 77c2ca78b61..69817724163 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java +++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getRootContext; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext; import static datadog.trace.instrumentation.play26.PlayHttpServerDecorator.DECORATE; +import static datadog.trace.instrumentation.play26.PlayHttpServerDecorator.PLAY_ACTION; import static datadog.trace.instrumentation.play26.PlayHttpServerDecorator.PLAY_REQUEST; import datadog.context.Context; @@ -40,7 +41,7 @@ public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false) // An upstream framework (e.g. akka-http, netty) has already started the span. // Do not extract the context. parentContext = getRootContext(); - span = startSpan("play", PLAY_REQUEST); + span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST); scope = span.attachWithCurrent(); } diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java index e86df471b0f..c8beb8c4863 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java @@ -18,6 +18,7 @@ import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.OPERATION_AMQP_COMMAND; import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.OPERATION_AMQP_OUTBOUND; import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.PRODUCER_DECORATE; +import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.RABBITMQ_AMQP; import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.TIME_IN_QUEUE_ENABLED; import static datadog.trace.instrumentation.rabbitmq.amqp.TextMapInjectAdapter.SETTER; import static net.bytebuddy.matcher.ElementMatchers.canThrow; @@ -129,7 +130,7 @@ public static AgentScope onEnter( final Connection connection = channel.getConnection(); - final AgentSpan span = startSpan("rabbitmq", OPERATION_AMQP_COMMAND); + final AgentSpan span = startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_COMMAND); span.setResourceName(method); CLIENT_DECORATE.setPeerPort(span, connection.getPort()); CLIENT_DECORATE.afterStart(span); @@ -166,7 +167,7 @@ public static AgentScope setResourceNameAddHeaders( final Connection connection = channel.getConnection(); - final AgentSpan span = startSpan("rabbitmq", OPERATION_AMQP_OUTBOUND); + final AgentSpan span = startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_OUTBOUND); PRODUCER_DECORATE.setPeerPort(span, connection.getPort()); PRODUCER_DECORATE.afterStart(span); PRODUCER_DECORATE.onPeerConnection(span, connection.getAddress()); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java index 8eb44ca6309..78703cf9790 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java @@ -224,7 +224,7 @@ public static AgentScope startReceivingSpan( queueStartMillis = Math.min(spanStartMillis, queueStartMillis); queueSpan = startSpan( - "rabbitmq", + RABBITMQ_AMQP.toString(), OPERATION_AMQP_DELIVER, parentContext, TimeUnit.MILLISECONDS.toMicros(queueStartMillis)); @@ -236,7 +236,7 @@ public static AgentScope startReceivingSpan( // spans are written out together by the TraceStructureWriter when running in strict mode } final AgentSpan span = - startSpan("rabbitmq", OPERATION_AMQP_INBOUND, parentContext, spanStartMicros); + startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_INBOUND, parentContext, spanStartMicros); if (null != body) { span.setTag("message.size", body.length); diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java index 748b81b3dde..afb9e2a0859 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java @@ -10,6 +10,7 @@ import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_CONTEXT_ATTRIBUTE; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_DISPATCH_SPAN_ATTRIBUTE; import static datadog.trace.instrumentation.servlet3.AsyncDispatcherDecorator.DECORATE; +import static datadog.trace.instrumentation.servlet3.AsyncDispatcherDecorator.JAVA_WEB_SERVLET_DISPATCHER; import static datadog.trace.instrumentation.servlet3.Servlet3Decorator.DD_CONTEXT_PATH_ATTRIBUTE; import static datadog.trace.instrumentation.servlet3.Servlet3Decorator.DD_SERVLET_PATH_ATTRIBUTE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -96,7 +97,8 @@ public static boolean enter( return true; } - final AgentSpan span = startSpan("servlet", SERVLET_DISPATCH, parent.context()); + final AgentSpan span = + startSpan(JAVA_WEB_SERVLET_DISPATCHER.toString(), SERVLET_DISPATCH, parent.context()); // This span should get finished by Servlet3Advice // However, when using Jetty without servlets (directly org.eclipse.jetty.server.Handler), // that's not the case (see jetty's HandleAdvice) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java index 60835aa76b0..f112ba27f41 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java @@ -16,6 +16,7 @@ import static datadog.trace.instrumentation.servlet.dispatcher.RequestDispatcherDecorator.DD_CONTEXT_PATH_ATTRIBUTE; import static datadog.trace.instrumentation.servlet.dispatcher.RequestDispatcherDecorator.DD_SERVLET_PATH_ATTRIBUTE; import static datadog.trace.instrumentation.servlet.dispatcher.RequestDispatcherDecorator.DECORATE; +import static datadog.trace.instrumentation.servlet.dispatcher.RequestDispatcherDecorator.JAVA_WEB_SERVLET_DISPATCHER; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -110,7 +111,10 @@ public static ContextScope start( } final AgentSpan span = - startSpan("servlet", SPAN_NAME_CACHE.computeIfAbsent(method, SERVLET_PREFIX), parent); + startSpan( + JAVA_WEB_SERVLET_DISPATCHER.toString(), + SPAN_NAME_CACHE.computeIfAbsent(method, SERVLET_PREFIX), + parent); DECORATE.afterStart(span); span.setTag(SERVLET_CONTEXT, request.getAttribute(DD_CONTEXT_PATH_ATTRIBUTE)); span.setTag(SERVLET_PATH, request.getAttribute(DD_SERVLET_PATH_ATTRIBUTE)); diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java index 3608c7e4190..cab293136c0 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.servlet.filter.FilterDecorator.DECORATE; +import static datadog.trace.instrumentation.servlet.filter.FilterDecorator.JAVA_WEB_SERVLET_FILTER; import static datadog.trace.instrumentation.servlet.filter.FilterDecorator.SERVLET_FILTER; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -68,7 +69,7 @@ public static AgentScope start(@Advice.This final Filter filter) { return null; } - final AgentSpan span = startSpan("servlet", SERVLET_FILTER); + final AgentSpan span = startSpan(JAVA_WEB_SERVLET_FILTER.toString(), SERVLET_FILTER); DECORATE.afterStart(span); // Here we use "this" instead of "the method target" to distinguish abstract filter instances. diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java index 41b42e22655..10e6c530212 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java @@ -7,6 +7,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.servlet.http.HttpServletResponseDecorator.DECORATE; +import static datadog.trace.instrumentation.servlet.http.HttpServletResponseDecorator.JAVA_WEB_SERVLET_RESPONSE; import static datadog.trace.instrumentation.servlet.http.HttpServletResponseDecorator.SERVLET_RESPONSE; import com.google.auto.service.AutoService; @@ -67,7 +68,7 @@ public static AgentScope start( return null; } - final AgentSpan span = startSpan("servlet", SERVLET_RESPONSE); + final AgentSpan span = startSpan(JAVA_WEB_SERVLET_RESPONSE.toString(), SERVLET_RESPONSE); DECORATE.afterStart(span); span.setResourceName(DECORATE.spanNameForMethod(HttpServletResponse.class, method)); diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java index 947bb1efe6e..798de2632dd 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java @@ -44,7 +44,7 @@ public static AgentScope enter( @Advice.This AbstractCluster self, @Advice.Argument(0) SofaRequest request) { ConsumerConfig config = self.getConsumerConfig(); String protocol = config != null ? config.getProtocol() : null; - AgentSpan span = startSpan("sofarpc", SOFA_RPC_CLIENT); + AgentSpan span = startSpan("sofarpc-client", SOFA_RPC_CLIENT); DECORATE.afterStart(span); DECORATE.onRequest(span, request); if (protocol != null) { diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java index 16b696fd0e7..18c0650bd3f 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java @@ -53,8 +53,8 @@ public static AgentScope enter(@Advice.Argument(0) SofaRequest request) { AgentSpanContext parentContext = extractContextAndGetSpanContext(request, GETTER); AgentSpan span = parentContext != null - ? startSpan("sofarpc", SOFA_RPC_SERVER, parentContext) - : startSpan("sofarpc", SOFA_RPC_SERVER); + ? startSpan("sofarpc-server", SOFA_RPC_SERVER, parentContext) + : startSpan("sofarpc-server", SOFA_RPC_SERVER); DECORATE.afterStart(span); DECORATE.onRequest(span, request); span.setTag("sofarpc.protocol", protocol);