open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add grpc status code to metrics attrs (#6556)

This commit is contained in:
Trask Stalnaker 2022-09-08 02:48:09 -07:00 committed by GitHub
parent 61fd14fde1
commit 63c0bfbf79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/MetricsView.java
View File

@ -30,6 +30,7 @@ final class MetricsView {
view.add(SemanticAttributes.RPC_SYSTEM); view.add(SemanticAttributes.RPC_SYSTEM);
view.add(SemanticAttributes.RPC_SERVICE); view.add(SemanticAttributes.RPC_SERVICE);
view.add(SemanticAttributes.RPC_METHOD); view.add(SemanticAttributes.RPC_METHOD);
view.add(SemanticAttributes.RPC_GRPC_STATUS_CODE);
return view; return view;
} }

10
instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java
View File

@ -227,7 +227,10 @@ public abstract class AbstractGrpcStreamingTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
testing() testing()
.waitAndAssertMetrics( .waitAndAssertMetrics(
"io.opentelemetry.grpc-1.6", "io.opentelemetry.grpc-1.6",
@ -253,7 +256,10 @@ public abstract class AbstractGrpcStreamingTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
} }
private ManagedChannel createChannel(Server server) throws Exception { private ManagedChannel createChannel(Server server) throws Exception {

50
instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java
View File

@ -217,7 +217,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
testing() testing()
.waitAndAssertMetrics( .waitAndAssertMetrics(
"io.opentelemetry.grpc-1.6", "io.opentelemetry.grpc-1.6",
@ -242,7 +245,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
} }
@Test @Test
@ -398,7 +404,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
testing() testing()
.waitAndAssertMetrics( .waitAndAssertMetrics(
"io.opentelemetry.grpc-1.6", "io.opentelemetry.grpc-1.6",
@ -423,7 +432,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
} }
@Test @Test
@ -587,7 +599,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
testing() testing()
.waitAndAssertMetrics( .waitAndAssertMetrics(
"io.opentelemetry.grpc-1.6", "io.opentelemetry.grpc-1.6",
@ -612,7 +627,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()))))));
} }
@ParameterizedTest @ParameterizedTest
@ -733,7 +751,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) status.getCode().value()))))));
testing() testing()
.waitAndAssertMetrics( .waitAndAssertMetrics(
"io.opentelemetry.grpc-1.6", "io.opentelemetry.grpc-1.6",
@ -758,7 +779,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) status.getCode().value()))))));
} }
@ParameterizedTest @ParameterizedTest
@ -880,7 +904,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.UNKNOWN.value()))))));
testing() testing()
.waitAndAssertMetrics( .waitAndAssertMetrics(
"io.opentelemetry.grpc-1.6", "io.opentelemetry.grpc-1.6",
@ -905,7 +932,10 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"example.Greeter"), "example.Greeter"),
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc")))))); equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.UNKNOWN.value()))))));
} }
static class ErrorProvider implements ArgumentsProvider { static class ErrorProvider implements ArgumentsProvider {