update GRPC inject to not allow all repeated keys

Author: mhlidd

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java

@@ -12,7 +12,7 @@ public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {
   @Override
   public void set(final Metadata carrier, final String key, final String value) {
     Metadata.Key<String> metadataKey = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-    if (!key.startsWith("ot-baggage-") || !carrier.containsKey(metadataKey)) {
+    if (!carrier.containsKey(metadataKey)) {
       carrier.put(metadataKey, value);
     }
   }

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/GrpcInjectAdapterTest.groovy

@@ -25,24 +25,6 @@ class GrpcInjectAdapterTest extends VersionedNamingTestBase {
     carrier.get(getKey("ot-baggage-bar")) == "v3"
   }
 
-  def "carrier set is can set repeated keys that are not ot-baggage-*"() {
-    setup:
-    def carrier = new Metadata()
-
-    def baggage = [["foo", "v1"], ["foo", "v2"], ["bar", "v3"]]
-
-    when:
-    baggage.each { pair ->
-      def (key, value) = pair
-      SETTER.set(carrier, key, value)
-    }
-
-    then:
-    carrier.headerCount() == 3
-    carrier.get(getKey("foo")) == "v2" // last value wins
-    carrier.get(getKey("bar")) == "v3"
-  }
-
   Metadata.Key<String> getKey(String key){
     Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER)
   }

dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcInjectAdapter.java

@@ -11,7 +11,7 @@ public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {
   @Override
   public void set(final Metadata carrier, final String key, final String value) {
     Metadata.Key<String> metadataKey = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-    if (!key.startsWith("ot-baggage-") || !carrier.containsKey(metadataKey)) {
+    if (!carrier.containsKey(metadataKey)) {
       carrier.put(metadataKey, value);
     }
   }

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcInjectAdapterTest.groovy

@@ -25,24 +25,6 @@ class GrpcInjectAdapterTest extends VersionedNamingTestBase {
     carrier.get(getKey("ot-baggage-bar")) == "v3"
   }
 
-  def "carrier set is can set repeated keys that are not ot-baggage-*"() {
-    setup:
-    def carrier = new Metadata()
-
-    def baggage = [["foo", "v1"], ["foo", "v2"], ["bar", "v3"]]
-
-    when:
-    baggage.each { pair ->
-      def (key, value) = pair
-      SETTER.set(carrier, key, value)
-    }
-
-    then:
-    carrier.headerCount() == 3
-    carrier.get(getKey("foo")) == "v2" // last value wins
-    carrier.get(getKey("bar")) == "v3"
-  }
-
   Metadata.Key<String> getKey(String key){
     Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER)
   }