fix: filter on iteration instead of using a copy of the tags

Author: daniel-mohedano

dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java

@@ -9,7 +9,6 @@
 import datadog.communication.serialization.msgpack.MsgPackWriter;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
-import datadog.trace.api.TagMap;
 import datadog.trace.api.civisibility.CiVisibilityWellKnownTags;
 import datadog.trace.api.civisibility.InstrumentationBridge;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityDistributionMetric;
@@ -59,9 +58,14 @@ public class CiTestCycleMapperV1 implements RemoteMapper {
 
   private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span");
 
-  private static final Collection<String> DEFAULT_TOP_LEVEL_TAGS =
-      Arrays.asList(
-          Tags.TEST_SESSION_ID, Tags.TEST_MODULE_ID, Tags.TEST_SUITE_ID, Tags.ITR_CORRELATION_ID);
+  private static final Set<String> DEFAULT_TOP_LEVEL_TAGS =
+      Collections.unmodifiableSet(
+          new HashSet<>(
+              Arrays.asList(
+                  Tags.TEST_SESSION_ID,
+                  Tags.TEST_MODULE_ID,
+                  Tags.TEST_SUITE_ID,
+                  Tags.ITR_CORRELATION_ID)));
 
   private final CiVisibilityWellKnownTags wellKnownTags;
   private final int size;
@@ -317,29 +321,29 @@ MetaWriter withWritable(Writable writable) {
 
     @Override
     public void accept(Metadata metadata) {
-      TagMap tags = metadata.getTags().copy();
-
-      for (String ignoredTag : DEFAULT_TOP_LEVEL_TAGS) {
-        tags.remove(ignoredTag);
-      }
-
-      int metaSize =
-          metadata.getBaggage().size()
-              + tags.size()
-              + (null == metadata.getHttpStatusCode() ? 0 : 1);
+      int metaSize = metadata.getBaggage().size() + (null == metadata.getHttpStatusCode() ? 0 : 1);
       int metricsSize = 0;
-      for (Map.Entry<String, Object> tag : tags.entrySet()) {
+      for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
+        if (DEFAULT_TOP_LEVEL_TAGS.contains(tag.getKey())) {
+          continue;
+        }
         if (tag.getValue() instanceof Number) {
           ++metricsSize;
-          --metaSize;
+        } else {
+          ++metaSize;
         }
       }
       writable.writeUTF8(METRICS);
       writable.startMap(metricsSize);
-      for (Map.Entry<String, Object> entry : tags.entrySet()) {
-        if (entry.getValue() instanceof Number) {
-          writable.writeString(entry.getKey(), null);
-          writable.writeObject(entry.getValue(), null);
+      for (Map.Entry<String, Object> entry : metadata.getTags().entrySet()) {
+        String key = entry.getKey();
+        if (DEFAULT_TOP_LEVEL_TAGS.contains(key)) {
+          continue;
+        }
+        Object value = entry.getValue();
+        if (value instanceof Number) {
+          writable.writeString(key, null);
+          writable.writeObject(value, null);
         }
       }
 
@@ -356,10 +360,14 @@ public void accept(Metadata metadata) {
         writable.writeUTF8(HTTP_STATUS);
         writable.writeUTF8(metadata.getHttpStatusCode());
       }
-      for (Map.Entry<String, Object> entry : tags.entrySet()) {
+      for (Map.Entry<String, Object> entry : metadata.getTags().entrySet()) {
+        String key = entry.getKey();
+        if (DEFAULT_TOP_LEVEL_TAGS.contains(key)) {
+          continue;
+        }
         Object value = entry.getValue();
         if (!(value instanceof Number)) {
-          writable.writeString(entry.getKey(), null);
+          writable.writeString(key, null);
           if (!(value instanceof Iterable)) {
             writable.writeObjectString(value, null);
           } else {