Remove rpc.grpc.full_method tag

manuel-alvarez-alvarez · manuel-alvarez-alvarez · commit df37e7acb315 · 2024-06-14T10:28:08.000+02:00
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
@@ -61,7 +61,6 @@ public class GatewayBridge {
   private static final Pattern QUERY_PARAM_VALUE_SPLITTER = Pattern.compile("=");
   private static final Pattern QUERY_PARAM_SPLITTER = Pattern.compile("&");
   private static final Map<String, List<String>> EMPTY_QUERY_PARAMS = Collections.emptyMap();
-  private static final String GRPC_FULL_METHOD_NAME_TAG = "rpc.grpc.full_method";
 
   /** User tracking tags that will force the collection of request headers */
   private static final String[] USER_TRACKING_TAGS = {
@@ -370,9 +369,6 @@ public void init() {
           if (ctx == null || method == null || method.isEmpty()) {
             return NoopFlow.INSTANCE;
           }
-          // set the tag used by the backend to generate the grpc pass-lists
-          TraceSegment segment = ctx_.getTraceSegment();
-          segment.setTagCurrent(GRPC_FULL_METHOD_NAME_TAG, method);
           while (true) {
             DataSubscriberInfo subInfo = grpcServerMethodSubInfo;
             if (subInfo == null) {
diff --git a/dd-smoke-tests/appsec/springboot-grpc/src/test/groovy/datadog/smoketest/appsec/ServerMethodTest.groovy b/dd-smoke-tests/appsec/springboot-grpc/src/test/groovy/datadog/smoketest/appsec/ServerMethodTest.groovy
@@ -28,9 +28,9 @@ class ServerMethodTest extends AbstractSpringBootWithGRPCAppSecTest {
           [
             parameters: [
               inputs: [[address: 'grpc.server.method']],
-              list : ['/smoketest.Greeter/Hello'],
+              regex : 'Greeter',
             ],
-            operator  : 'phrase_match',
+            operator  : 'match_regex',
           ]
         ],
         transformers: [],
@@ -66,6 +66,5 @@ class ServerMethodTest extends AbstractSpringBootWithGRPCAppSecTest {
     match != null
     match['parameters'][0]['address'] == 'grpc.server.method'
     match['parameters'][0]['value'] == 'smoketest.Greeter/Hello'
-    grpcRootSpan.meta['rpc.grpc.full_method'] == 'smoketest.Greeter/Hello'
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ class ServerMethodTest extends AbstractSpringBootWithGRPCAppSecTest {`
`28`	`28`	`[`
`29`	`29`	`parameters: [`
`30`	`30`	`inputs: [[address: 'grpc.server.method']],`
`31`		`- list : ['/smoketest.Greeter/Hello'],`
	`31`	`+ regex : 'Greeter',`
`32`	`32`	`],`
`33`		`- operator : 'phrase_match',`
	`33`	`+ operator : 'match_regex',`
`34`	`34`	`]`
`35`	`35`	`],`
`36`	`36`	`transformers: [],`
`@@ -66,6 +66,5 @@ class ServerMethodTest extends AbstractSpringBootWithGRPCAppSecTest {`
`66`	`66`	`match != null`
`67`	`67`	`match['parameters'][0]['address'] == 'grpc.server.method'`
`68`	`68`	`match['parameters'][0]['value'] == 'smoketest.Greeter/Hello'`
`69`		`- grpcRootSpan.meta['rpc.grpc.full_method'] == 'smoketest.Greeter/Hello'`
`70`	`69`	`}`
`71`	`70`	`}`