Skip to content

Commit fb87a83

Browse files
trasktrask
authored
Static import RPC semconv constants in tests (#12578)
1 parent 6a9654d commit fb87a83

File tree

13 files changed

+325
-397
lines changed

13 files changed

+325
-397
lines changed

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;
1414
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1515
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
16+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
17+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
18+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
1619
import static org.assertj.core.api.Assertions.assertThat;
1720

1821
import io.opentelemetry.api.trace.SpanKind;
@@ -132,12 +135,10 @@ void testApacheDubboBase() throws ReflectiveOperationException {
132135
.hasParent(trace.getSpan(0))
133136
.hasAttributesSatisfyingExactly(
134137
equalTo(
135-
RpcIncubatingAttributes.RPC_SYSTEM,
138+
RPC_SYSTEM,
136139
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
137-
equalTo(
138-
RpcIncubatingAttributes.RPC_SERVICE,
139-
"org.apache.dubbo.rpc.service.GenericService"),
140-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "$invoke"),
140+
equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
141+
equalTo(RPC_METHOD, "$invoke"),
141142
equalTo(SERVER_ADDRESS, "localhost"),
142143
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
143144
satisfies(
@@ -166,12 +167,12 @@ void testApacheDubboBase() throws ReflectiveOperationException {
166167
.hasParent(trace.getSpan(1))
167168
.hasAttributesSatisfying(
168169
equalTo(
169-
RpcIncubatingAttributes.RPC_SYSTEM,
170+
RPC_SYSTEM,
170171
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
171172
equalTo(
172-
RpcIncubatingAttributes.RPC_SERVICE,
173+
RPC_SERVICE,
173174
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),
174-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "hello"),
175+
equalTo(RPC_METHOD, "hello"),
175176
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
176177
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
177178
satisfies(NETWORK_TYPE, AbstractAssert::isNull))));
@@ -226,12 +227,10 @@ void testApacheDubboTest()
226227
.hasParent(trace.getSpan(0))
227228
.hasAttributesSatisfyingExactly(
228229
equalTo(
229-
RpcIncubatingAttributes.RPC_SYSTEM,
230+
RPC_SYSTEM,
230231
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
231-
equalTo(
232-
RpcIncubatingAttributes.RPC_SERVICE,
233-
"org.apache.dubbo.rpc.service.GenericService"),
234-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "$invokeAsync"),
232+
equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
233+
equalTo(RPC_METHOD, "$invokeAsync"),
235234
equalTo(SERVER_ADDRESS, "localhost"),
236235
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
237236
satisfies(
@@ -260,12 +259,12 @@ void testApacheDubboTest()
260259
.hasParent(trace.getSpan(1))
261260
.hasAttributesSatisfying(
262261
equalTo(
263-
RpcIncubatingAttributes.RPC_SYSTEM,
262+
RPC_SYSTEM,
264263
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
265264
equalTo(
266-
RpcIncubatingAttributes.RPC_SERVICE,
265+
RPC_SERVICE,
267266
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),
268-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "hello"),
267+
equalTo(RPC_METHOD, "hello"),
269268
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
270269
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
271270
satisfies(

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;
1414
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1515
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
16+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
17+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
18+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
1619
import static org.assertj.core.api.Assertions.assertThat;
1720

1821
import io.opentelemetry.api.trace.SpanKind;
@@ -175,12 +178,10 @@ void testDubboChain() throws ReflectiveOperationException {
175178
.hasParent(trace.getSpan(0))
176179
.hasAttributesSatisfyingExactly(
177180
equalTo(
178-
RpcIncubatingAttributes.RPC_SYSTEM,
181+
RPC_SYSTEM,
179182
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
180-
equalTo(
181-
RpcIncubatingAttributes.RPC_SERVICE,
182-
"org.apache.dubbo.rpc.service.GenericService"),
183-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "$invoke"),
183+
equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
184+
equalTo(RPC_METHOD, "$invoke"),
184185
equalTo(SERVER_ADDRESS, "localhost"),
185186
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
186187
satisfies(
@@ -209,12 +210,12 @@ void testDubboChain() throws ReflectiveOperationException {
209210
.hasParent(trace.getSpan(1))
210211
.hasAttributesSatisfying(
211212
equalTo(
212-
RpcIncubatingAttributes.RPC_SYSTEM,
213+
RPC_SYSTEM,
213214
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
214215
equalTo(
215-
RpcIncubatingAttributes.RPC_SERVICE,
216+
RPC_SERVICE,
216217
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService"),
217-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "hello"),
218+
equalTo(RPC_METHOD, "hello"),
218219
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
219220
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
220221
satisfies(
@@ -230,12 +231,10 @@ void testDubboChain() throws ReflectiveOperationException {
230231
.hasParent(trace.getSpan(2))
231232
.hasAttributesSatisfyingExactly(
232233
equalTo(
233-
RpcIncubatingAttributes.RPC_SYSTEM,
234+
RPC_SYSTEM,
234235
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
235-
equalTo(
236-
RpcIncubatingAttributes.RPC_SERVICE,
237-
"org.apache.dubbo.rpc.service.GenericService"),
238-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "$invoke"),
236+
equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
237+
equalTo(RPC_METHOD, "$invoke"),
239238
equalTo(SERVER_ADDRESS, "localhost"),
240239
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
241240
satisfies(
@@ -264,12 +263,12 @@ void testDubboChain() throws ReflectiveOperationException {
264263
.hasParent(trace.getSpan(3))
265264
.hasAttributesSatisfying(
266265
equalTo(
267-
RpcIncubatingAttributes.RPC_SYSTEM,
266+
RPC_SYSTEM,
268267
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
269268
equalTo(
270-
RpcIncubatingAttributes.RPC_SERVICE,
269+
RPC_SERVICE,
271270
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),
272-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "hello"),
271+
equalTo(RPC_METHOD, "hello"),
273272
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
274273
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
275274
satisfies(
@@ -346,12 +345,10 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
346345
.hasParent(trace.getSpan(0))
347346
.hasAttributesSatisfyingExactly(
348347
equalTo(
349-
RpcIncubatingAttributes.RPC_SYSTEM,
348+
RPC_SYSTEM,
350349
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
351-
equalTo(
352-
RpcIncubatingAttributes.RPC_SERVICE,
353-
"org.apache.dubbo.rpc.service.GenericService"),
354-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "$invoke"),
350+
equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
351+
equalTo(RPC_METHOD, "$invoke"),
355352
equalTo(SERVER_ADDRESS, "localhost"),
356353
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
357354
satisfies(
@@ -380,12 +377,12 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
380377
.hasParent(trace.getSpan(1))
381378
.hasAttributesSatisfying(
382379
equalTo(
383-
RpcIncubatingAttributes.RPC_SYSTEM,
380+
RPC_SYSTEM,
384381
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
385382
equalTo(
386-
RpcIncubatingAttributes.RPC_SERVICE,
383+
RPC_SERVICE,
387384
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService"),
388-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "hello"),
385+
equalTo(RPC_METHOD, "hello"),
389386
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
390387
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
391388
satisfies(

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
99
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1010
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
11+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE;
12+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
13+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
14+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
1115
import static org.assertj.core.api.Assertions.assertThat;
1216

1317
import com.linecorp.armeria.client.grpc.GrpcClients;
@@ -21,7 +25,6 @@
2125
import io.opentelemetry.api.trace.SpanKind;
2226
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
2327
import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes;
24-
import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes;
2528
import org.junit.jupiter.api.Test;
2629
import org.junit.jupiter.api.extension.RegisterExtension;
2730

@@ -76,12 +79,10 @@ void grpcInstrumentation() {
7679
.hasKind(SpanKind.CLIENT)
7780
.hasParent(trace.getSpan(0))
7881
.hasAttributesSatisfyingExactly(
79-
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"),
80-
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"),
81-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"),
82-
equalTo(
83-
RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE,
84-
(long) Status.Code.OK.value()),
82+
equalTo(RPC_SYSTEM, "grpc"),
83+
equalTo(RPC_SERVICE, "example.Greeter"),
84+
equalTo(RPC_METHOD, "SayHello"),
85+
equalTo(RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()),
8586
equalTo(SERVER_ADDRESS, "127.0.0.1"),
8687
equalTo(SERVER_PORT, (long) server.httpPort()))
8788
.hasEventsSatisfyingExactly(
@@ -103,12 +104,10 @@ void grpcInstrumentation() {
103104
.hasKind(SpanKind.SERVER)
104105
.hasParent(trace.getSpan(1))
105106
.hasAttributesSatisfyingExactly(
106-
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"),
107-
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"),
108-
equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"),
109-
equalTo(
110-
RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE,
111-
(long) Status.Code.OK.value()),
107+
equalTo(RPC_SYSTEM, "grpc"),
108+
equalTo(RPC_SERVICE, "example.Greeter"),
109+
equalTo(RPC_METHOD, "SayHello"),
110+
equalTo(RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()),
112111
equalTo(SERVER_ADDRESS, "127.0.0.1"),
113112
equalTo(SERVER_PORT, server.httpPort()))
114113
.hasEventsSatisfyingExactly(

0 commit comments

Comments
 (0)