Keep peer.port off the id path

peer.port is declared per direction in the registry (#12713), so it has no
direction-free id: BaseDecorator, shared by client and server decorators,
sets it by name, and the set-by-id tests use an unshared int tag.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: dougqh

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java

@@ -206,12 +206,12 @@ public final void onPeerConnection(
   }
 
   public void setPeerPort(AgentSpan span, String port) {
-    span.setTag(KnownTags.PEER_PORT_ID, port);
+    span.setTag(Tags.PEER_PORT, port);
   }
 
   public void setPeerPort(AgentSpan span, int port) {
     if (port > UNSET_PORT) {
-      span.setTag(KnownTags.PEER_PORT_ID, port);
+      span.setTag(Tags.PEER_PORT, port);
     }
   }
 

dd-trace-core/src/test/java/datadog/trace/core/DDSpanSetTagByIdTest.java

@@ -31,11 +31,11 @@ void tearDown() {
 
   @Test
   void storesTheTagUnderItsName() {
-    span.setTag(KnownTags.PEER_PORT_ID, 5432);
+    span.setTag(KnownTags.HTTP_RESEND_COUNT_ID, 2);
     span.setTag(KnownTags.PEER_HOSTNAME_ID, "db.internal");
     span.setTag(KnownTags.DD_PROFILING_ENABLED_ID, true);
 
-    assertEquals(5432, span.getTag(KnownTags.PEER_PORT_NAME));
+    assertEquals(2, span.getTag(KnownTags.HTTP_RESEND_COUNT_NAME));
     assertEquals("db.internal", span.getTag(KnownTags.PEER_HOSTNAME_NAME));
     assertEquals(true, span.getTag(KnownTags.DD_PROFILING_ENABLED_NAME));
   }

internal-api/src/jmh/java/datadog/trace/api/TagMapInsertBenchmark.java

@@ -49,7 +49,7 @@ public class TagMapInsertBenchmark {
     KnownTags.HTTP_CLIENT_IP_NAME,
     KnownTags.PEER_HOSTNAME_NAME,
     KnownTags.PEER_IPV4_NAME,
-    KnownTags.PEER_PORT_NAME,
+    KnownTags.PEER_IPV6_NAME,
     KnownTags.DD_INTEGRATION_NAME,
   };
 
@@ -64,7 +64,7 @@ public class TagMapInsertBenchmark {
     KnownTags.HTTP_CLIENT_IP_ID,
     KnownTags.PEER_HOSTNAME_ID,
     KnownTags.PEER_IPV4_ID,
-    KnownTags.PEER_PORT_ID,
+    KnownTags.PEER_IPV6_ID,
     KnownTags.DD_INTEGRATION_ID,
   };
 

internal-api/src/test/java/datadog/trace/api/TagMapEntryCreateByIdTest.java

@@ -20,8 +20,8 @@ void matchesCreateByNameForEveryValueType() {
         TagMap.Entry.create(KnownTags.DD_PROFILING_ENABLED_NAME, true),
         TagMap.Entry.create(KnownTags.DD_PROFILING_ENABLED_ID, true));
     assertEquivalent(
-        TagMap.Entry.create(KnownTags.PEER_PORT_NAME, 5432),
-        TagMap.Entry.create(KnownTags.PEER_PORT_ID, 5432));
+        TagMap.Entry.create(KnownTags.HTTP_STATUS_CODE_NAME, 5432),
+        TagMap.Entry.create(KnownTags.HTTP_STATUS_CODE_ID, 5432));
     assertEquivalent(
         TagMap.Entry.create(KnownTags.HTTP_RESEND_COUNT_NAME, 2L),
         TagMap.Entry.create(KnownTags.HTTP_RESEND_COUNT_ID, 2L));

internal-api/src/test/java/datadog/trace/api/TagMapSetByIdTest.java

@@ -33,7 +33,7 @@ void anOpenTelemetryRenameIsStoredUnderTheDatadogName() {
   @Test
   void matchesTheNameKeyedSettersForEveryValueType() {
     TagMap byId = TagMap.create();
-    byId.set(KnownTags.PEER_PORT_ID, 5432);
+    byId.set(KnownTags.HTTP_STATUS_CODE_ID, 5432);
     byId.set(KnownTags.HTTP_RESEND_COUNT_ID, 2L);
     byId.set(KnownTags.PEER_HOSTNAME_ID, (CharSequence) "db.internal");
     byId.set(KnownTags.DB_INSTANCE_ID, (Object) "orders");
@@ -42,7 +42,7 @@ void matchesTheNameKeyedSettersForEveryValueType() {
     byId.set(KnownTags.DB_POOL_NAME_ID, 2.5d);
 
     TagMap byName = TagMap.create();
-    byName.set(KnownTags.PEER_PORT_NAME, 5432);
+    byName.set(KnownTags.HTTP_STATUS_CODE_NAME, 5432);
     byName.set(KnownTags.HTTP_RESEND_COUNT_NAME, 2L);
     byName.set(KnownTags.PEER_HOSTNAME_NAME, (CharSequence) "db.internal");
     byName.set(KnownTags.DB_INSTANCE_NAME, (Object) "orders");
@@ -51,7 +51,7 @@ void matchesTheNameKeyedSettersForEveryValueType() {
     byName.set(KnownTags.DB_POOL_NAME, 2.5d);
 
     assertEquals(new HashMap<>(byName), new HashMap<>(byId));
-    assertEquals(5432, byId.getEntry(KnownTags.PEER_PORT_NAME).intValue());
+    assertEquals(5432, byId.getEntry(KnownTags.HTTP_STATUS_CODE_NAME).intValue());
   }
 
   @Test

internal-api/src/test/java/datadog/trace/api/TagMapTagHashTest.java

@@ -72,6 +72,9 @@ void everyKnownTagSurvivesBucketCollisionsAndCopies() throws IllegalAccessExcept
     assertEquals(tagIds.size(), copy.size());
     for (long tagId : tagIds) {
       String name = KnownTagCodec.nameOf(tagId);
+      if (KnownTagCodec.keyOf(name) != tagId) {
+        continue; // a name declared per direction does not resolve to either direction's id
+      }
       assertEquals("value", map.getObject(name), name);
       assertEquals("value", copy.getObject(name), name);
     }
@@ -90,12 +93,12 @@ private static List<Long> knownTagIds() throws IllegalAccessException {
   @Test
   void lookupsFindEntriesSetEitherWay() {
     TagMap map = TagMap.create();
-    map.set(KnownTags.PEER_PORT_ID, 5432);
+    map.set(KnownTags.HTTP_STATUS_CODE_ID, 5432);
     map.set("my.custom.tag", "value");
 
-    assertEquals(5432, map.getEntry(KnownTags.PEER_PORT_NAME).intValue());
+    assertEquals(5432, map.getEntry(KnownTags.HTTP_STATUS_CODE_NAME).intValue());
     assertEquals("value", map.getString("my.custom.tag"));
-    assertEquals(5432, map.getAndRemove(KnownTags.PEER_PORT_NAME).intValue());
-    assertEquals(null, map.getEntry(KnownTags.PEER_PORT_NAME));
+    assertEquals(5432, map.getAndRemove(KnownTags.HTTP_STATUS_CODE_NAME).intValue());
+    assertEquals(null, map.getEntry(KnownTags.HTTP_STATUS_CODE_NAME));
   }
 }