From a802f557e04723209677000bcc10b2b12b8f896e Mon Sep 17 00:00:00 2001
From: Matthew Li <matthew.li@datadoghq.com>
Date: Thu, 14 Aug 2025 15:53:27 -0400
Subject: [PATCH 1/3] Changing GRPC instrumentation codes from status.code to
 grpc.status.code

---
 .../armeria/grpc/client/GrpcClientDecorator.java |  2 +-
 .../armeria/grpc/server/GrpcServerDecorator.java |  2 +-
 .../test/groovy/ArmeriaGrpcStreamingTest.groovy  |  4 ++--
 .../src/test/groovy/ArmeriaGrpcTest.groovy       | 16 ++++++++--------
 .../grpc/client/GrpcClientDecorator.java         |  3 +--
 .../grpc/server/GrpcServerDecorator.java         |  2 +-
 .../src/test/groovy/GrpcStreamingTest.groovy     |  4 ++--
 .../grpc-1.5/src/test/groovy/GrpcTest.groovy     | 16 ++++++++--------
 8 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
index dc4c794efc6..4c4e09c5540 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
@@ -114,7 +114,7 @@ public <C> void injectContext(Context context, final C request, CarrierSetter<C>
 
   public AgentSpan onClose(final AgentSpan span, final Status status) {
 
-    span.setTag("status.code", status.getCode().name());
+    span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
 
     // TODO why is there a mismatch between client / server for calling the onError method?
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
index 944324f3b4d..910eee4f438 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
@@ -93,7 +93,7 @@ public <RespT, ReqT> AgentSpan onCall(final AgentSpan span, ServerCall<ReqT, Res
   }
 
   public AgentSpan onStatus(final AgentSpan span, final Status status) {
-    span.setTag("status.code", status.getCode().name());
+    span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
     return span.setError(
         SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
index 5987ff055d5..99e507c4795 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
@@ -176,7 +176,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Response"
             "response.type" "example.Helloworld\$Response"
             peerServiceFrom(Tags.RPC_SERVICE)
@@ -212,7 +212,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             defaultTags(true)
           }
         }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
index d7591a19bfe..9f23bd8a500 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
@@ -180,7 +180,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
             if ({ isDataStreamsEnabled() }) {
@@ -218,7 +218,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
             }
@@ -315,7 +315,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "${status.code.name()}"
+            "grpc.status.code" "${status.code.name()}"
             "status.description" description
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
@@ -338,7 +338,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "${status.code.name()}"
+            "grpc.status.code" "${status.code.name()}"
             "status.description" description
             "canceled" { true } // 1.0.0 handles cancellation incorrectly so accesting any value
             if (status.cause != null) {
@@ -426,7 +426,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" status.code.name()
+            "grpc.status.code" status.code.name()
             if (status.description != null) {
               "status.description" status.description
             }
@@ -452,7 +452,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
             errorTags error.class, error.message
-            "status.code" "${status.code.name()}"
+            "grpc.status.code" "${status.code.name()}"
             "status.description"  { it == null || String}
             "canceled" { true } // 1.0.0 handles cancellation incorrectly so accesting any value
             if ({ isDataStreamsEnabled() }) {
@@ -566,7 +566,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
             }
@@ -641,7 +641,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
             if ({ isDataStreamsEnabled() }) {
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
index c35da6a0e34..b4f89cc3d39 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
@@ -113,8 +113,7 @@ public <C> void injectContext(Context context, final C request, CarrierSetter<C>
   }
 
   public AgentSpan onClose(final AgentSpan span, final Status status) {
-
-    span.setTag("status.code", status.getCode().name());
+    span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
 
     // TODO why is there a mismatch between client / server for calling the onError method?
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
index cafd0d64ad7..3eabcd315a3 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
@@ -93,7 +93,7 @@ public <RespT, ReqT> AgentSpan onCall(final AgentSpan span, ServerCall<ReqT, Res
   }
 
   public AgentSpan onStatus(final AgentSpan span, final Status status) {
-    span.setTag("status.code", status.getCode().name());
+    span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
     return span.setError(
         SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
index 47fe699dfbd..e03e4b7d054 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
@@ -160,7 +160,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Response"
             "response.type" "example.Helloworld\$Response"
             peerServiceFrom(Tags.RPC_SERVICE)
@@ -195,7 +195,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             defaultTags(true)
           }
         }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
index 37d87ce30c5..c687ec8b577 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
@@ -170,7 +170,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.PEER_HOSTNAME" "localhost"
             "$Tags.PEER_HOST_IPV4" "127.0.0.1"
             "$Tags.PEER_PORT" server.port
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
             if ({ isDataStreamsEnabled() }) {
@@ -208,7 +208,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
             }
@@ -312,7 +312,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "${status.code.name()}"
+            "grpc.status.code" "${status.code.name()}"
             "status.description" description
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
@@ -335,7 +335,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "${status.code.name()}"
+            "grpc.status.code" "${status.code.name()}"
             "status.description" description
             if (status.cause != null) {
               errorTags status.cause.class, status.cause.message
@@ -417,7 +417,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.PEER_HOSTNAME" "localhost"
             "$Tags.PEER_HOST_IPV4" "127.0.0.1"
             "$Tags.PEER_PORT" server.port
-            "status.code" "UNKNOWN"
+            "grpc.status.code" "UNKNOWN"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
             "status.description" { it == null || String}
@@ -440,7 +440,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "${status.code.name()}"
+            "grpc.status.code" "${status.code.name()}"
             "status.description"  { it == null || String}
             errorTags error.class, error.message
             if ({ isDataStreamsEnabled() }) {
@@ -545,7 +545,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
             }
@@ -611,7 +611,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "OK"
+            "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
             if ({ isDataStreamsEnabled() }) {

From 92308198fc90e3421c109f5d6a46832a1b8661e3 Mon Sep 17 00:00:00 2001
From: Matthew Li <matthew.li@datadoghq.com>
Date: Thu, 14 Aug 2025 16:19:40 -0400
Subject: [PATCH 2/3] adding grpc.status.code to pubsub tests

---
 .../google-pubsub/src/test/groovy/PubSubTest.groovy             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
index 1564628cc86..71f3d8d005f 100644
--- a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
+++ b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
@@ -270,7 +270,7 @@ abstract class PubSubTest extends VersionedNamingTestBase {
         "request.type" { String }
         "response.type" { String }
         "$Tags.RPC_SERVICE" { String }
-        "status.code" { String }
+        "grpc.status.code" { String }
         if ({ isDataStreamsEnabled() }) {
           "$DDTags.PATHWAY_HASH" { String }
         }

From 01abfecca1e1e8ce1e15d212bf2ac3756e3780c7 Mon Sep 17 00:00:00 2001
From: Matthew Li <matthew.li@datadoghq.com>
Date: Mon, 18 Aug 2025 11:07:46 -0400
Subject: [PATCH 3/3] updating to have both tags be sent

---
 .../armeria/grpc/client/GrpcClientDecorator.java          | 1 +
 .../armeria/grpc/server/GrpcServerDecorator.java          | 1 +
 .../src/test/groovy/ArmeriaGrpcStreamingTest.groovy       | 2 ++
 .../src/test/groovy/ArmeriaGrpcTest.groovy                | 8 ++++++++
 .../google-pubsub/src/test/groovy/PubSubTest.groovy       | 1 +
 .../instrumentation/grpc/client/GrpcClientDecorator.java  | 1 +
 .../instrumentation/grpc/server/GrpcServerDecorator.java  | 1 +
 .../grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy     | 2 ++
 .../grpc-1.5/src/test/groovy/GrpcTest.groovy              | 8 ++++++++
 9 files changed, 25 insertions(+)

diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
index 4c4e09c5540..4310732a2f6 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
@@ -114,6 +114,7 @@ public <C> void injectContext(Context context, final C request, CarrierSetter<C>
 
   public AgentSpan onClose(final AgentSpan span, final Status status) {
 
+    span.setTag("status.code", status.getCode().name());
     span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
 
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
index 910eee4f438..942b0b42df1 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
@@ -93,6 +93,7 @@ public <RespT, ReqT> AgentSpan onCall(final AgentSpan span, ServerCall<ReqT, Res
   }
 
   public AgentSpan onStatus(final AgentSpan span, final Status status) {
+    span.setTag("status.code", status.getCode().name());
     span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
     return span.setError(
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
index 99e507c4795..ae8f35b5993 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
@@ -176,6 +176,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" "OK"
             "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Response"
             "response.type" "example.Helloworld\$Response"
@@ -212,6 +213,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "OK"
             "grpc.status.code" "OK"
             defaultTags(true)
           }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
index 9f23bd8a500..58291a7fb4e 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
@@ -180,6 +180,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" "OK"
             "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
@@ -218,6 +219,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "OK"
             "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
@@ -315,6 +317,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" "${status.code.name()}"
             "grpc.status.code" "${status.code.name()}"
             "status.description" description
             "request.type" "example.Helloworld\$Request"
@@ -338,6 +341,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "${status.code.name()}"
             "grpc.status.code" "${status.code.name()}"
             "status.description" description
             "canceled" { true } // 1.0.0 handles cancellation incorrectly so accesting any value
@@ -426,6 +430,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" status.code.name()
             "grpc.status.code" status.code.name()
             if (status.description != null) {
               "status.description" status.description
@@ -452,6 +457,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
             errorTags error.class, error.message
+            "status.code" "${status.code.name()}"
             "grpc.status.code" "${status.code.name()}"
             "status.description"  { it == null || String}
             "canceled" { true } // 1.0.0 handles cancellation incorrectly so accesting any value
@@ -566,6 +572,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "armeria-grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "OK"
             "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
@@ -641,6 +648,7 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "armeria-grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" "OK"
             "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
index 71f3d8d005f..8d7e792680c 100644
--- a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
+++ b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
@@ -270,6 +270,7 @@ abstract class PubSubTest extends VersionedNamingTestBase {
         "request.type" { String }
         "response.type" { String }
         "$Tags.RPC_SERVICE" { String }
+        "status.code" { String }
         "grpc.status.code" { String }
         if ({ isDataStreamsEnabled() }) {
           "$DDTags.PATHWAY_HASH" { String }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
index b4f89cc3d39..c12b280b8d1 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
@@ -113,6 +113,7 @@ public <C> void injectContext(Context context, final C request, CarrierSetter<C>
   }
 
   public AgentSpan onClose(final AgentSpan span, final Status status) {
+    span.setTag("status.code", status.getCode().name());
     span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
 
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
index 3eabcd315a3..a0598e76e88 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
@@ -93,6 +93,7 @@ public <RespT, ReqT> AgentSpan onCall(final AgentSpan span, ServerCall<ReqT, Res
   }
 
   public AgentSpan onStatus(final AgentSpan span, final Status status) {
+    span.setTag("status.code", status.getCode().name());
     span.setTag("grpc.status.code", status.getCode().name());
     span.setTag("status.description", status.getDescription());
     return span.setError(
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
index e03e4b7d054..31fd584c03b 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
@@ -160,6 +160,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" "OK"
             "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Response"
             "response.type" "example.Helloworld\$Response"
@@ -195,6 +196,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "OK"
             "grpc.status.code" "OK"
             defaultTags(true)
           }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
index c687ec8b577..2e0a05544e0 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
@@ -170,6 +170,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.PEER_HOSTNAME" "localhost"
             "$Tags.PEER_HOST_IPV4" "127.0.0.1"
             "$Tags.PEER_PORT" server.port
+            "status.code" "OK"
             "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
@@ -208,6 +209,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "OK"
             "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
@@ -312,6 +314,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" "${status.code.name()}"
             "grpc.status.code" "${status.code.name()}"
             "status.description" description
             "request.type" "example.Helloworld\$Request"
@@ -335,6 +338,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "${status.code.name()}"
             "grpc.status.code" "${status.code.name()}"
             "status.description" description
             if (status.cause != null) {
@@ -417,6 +421,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.PEER_HOSTNAME" "localhost"
             "$Tags.PEER_HOST_IPV4" "127.0.0.1"
             "$Tags.PEER_PORT" server.port
+            "status.code" "UNKNOWN"
             "grpc.status.code" "UNKNOWN"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"
@@ -440,6 +445,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "${status.code.name()}"
             "grpc.status.code" "${status.code.name()}"
             "status.description"  { it == null || String}
             errorTags error.class, error.message
@@ -545,6 +551,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
           tags {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "status.code" "OK"
             "grpc.status.code" "OK"
             if ({ isDataStreamsEnabled() }) {
               "$DDTags.PATHWAY_HASH" { String }
@@ -611,6 +618,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-client"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.RPC_SERVICE" "example.Greeter"
+            "status.code" "OK"
             "grpc.status.code" "OK"
             "request.type" "example.Helloworld\$Request"
             "response.type" "example.Helloworld\$Response"