Skip to content

Commit 07ec949

Browse files
bric3bric3
committed
chore(ccs): Use InstrumentationTags
1 parent a3832a0 commit 07ec949

File tree

12 files changed

+40
-29
lines changed

12 files changed

+40
-29
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import datadog.trace.api.datastreams.DataStreamsTags;
1616
import datadog.trace.api.naming.SpanNaming;
1717
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
18+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
1819
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
1920
import datadog.trace.bootstrap.instrumentation.api.Tags;
2021
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
@@ -116,7 +117,7 @@ public AgentSpan onClose(final AgentSpan span, final Status status) {
116117

117118
span.setTag("status.code", status.getCode().name());
118119
span.setTag("grpc.status.code", status.getCode().name());
119-
span.setTag("rpc.grpc.status_code", status.getCode().value());
120+
span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
120121
span.setTag("status.description", status.getDescription());
121122

122123
// TODO why is there a mismatch between client / server for calling the onError method?

‎dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import datadog.trace.api.naming.SpanNaming;
1010
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1111
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
12+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
1213
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
1314
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
1415
import datadog.trace.bootstrap.instrumentation.decorator.ServerDecorator;
@@ -97,7 +98,7 @@ public <RespT, ReqT> AgentSpan onCall(final AgentSpan span, ServerCall<ReqT, Res
9798
public AgentSpan onStatus(final AgentSpan span, final Status status) {
9899
span.setTag("status.code", status.getCode().name());
99100
span.setTag("grpc.status.code", status.getCode().name());
100-
span.setTag("rpc.grpc.status_code", status.getCode().value());
101+
span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
101102
span.setTag("status.description", status.getDescription());
102103
return span.setError(
103104
SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);

‎dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.linecorp.armeria.server.grpc.GrpcService
77
import com.linecorp.armeria.testing.junit4.server.ServerRule
88
import datadog.trace.agent.test.naming.VersionedNamingTestBase
99
import datadog.trace.api.DDSpanTypes
10+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
1011
import datadog.trace.bootstrap.instrumentation.api.Tags
1112
import example.GreeterGrpc
1213
import example.Helloworld
@@ -178,7 +179,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
178179
"$Tags.RPC_SERVICE" "example.Greeter"
179180
"status.code" "OK"
180181
"grpc.status.code" "OK"
181-
"rpc.grpc.status_code" 0
182+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
182183
"request.type" "example.Helloworld\$Response"
183184
"response.type" "example.Helloworld\$Response"
184185
peerServiceFrom(Tags.RPC_SERVICE)
@@ -216,7 +217,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
216217
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
217218
"status.code" "OK"
218219
"grpc.status.code" "OK"
219-
"rpc.grpc.status_code" 0
220+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
220221
defaultTags(true)
221222
}
222223
}

‎dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import datadog.trace.api.gateway.RequestContext
1818
import datadog.trace.api.gateway.RequestContextSlot
1919
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation
2020
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
21+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
2122
import datadog.trace.bootstrap.instrumentation.api.Tags
2223
import datadog.trace.core.datastreams.StatsGroup
2324
import datadog.trace.instrumentation.armeria.grpc.server.GrpcExtractAdapter
@@ -182,7 +183,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
182183
"$Tags.RPC_SERVICE" "example.Greeter"
183184
"status.code" "OK"
184185
"grpc.status.code" "OK"
185-
"rpc.grpc.status_code" 0
186+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
186187
"request.type" "example.Helloworld\$Request"
187188
"response.type" "example.Helloworld\$Response"
188189
if ({ isDataStreamsEnabled() }) {
@@ -222,7 +223,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
222223
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
223224
"status.code" "OK"
224225
"grpc.status.code" "OK"
225-
"rpc.grpc.status_code" 0
226+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
226227
if ({ isDataStreamsEnabled() }) {
227228
"$DDTags.PATHWAY_HASH" { String }
228229
}
@@ -321,7 +322,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
321322
"$Tags.RPC_SERVICE" "example.Greeter"
322323
"status.code" "${status.code.name()}"
323324
"grpc.status.code" "${status.code.name()}"
324-
"rpc.grpc.status_code" status.code.value()
325+
"$InstrumentationTags.GRPC_STATUS_CODE" status.code.value()
325326
"status.description" description
326327
"request.type" "example.Helloworld\$Request"
327328
"response.type" "example.Helloworld\$Response"
@@ -346,7 +347,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
346347
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
347348
"status.code" "${status.code.name()}"
348349
"grpc.status.code" "${status.code.name()}"
349-
"rpc.grpc.status_code" status.code.value()
350+
"$InstrumentationTags.GRPC_STATUS_CODE" status.code.value()
350351
"status.description" description
351352
"canceled" { true } // 1.0.0 handles cancellation incorrectly so accesting any value
352353
if (status.cause != null) {
@@ -436,7 +437,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
436437
"$Tags.RPC_SERVICE" "example.Greeter"
437438
"status.code" status.code.name()
438439
"grpc.status.code" status.code.name()
439-
"rpc.grpc.status_code" status.code.value()
440+
"$InstrumentationTags.GRPC_STATUS_CODE" status.code.value()
440441
if (status.description != null) {
441442
"status.description" status.description
442443
}
@@ -464,7 +465,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
464465
errorTags error.class, error.message
465466
"status.code" "${status.code.name()}"
466467
"grpc.status.code" "${status.code.name()}"
467-
"rpc.grpc.status_code" status.code.value()
468+
"$InstrumentationTags.GRPC_STATUS_CODE" status.code.value()
468469
"status.description" { it == null || String}
469470
"canceled" { true } // 1.0.0 handles cancellation incorrectly so accesting any value
470471
if ({ isDataStreamsEnabled() }) {
@@ -580,7 +581,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
580581
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
581582
"status.code" "OK"
582583
"grpc.status.code" "OK"
583-
"rpc.grpc.status_code" 0
584+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
584585
if ({ isDataStreamsEnabled() }) {
585586
"$DDTags.PATHWAY_HASH" { String }
586587
}
@@ -657,7 +658,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
657658
"$Tags.RPC_SERVICE" "example.Greeter"
658659
"status.code" "OK"
659660
"grpc.status.code" "OK"
660-
"rpc.grpc.status_code" 0
661+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
661662
"request.type" "example.Helloworld\$Request"
662663
"response.type" "example.Helloworld\$Response"
663664
if ({ isDataStreamsEnabled() }) {

‎dd-java-agent/instrumentation/google-pubsub-1.116/src/test/groovy/PubSubTest.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import datadog.trace.api.DDSpanTypes
2727
import datadog.trace.api.DDTags
2828
import datadog.trace.api.config.GeneralConfig
2929
import datadog.trace.api.config.TraceInstrumentationConfig
30+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
3031
import datadog.trace.bootstrap.instrumentation.api.Tags
3132
import datadog.trace.core.DDSpan
3233
import datadog.trace.core.datastreams.StatsGroup
@@ -284,7 +285,7 @@ abstract class PubSubTest extends VersionedNamingTestBase {
284285
"$Tags.RPC_SERVICE" { String }
285286
"status.code" { String }
286287
"grpc.status.code" { String }
287-
"rpc.grpc.status_code" { Integer }
288+
"$InstrumentationTags.GRPC_STATUS_CODE" { Integer }
288289
if ({ isDataStreamsEnabled() }) {
289290
"$DDTags.PATHWAY_HASH" { String }
290291
}

‎dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import datadog.trace.api.datastreams.DataStreamsContext;
1717
import datadog.trace.api.naming.SpanNaming;
1818
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
19+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
1920
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
2021
import datadog.trace.bootstrap.instrumentation.api.Tags;
2122
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
@@ -116,7 +117,7 @@ public <C> void injectContext(Context context, final C request, CarrierSetter<C>
116117
public AgentSpan onClose(final AgentSpan span, final Status status) {
117118
span.setTag("status.code", status.getCode().name());
118119
span.setTag("grpc.status.code", status.getCode().name());
119-
span.setTag("rpc.grpc.status_code", status.getCode().value());
120+
span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
120121
span.setTag("status.description", status.getDescription());
121122

122123
// TODO why is there a mismatch between client / server for calling the onError method?

‎dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import datadog.trace.api.naming.SpanNaming;
1111
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1212
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
13+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
1314
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
1415
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
1516
import datadog.trace.bootstrap.instrumentation.decorator.ServerDecorator;
@@ -98,7 +99,7 @@ public <RespT, ReqT> AgentSpan onCall(final AgentSpan span, ServerCall<ReqT, Res
9899
public AgentSpan onStatus(final AgentSpan span, final Status status) {
99100
span.setTag("status.code", status.getCode().name());
100101
span.setTag("grpc.status.code", status.getCode().name());
101-
span.setTag("rpc.grpc.status_code", status.getCode().value());
102+
span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
102103
span.setTag("status.description", status.getDescription());
103104
return span.setError(
104105
SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);

‎dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.google.common.util.concurrent.MoreExecutors
22
import datadog.trace.agent.test.naming.VersionedNamingTestBase
33
import datadog.trace.api.DDSpanTypes
4+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
45
import datadog.trace.bootstrap.instrumentation.api.Tags
56
import example.GreeterGrpc
67
import example.Helloworld
@@ -162,7 +163,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
162163
"$Tags.RPC_SERVICE" "example.Greeter"
163164
"status.code" "OK"
164165
"grpc.status.code" "OK"
165-
"rpc.grpc.status_code" 0
166+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
166167
"request.type" "example.Helloworld\$Response"
167168
"response.type" "example.Helloworld\$Response"
168169
peerServiceFrom(Tags.RPC_SERVICE)
@@ -199,7 +200,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
199200
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
200201
"status.code" "OK"
201202
"grpc.status.code" "OK"
202-
"rpc.grpc.status_code" 0
203+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
203204
defaultTags(true)
204205
}
205206
}

‎dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import datadog.trace.api.gateway.RequestContext
1313
import datadog.trace.api.gateway.RequestContextSlot
1414
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation
1515
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
16+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
1617
import datadog.trace.bootstrap.instrumentation.api.Tags
1718
import datadog.trace.core.datastreams.StatsGroup
1819
import datadog.trace.instrumentation.grpc.server.GrpcExtractAdapter
@@ -173,7 +174,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
173174
"$Tags.PEER_PORT" server.port
174175
"status.code" "OK"
175176
"grpc.status.code" "OK"
176-
"rpc.grpc.status_code" 0
177+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
177178
"request.type" "example.Helloworld\$Request"
178179
"response.type" "example.Helloworld\$Response"
179180
if ({ isDataStreamsEnabled() }) {
@@ -213,7 +214,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
213214
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
214215
"status.code" "OK"
215216
"grpc.status.code" "OK"
216-
"rpc.grpc.status_code" 0
217+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
217218
if ({ isDataStreamsEnabled() }) {
218219
"$DDTags.PATHWAY_HASH" { String }
219220
}
@@ -319,7 +320,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
319320
"$Tags.RPC_SERVICE" "example.Greeter"
320321
"status.code" "${status.code.name()}"
321322
"grpc.status.code" "${status.code.name()}"
322-
"rpc.grpc.status_code" status.code.value()
323+
"$InstrumentationTags.GRPC_STATUS_CODE" status.code.value()
323324
"status.description" description
324325
"request.type" "example.Helloworld\$Request"
325326
"response.type" "example.Helloworld\$Response"
@@ -344,7 +345,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
344345
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
345346
"status.code" "${status.code.name()}"
346347
"grpc.status.code" "${status.code.name()}"
347-
"rpc.grpc.status_code" status.code.value()
348+
"$InstrumentationTags.GRPC_STATUS_CODE" status.code.value()
348349
"status.description" description
349350
if (status.cause != null) {
350351
errorTags status.cause.class, status.cause.message
@@ -428,7 +429,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
428429
"$Tags.PEER_PORT" server.port
429430
"status.code" "UNKNOWN"
430431
"grpc.status.code" "UNKNOWN"
431-
"rpc.grpc.status_code" 2
432+
"$InstrumentationTags.GRPC_STATUS_CODE" 2
432433
"request.type" "example.Helloworld\$Request"
433434
"response.type" "example.Helloworld\$Response"
434435
"status.description" { it == null || String}
@@ -453,7 +454,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
453454
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
454455
"status.code" "${status.code.name()}"
455456
"grpc.status.code" "${status.code.name()}"
456-
"rpc.grpc.status_code" status.code.value()
457+
"$InstrumentationTags.GRPC_STATUS_CODE" status.code.value()
457458
"status.description" { it == null || String}
458459
errorTags error.class, error.message
459460
if ({ isDataStreamsEnabled() }) {
@@ -560,7 +561,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
560561
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
561562
"status.code" "OK"
562563
"grpc.status.code" "OK"
563-
"rpc.grpc.status_code" 0
564+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
564565
if ({ isDataStreamsEnabled() }) {
565566
"$DDTags.PATHWAY_HASH" { String }
566567
}
@@ -628,7 +629,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
628629
"$Tags.RPC_SERVICE" "example.Greeter"
629630
"status.code" "OK"
630631
"grpc.status.code" "OK"
631-
"rpc.grpc.status_code" 0
632+
"$InstrumentationTags.GRPC_STATUS_CODE" 0
632633
"request.type" "example.Helloworld\$Request"
633634
"response.type" "example.Helloworld\$Response"
634635
if ({ isDataStreamsEnabled() }) {

‎dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import datadog.trace.api.WellKnownTags;
3131
import datadog.trace.api.cache.DDCache;
3232
import datadog.trace.api.cache.DDCaches;
33+
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
3334
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
3435
import datadog.trace.common.metrics.SignalItem.ReportSignal;
3536
import datadog.trace.common.writer.ddagent.DDAgentApi;
@@ -80,7 +81,6 @@ public final class ConflatingMetricsAggregator implements MetricsAggregator, Eve
8081
DDCaches.newFixedSizeCache(512),
8182
value -> UTF8BytesString.create(key + ":" + value));
8283
private static final CharSequence SYNTHETICS_ORIGIN = "synthetics";
83-
private static final String GRPC_STATUS_TAG = "rpc.grpc.status_code";
8484

8585
private static final Set<String> ELIGIBLE_SPAN_KINDS_FOR_METRICS =
8686
unmodifiableSet(
@@ -331,7 +331,7 @@ private boolean publish(CoreSpan<?> span, boolean isTopLevel, CharSequence spanK
331331
CharSequence spanType = span.getType();
332332
String grpcStatusCode = null;
333333
if (spanType != null && RPC.contentEquals(spanType)) {
334-
Object grpcStatusObj = span.unsafeGetTag(GRPC_STATUS_TAG);
334+
Object grpcStatusObj = span.unsafeGetTag(InstrumentationTags.GRPC_STATUS_CODE);
335335
grpcStatusCode = grpcStatusObj != null ? grpcStatusObj.toString() : null;
336336
}
337337
MetricKey newKey =

0 commit comments

Comments
 (0)