Skip to content

Commit dd4d89f

Browse files
trasktrask
committed
Fix RPC metrics tests for stable semconv
1 parent 8afaf2c commit dd4d89f

6 files changed

Lines changed: 213 additions & 208 deletions

File tree

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package io.opentelemetry.instrumentation.api.incubator.semconv.rpc;
77

8+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
9+
import static io.opentelemetry.instrumentation.testing.junit.rpc.SemconvRpcStabilityUtil.maybeStable;
810
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
911
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1012
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TRANSPORT;
@@ -40,16 +42,16 @@ void collectsMetrics() {
4042

4143
Attributes requestAttributes1 =
4244
Attributes.builder()
43-
.put(RPC_SYSTEM, "grpc")
44-
.put(RPC_SERVICE, "myservice.EchoService")
45+
.put(maybeStable(RPC_SYSTEM), "grpc")
46+
.put(RPC_SERVICE, emitStableRpcSemconv() ? null : "myservice.EchoService")
4547
.put(RPC_METHOD, "exampleMethod")
4648
.put(RpcSizeAttributesExtractor.RPC_REQUEST_SIZE, 10)
4749
.build();
4850

4951
Attributes requestAttributes2 =
5052
Attributes.builder()
51-
.put(RPC_SYSTEM, "grpc")
52-
.put(RPC_SERVICE, "myservice.EchoService")
53+
.put(maybeStable(RPC_SYSTEM), "grpc")
54+
.put(RPC_SERVICE, emitStableRpcSemconv() ? null : "myservice.EchoService")
5355
.put(RPC_METHOD, "exampleMethod")
5456
.build();
5557

@@ -99,8 +101,12 @@ void collectsMetrics() {
99101
point
100102
.hasSum(20 /* bytes */)
101103
.hasAttributesSatisfyingExactly(
102-
equalTo(RPC_SYSTEM, "grpc"),
103-
equalTo(RPC_SERVICE, "myservice.EchoService"),
104+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
105+
equalTo(
106+
RPC_SERVICE,
107+
emitStableRpcSemconv()
108+
? null
109+
: "myservice.EchoService"),
104110
equalTo(RPC_METHOD, "exampleMethod"),
105111
equalTo(SERVER_ADDRESS, "example.com"),
106112
equalTo(SERVER_PORT, 8080),
@@ -123,8 +129,12 @@ void collectsMetrics() {
123129
point
124130
.hasSum(10 /* bytes */)
125131
.hasAttributesSatisfyingExactly(
126-
equalTo(RPC_SYSTEM, "grpc"),
127-
equalTo(RPC_SERVICE, "myservice.EchoService"),
132+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
133+
equalTo(
134+
RPC_SERVICE,
135+
emitStableRpcSemconv()
136+
? null
137+
: "myservice.EchoService"),
128138
equalTo(RPC_METHOD, "exampleMethod"),
129139
equalTo(SERVER_ADDRESS, "example.com"),
130140
equalTo(SERVER_PORT, 8080),
@@ -146,8 +156,12 @@ void collectsMetrics() {
146156
point
147157
.hasSum(150 /* millis */)
148158
.hasAttributesSatisfyingExactly(
149-
equalTo(RPC_SYSTEM, "grpc"),
150-
equalTo(RPC_SERVICE, "myservice.EchoService"),
159+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
160+
equalTo(
161+
RPC_SERVICE,
162+
emitStableRpcSemconv()
163+
? null
164+
: "myservice.EchoService"),
151165
equalTo(RPC_METHOD, "exampleMethod"),
152166
equalTo(SERVER_ADDRESS, "example.com"),
153167
equalTo(SERVER_PORT, 8080),
@@ -174,8 +188,12 @@ void collectsMetrics() {
174188
point
175189
.hasSum(150 /* millis */)
176190
.hasAttributesSatisfyingExactly(
177-
equalTo(RPC_SYSTEM, "grpc"),
178-
equalTo(RPC_SERVICE, "myservice.EchoService"),
191+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
192+
equalTo(
193+
RPC_SERVICE,
194+
emitStableRpcSemconv()
195+
? null
196+
: "myservice.EchoService"),
179197
equalTo(RPC_METHOD, "exampleMethod"),
180198
equalTo(SERVER_PORT, 8080),
181199
equalTo(NETWORK_TRANSPORT, "tcp")))));

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package io.opentelemetry.instrumentation.api.incubator.semconv.rpc;
77

8+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
9+
import static io.opentelemetry.instrumentation.testing.junit.rpc.SemconvRpcStabilityUtil.maybeStable;
810
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
911
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1012
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_LOCAL_ADDRESS;
@@ -41,16 +43,16 @@ void collectsMetrics() {
4143

4244
Attributes requestAttributes1 =
4345
Attributes.builder()
44-
.put(RPC_SYSTEM, "grpc")
45-
.put(RPC_SERVICE, "myservice.EchoService")
46+
.put(maybeStable(RPC_SYSTEM), "grpc")
47+
.put(RPC_SERVICE, emitStableRpcSemconv() ? null : "myservice.EchoService")
4648
.put(RPC_METHOD, "exampleMethod")
4749
.put(RpcSizeAttributesExtractor.RPC_REQUEST_SIZE, 10)
4850
.build();
4951

5052
Attributes requestAttributes2 =
5153
Attributes.builder()
52-
.put(RPC_SYSTEM, "grpc")
53-
.put(RPC_SERVICE, "myservice.EchoService")
54+
.put(maybeStable(RPC_SYSTEM), "grpc")
55+
.put(RPC_SERVICE, emitStableRpcSemconv() ? null : "myservice.EchoService")
5456
.put(RPC_METHOD, "exampleMethod")
5557
.build();
5658

@@ -104,8 +106,12 @@ void collectsMetrics() {
104106
point
105107
.hasSum(150 /* millis */)
106108
.hasAttributesSatisfyingExactly(
107-
equalTo(RPC_SYSTEM, "grpc"),
108-
equalTo(RPC_SERVICE, "myservice.EchoService"),
109+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
110+
equalTo(
111+
RPC_SERVICE,
112+
emitStableRpcSemconv()
113+
? null
114+
: "myservice.EchoService"),
109115
equalTo(RPC_METHOD, "exampleMethod"),
110116
equalTo(SERVER_ADDRESS, "example.com"),
111117
equalTo(SERVER_PORT, 8080),
@@ -128,8 +134,12 @@ void collectsMetrics() {
128134
point
129135
.hasSum(20 /* bytes */)
130136
.hasAttributesSatisfyingExactly(
131-
equalTo(RPC_SYSTEM, "grpc"),
132-
equalTo(RPC_SERVICE, "myservice.EchoService"),
137+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
138+
equalTo(
139+
RPC_SERVICE,
140+
emitStableRpcSemconv()
141+
? null
142+
: "myservice.EchoService"),
133143
equalTo(RPC_METHOD, "exampleMethod"),
134144
equalTo(SERVER_ADDRESS, "example.com"),
135145
equalTo(SERVER_PORT, 8080),
@@ -152,8 +162,12 @@ void collectsMetrics() {
152162
point
153163
.hasSum(10 /* bytes */)
154164
.hasAttributesSatisfyingExactly(
155-
equalTo(RPC_SYSTEM, "grpc"),
156-
equalTo(RPC_SERVICE, "myservice.EchoService"),
165+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
166+
equalTo(
167+
RPC_SERVICE,
168+
emitStableRpcSemconv()
169+
? null
170+
: "myservice.EchoService"),
157171
equalTo(RPC_METHOD, "exampleMethod"),
158172
equalTo(SERVER_ADDRESS, "example.com"),
159173
equalTo(SERVER_PORT, 8080),
@@ -180,8 +194,12 @@ void collectsMetrics() {
180194
point
181195
.hasSum(150 /* millis */)
182196
.hasAttributesSatisfyingExactly(
183-
equalTo(RPC_SYSTEM, "grpc"),
184-
equalTo(RPC_SERVICE, "myservice.EchoService"),
197+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
198+
equalTo(
199+
RPC_SERVICE,
200+
emitStableRpcSemconv()
201+
? null
202+
: "myservice.EchoService"),
185203
equalTo(RPC_METHOD, "exampleMethod"),
186204
equalTo(SERVER_PORT, 8080),
187205
equalTo(NETWORK_TRANSPORT, "tcp")))));

‎instrumentation/armeria/armeria-grpc-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcTest.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package io.opentelemetry.javaagent.instrumentation.armeria.grpc.v1_14;
77

8-
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldRpcSemconv;
98
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
9+
import static io.opentelemetry.instrumentation.testing.junit.rpc.SemconvRpcStabilityUtil.maybeStable;
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1111
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1212
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
@@ -33,9 +33,6 @@
3333

3434
class ArmeriaGrpcTest {
3535

36-
private static final io.opentelemetry.api.common.AttributeKey<String> RPC_SYSTEM_NAME =
37-
io.opentelemetry.api.common.AttributeKey.stringKey("rpc.system.name");
38-
3936
@RegisterExtension
4037
static final AgentInstrumentationExtension testing = AgentInstrumentationExtension.create();
4138

@@ -83,10 +80,9 @@ void grpcInstrumentation() {
8380
.hasKind(SpanKind.CLIENT)
8481
.hasParent(trace.getSpan(0))
8582
.hasAttributesSatisfyingExactly(
86-
equalTo(RPC_SYSTEM, emitOldRpcSemconv() ? "grpc" : null),
87-
equalTo(RPC_SYSTEM_NAME, emitStableRpcSemconv() ? "grpc" : null),
88-
equalTo(RPC_SERVICE, emitOldRpcSemconv() ? "example.Greeter" : null),
89-
equalTo(RPC_METHOD, emitOldRpcSemconv() ? "SayHello" : null),
83+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
84+
equalTo(RPC_SERVICE, emitStableRpcSemconv() ? null : "example.Greeter"),
85+
equalTo(RPC_METHOD, emitStableRpcSemconv() ? null : "SayHello"),
9086
equalTo(RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()),
9187
equalTo(SERVER_ADDRESS, "127.0.0.1"),
9288
equalTo(SERVER_PORT, (long) server.httpPort()))
@@ -107,10 +103,9 @@ void grpcInstrumentation() {
107103
.hasKind(SpanKind.SERVER)
108104
.hasParent(trace.getSpan(1))
109105
.hasAttributesSatisfyingExactly(
110-
equalTo(RPC_SYSTEM, emitOldRpcSemconv() ? "grpc" : null),
111-
equalTo(RPC_SYSTEM_NAME, emitStableRpcSemconv() ? "grpc" : null),
112-
equalTo(RPC_SERVICE, emitOldRpcSemconv() ? "example.Greeter" : null),
113-
equalTo(RPC_METHOD, emitOldRpcSemconv() ? "SayHello" : null),
106+
equalTo(maybeStable(RPC_SYSTEM), "grpc"),
107+
equalTo(RPC_SERVICE, emitStableRpcSemconv() ? null : "example.Greeter"),
108+
equalTo(RPC_METHOD, emitStableRpcSemconv() ? null : "SayHello"),
114109
equalTo(RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()),
115110
equalTo(SERVER_ADDRESS, "127.0.0.1"),
116111
equalTo(SERVER_PORT, server.httpPort()))

0 commit comments

Comments
 (0)