Skip to content

Commit fe1be81

Browse files
amarzialiamarziali
committed
batch change
1 parent 70e7c69 commit fe1be81

78 files changed

Lines changed: 181 additions & 104 deletions

File tree

Some content is hidden

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

‎dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void withMethod(final AgentSpan span, final String methodName) {
9494
}
9595

9696
public AgentSpan startAerospikeSpan(final String methodName) {
97-
final AgentSpan span = startSpan("aerospike", OPERATION_NAME);
97+
final AgentSpan span = startSpan(JAVA_AEROSPIKE.toString(), OPERATION_NAME);
9898
afterStart(span);
9999
withMethod(span, methodName);
100100
return span;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
77
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getCurrentContext;
88
import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST;
9+
import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.AKKA_HTTP_CLIENT;
910
import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.DECORATE;
1011
import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientHelpers.AkkaHttpHeaders;
1112
import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientHelpers.OnCompleteHandler;
@@ -77,7 +78,7 @@ public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpReque
7778
return null;
7879
}
7980

80-
final AgentSpan span = startSpan("akka-http", AKKA_CLIENT_REQUEST);
81+
final AgentSpan span = startSpan(AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
8182
DECORATE.afterStart(span);
8283
DECORATE.onRequest(span, request);
8384
return activateSpan(span);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
44
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
55
import static datadog.trace.instrumentation.akkahttp106.AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST;
6+
import static datadog.trace.instrumentation.akkahttp106.AkkaHttpClientDecorator.AKKA_HTTP_CLIENT;
67
import static datadog.trace.instrumentation.akkahttp106.AkkaHttpClientDecorator.DECORATE;
78

89
import akka.http.scaladsl.HttpExt;
@@ -22,7 +23,7 @@ public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpReque
2223
return null;
2324
}
2425

25-
final AgentSpan span = startSpan("akka-http", AKKA_CLIENT_REQUEST);
26+
final AgentSpan span = startSpan(AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
2627
DECORATE.afterStart(span);
2728
DECORATE.onRequest(span, request);
2829
return activateSpan(span);

‎dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/HTTPPluginAdvice.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class HTTPPluginAdvice {
1717

1818
@Advice.OnMethodEnter(suppress = Throwable.class)
1919
public static ContextScope onEnter(@Advice.Argument(value = 2) final Object serverTransaction) {
20-
final AgentSpan span = startSpan("axway-api", DECORATE.spanName()).setMeasured(true);
20+
final AgentSpan span = startSpan("axway-http", DECORATE.spanName()).setMeasured(true);
2121
DECORATE.afterStart(span);
2222
// serverTransaction is like request + connection in one object:
2323
DECORATE.onRequest(span, serverTransaction, serverTransaction, getRootContext());

‎dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
44
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
55
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
6+
import static datadog.trace.instrumentation.cics.CicsDecorator.CICS_CLIENT;
67
import static datadog.trace.instrumentation.cics.CicsDecorator.DECORATE;
78
import static datadog.trace.instrumentation.cics.CicsDecorator.ECI_EXECUTE_OPERATION;
89

@@ -36,7 +37,7 @@ public static AgentScope enter(@Advice.Argument(0) final Object spec) {
3637
return null;
3738
}
3839

39-
AgentSpan span = startSpan("cics", ECI_EXECUTE_OPERATION);
40+
AgentSpan span = startSpan(CICS_CLIENT.toString(), ECI_EXECUTE_OPERATION);
4041
DECORATE.afterStart(span);
4142
DECORATE.onECIInteraction(span, (ECIInteractionSpec) spec);
4243

‎dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
66
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
77
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
8+
import static datadog.trace.instrumentation.cics.CicsDecorator.CICS_CLIENT;
89
import static datadog.trace.instrumentation.cics.CicsDecorator.DECORATE;
910
import static datadog.trace.instrumentation.cics.CicsDecorator.GATEWAY_FLOW_OPERATION;
1011

@@ -53,7 +54,7 @@ public static AgentScope enter(
5354
}
5455

5556
// Not inside execute() - create a new span
56-
final AgentSpan span = startSpan("cics", GATEWAY_FLOW_OPERATION);
57+
final AgentSpan span = startSpan(CICS_CLIENT.toString(), GATEWAY_FLOW_OPERATION);
5758
DECORATE.afterStart(span);
5859
DECORATE.onConnection(span, strAddress, port, ipGateway);
5960
return activateSpan(span);

‎dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseOnSubscribe.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ public CouchbaseOnSubscribe(
3838
this.bucket = bucket;
3939
}
4040

41+
@Override
42+
protected String instrumentationName() {
43+
return "couchbase-client";
44+
}
45+
4146
@Override
4247
protected void afterStart(final AgentSpan span) {
4348
super.afterStart(span);

‎dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
66
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
77
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
8+
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.ELASTICSEARCH_JAVA;
89
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.OPERATION_NAME;
910
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1011
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -59,7 +60,7 @@ public static AgentScope onEnter(
5960
@Advice.Argument(1) final String endpoint,
6061
@Advice.Argument(value = 5, readOnly = false) ResponseListener responseListener) {
6162

62-
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
63+
final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
6364
DECORATE.afterStart(span);
6465
DECORATE.onRequest(span, method, endpoint, null, null);
6566

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
55
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
66
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
7+
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.ELASTICSEARCH_JAVA;
78
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.OPERATION_NAME;
89
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
910
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -57,7 +58,7 @@ public static AgentScope onEnter(
5758
@Advice.Argument(0) final Request request,
5859
@Advice.Argument(value = 1, readOnly = false) ResponseListener responseListener) {
5960

60-
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
61+
final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
6162
DECORATE.afterStart(span);
6263
DECORATE.onRequest(
6364
span,

‎dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
66
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
77
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
8+
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.ELASTICSEARCH_JAVA;
89
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.OPERATION_NAME;
910
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1011
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -74,7 +75,7 @@ public static AgentScope onEnter(
7475
@Advice.Argument(value = 1, readOnly = false, optional = true)
7576
ResponseListener responseListener) {
7677

77-
final AgentSpan span = startSpan("elasticsearch", OPERATION_NAME);
78+
final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
7879
DECORATE.afterStart(span);
7980
DECORATE.onRequest(
8081
span,

0 commit comments

Comments
 (0)