zacharycmontoya · Sep 23, 2026 · Sep 24, 2026 · Oct 6, 2026 · Oct 6, 2026 · Oct 1, 2026
@@ -161,6 +161,7 @@
 /dd-trace-api/src/*/*/datadog/trace/api/TracePropagation*               @DataDog/apm-sdk-capabilities
 /dd-trace-api/src/*/*/datadog/trace/api/sampling                        @DataDog/apm-sdk-capabilities
 /internal-api/src/*/*/datadog/trace/bootstrap                           @DataDog/apm-sdk-capabilities
+/internal-api/src/*/*/datadog/trace/bootstrap/instrumentation/api/http/ @DataDog/apm-sdk-capabilities
 /internal-api/src/*/*/datadog/trace/api/propagation/                    @DataDog/apm-sdk-capabilities
 /internal-api/src/*/*/datadog/trace/api/sampling                        @DataDog/apm-sdk-capabilities
 /internal-api/src/*/*/datadog/trace/api/scopemanager/                   @DataDog/apm-sdk-capabilities

@@ -14,7 +14,6 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
 import datadog.trace.bootstrap.instrumentation.api.SpanPrototype;
-import datadog.trace.bootstrap.instrumentation.api.Tags;
 import java.lang.reflect.Method;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -224,12 +223,12 @@ public final void onPeerConnection(
   }
 
   public void setPeerPort(AgentSpan span, String port) {
-    span.setTag(Tags.PEER_PORT, port);
+    span.setTag(KnownTags.PEER_PORT_ID, port);
   }
 
   public void setPeerPort(AgentSpan span, int port) {
     if (port > UNSET_PORT) {
-      span.setTag(Tags.PEER_PORT, port);
+      span.setTag(KnownTags.PEER_PORT_ID, port);
     }
   }
 

@@ -7,8 +7,8 @@
 
 import datadog.appsec.api.blocking.BlockingException;
 import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
 import datadog.trace.api.InstrumenterConfig;
+import datadog.trace.api.KnownTags;
 import datadog.trace.api.ProductActivation;
 import datadog.trace.api.appsec.HttpClientRequest;
 import datadog.trace.api.datastreams.DataStreamsTransactionExtractor;
@@ -23,9 +23,11 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
-import datadog.trace.bootstrap.instrumentation.api.Tags;
-import datadog.trace.bootstrap.instrumentation.api.URIUtils;
+import datadog.trace.bootstrap.instrumentation.api.OtelHttpSemantics;
+import datadog.trace.bootstrap.instrumentation.api.TagExtractor;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
+import datadog.trace.bootstrap.instrumentation.api.http.DatadogClientUrl;
+import datadog.trace.bootstrap.instrumentation.api.http.OtelClientUrl;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.BitSet;
@@ -42,6 +44,9 @@ public abstract class HttpClientDecorator<REQUEST, RESPONSE> extends UriBasedCli
   private static final String DD_CLIENT_LIBRARY_LANGUAGE_HEADER_NAME = "DD-Client-Library-Language";
 
   private static final BitSet CLIENT_ERROR_STATUSES = Config.get().getHttpClientErrorStatuses();
+  private static final boolean OTEL_SEMANTICS = Config.get().isTraceOtelSemanticsEnabled();
+  private static final TagExtractor<URI> URL_TAGS =
+      OTEL_SEMANTICS ? OtelClientUrl.INSTANCE : DatadogClientUrl.INSTANCE;
 
   private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
 
@@ -118,7 +123,14 @@ protected void doOnRequest(final AgentSpan span, final REQUEST request) {
               DSM_TRANSACTION_SOURCE_READER);
 
       String method = method(request);
-      span.setTag(Tags.HTTP_METHOD, method);
+      if (OTEL_SEMANTICS) {
+        OtelHttpSemantics.setRequestMethod(span, method);
+        if (shouldSetResourceName()) {
+          OtelHttpSemantics.setMethodResourceName(span, method);
+        }
+      } else {
+        span.setTag(KnownTags.HTTP_METHOD_ID, method);
+      }
 
       if (CLIENT_TAG_HEADERS) {
         for (Map.Entry<String, String> headerTag :
@@ -130,24 +142,18 @@ protected void doOnRequest(final AgentSpan span, final REQUEST request) {
         }
       }
 
-      // Copy of HttpServerDecorator url handling
       try {
         final URI url = url(request);
         if (url != null) {
           onURI(span, url);
-          span.setTag(
-              Tags.HTTP_URL,
-              URIUtils.lazyValidURL(url.getScheme(), url.getHost(), url.getPort(), url.getPath()));
-          if (Config.get().isHttpClientTagQueryString()) {
-            span.setTag(DDTags.HTTP_QUERY, url.getQuery());
-            span.setTag(DDTags.HTTP_FRAGMENT, url.getFragment());
-          }
+          span.setTagsFrom(url, URL_TAGS);
+          // Explicit path mappings take precedence over the default name in either semantic mode.
           if (shouldSetResourceName()) {
             HTTP_RESOURCE_DECORATOR.withClientPath(span, method, url.getPath());
           }
           // SSRF exploit prevention check
           onHttpClientRequest(span, url.toString());
-        } else if (shouldSetResourceName()) {
+        } else if (!OTEL_SEMANTICS && shouldSetResourceName()) {
           span.setResourceName(DEFAULT_RESOURCE_NAME);
         }
       } catch (final BlockingException e) {
@@ -177,6 +183,9 @@ protected void doOnResponse(final AgentSpan span, final RESPONSE response) {
         span.setHttpStatusCode(status);
         if (CLIENT_ERROR_STATUSES.get(status)) {
           span.setError(true);
+          if (OTEL_SEMANTICS) {
+            OtelHttpSemantics.setErrorType(span, status);
+          }
         }
       }
 

@@ -13,7 +13,7 @@
 import datadog.context.Context;
 import datadog.context.propagation.Propagators;
 import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
+import datadog.trace.api.KnownTags;
 import datadog.trace.api.datastreams.DataStreamsTransactionExtractor;
 import datadog.trace.api.datastreams.DataStreamsTransactionTracker;
 import datadog.trace.api.function.TriConsumer;
@@ -34,12 +34,16 @@
 import datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData;
 import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
+import datadog.trace.bootstrap.instrumentation.api.OtelHttpSemantics;
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
+import datadog.trace.bootstrap.instrumentation.api.TagExtractor;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.bootstrap.instrumentation.api.URIDataAdapter;
-import datadog.trace.bootstrap.instrumentation.api.URIUtils;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
+import datadog.trace.bootstrap.instrumentation.api.http.DatadogServerUrl;
+import datadog.trace.bootstrap.instrumentation.api.http.HttpServerUrl;
+import datadog.trace.bootstrap.instrumentation.api.http.OtelServerUrl;
 import datadog.trace.bootstrap.instrumentation.decorator.http.ClientIpAddressResolver;
 import java.net.InetAddress;
 import java.util.BitSet;
@@ -68,13 +72,17 @@ public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST
   public static final String DD_IGNORE_COMMIT_ATTRIBUTE = "datadog.commit.ignore";
 
   private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
+  private static final boolean OTEL_SEMANTICS = Config.get().isTraceOtelSemanticsEnabled();
+  private static final TagExtractor<HttpServerUrl> URL_TAGS =
+      OTEL_SEMANTICS ? OtelServerUrl.INSTANCE : DatadogServerUrl.INSTANCE;
   protected static final UTF8BytesString NOT_FOUND_RESOURCE_NAME = UTF8BytesString.create("404");
   protected static final boolean SHOULD_SET_404_RESOURCE_NAME =
-      Config.get().isRuleEnabled("URLAsResourceNameRule")
+      !OTEL_SEMANTICS
+          && Config.get().isRuleEnabled("URLAsResourceNameRule")
           && Config.get().isRuleEnabled("Status404Rule")
           && Config.get().isRuleEnabled("Status404Decorator");
   private static final boolean SHOULD_SET_URL_RESOURCE_NAME =
-      Config.get().isRuleEnabled("URLAsResourceNameRule");
+      !OTEL_SEMANTICS && Config.get().isRuleEnabled("URLAsResourceNameRule");
 
   private static final BitSet SERVER_ERROR_STATUSES = Config.get().getHttpServerErrorStatuses();
   private static final String DEFAULT_INSTRUMENTATION_NAME = "http-server";
@@ -323,40 +331,36 @@ protected void doOnRequest(
       }
       String userAgent = extracted.getUserAgent();
       if (userAgent != null) {
-        span.setTag(Tags.HTTP_USER_AGENT, userAgent);
+        span.setTag(KnownTags.HTTP_USERAGENT_ID, userAgent);
       }
     }
 
     if (request != null) {
       String method = method(request);
-      span.setTag(Tags.HTTP_METHOD, method);
+      if (OTEL_SEMANTICS) {
+        OtelHttpSemantics.setRequestMethod(span, method);
+        OtelHttpSemantics.setMethodResourceName(span, method);
+      } else {
+        span.setTag(KnownTags.HTTP_METHOD_ID, method);
+      }
 
-      // Copy of HttpClientDecorator url handling
       try {
         final URIDataAdapter url = url(request);
         if (url != null) {
           boolean supportsRaw = url.supportsRaw();
           boolean encoded = supportsRaw && config.isHttpServerRawResource();
           boolean valid = url.isValid();
           String path = encoded ? url.rawPath() : url.path();
-          if (valid) {
-            span.setTag(
-                Tags.HTTP_URL, URIUtils.lazyValidURL(url.scheme(), url.host(), url.port(), path));
-          } else if (supportsRaw) {
-            span.setTag(Tags.HTTP_URL, URIUtils.lazyInvalidUrl(url.raw()));
-          }
-          if (extracted != null && extracted.getXForwardedHost() != null) {
-            span.setTag(Tags.HTTP_HOSTNAME, extracted.getXForwardedHost());
-          } else if (url.host() != null) {
-            span.setTag(Tags.HTTP_HOSTNAME, url.host());
-          }
-
-          if (valid && config.isHttpServerTagQueryString()) {
-            String query =
-                supportsRaw && config.isHttpServerRawQueryString() ? url.rawQuery() : url.query();
-            span.setTag(DDTags.HTTP_QUERY, query);
-            span.setTag(DDTags.HTTP_FRAGMENT, url.fragment());
-          }
+          span.setTagsFrom(
+              HttpServerUrl.fromRequest(
+                  url,
+                  path,
+                  extracted,
+                  // Only OTel origin resolution uses Host to resolve ports after a scheme change.
+                  OTEL_SEMANTICS && extracted != null && extracted.getXForwardedProto() != null
+                      ? getRequestHeader(request, "Host")
+                      : null),
+              URL_TAGS);
           Flow<Void> flow = callIGCallbackURI(span, url, method);
           if (flow.getAction() instanceof RequestBlockingAction) {
             span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
@@ -398,7 +402,7 @@ protected void doOnRequest(
       if (inferredAddress != null) {
         inferredAddressStr = inferredAddress.getHostAddress();
         if (shouldTagIps) {
-          span.setTag(Tags.HTTP_CLIENT_IP, inferredAddressStr);
+          span.setTag(KnownTags.HTTP_CLIENT_IP_ID, inferredAddressStr);
         }
       }
     } else if (shouldTagIps && span.getLocalRootSpan() != span) {
@@ -410,18 +414,21 @@ protected void doOnRequest(
       AgentSpan localRootSpan = span.getLocalRootSpan();
       Object clientIp = localRootSpan.getTag(Tags.HTTP_CLIENT_IP);
       if (clientIp != null) {
-        span.setTag(Tags.HTTP_CLIENT_IP, clientIp);
+        span.setTag(KnownTags.HTTP_CLIENT_IP_ID, clientIp);
       }
     }
 
     if (peerIp != null) {
       if (peerIp.indexOf(':') > 0) {
-        span.setTag(Tags.PEER_HOST_IPV6, peerIp);
+        span.setTag(KnownTags.PEER_IPV6_ID, peerIp);
       } else {
-        span.setTag(Tags.PEER_HOST_IPV4, peerIp);
+        span.setTag(KnownTags.PEER_IPV4_ID, peerIp);
       }
       if (shouldTagIps) {
-        span.setTag(Tags.NETWORK_CLIENT_IP, peerIp);
+        span.setTag(KnownTags.NETWORK_CLIENT_IP_ID, peerIp);
+        if (OTEL_SEMANTICS && span.getTag(KnownTags.HTTP_CLIENT_IP_OTEL_NAME) == null) {
+          span.setTag(KnownTags.HTTP_CLIENT_IP_ID, peerIp);
+        }
       }
     }
     if (shouldStashIps && (peerIp != null || inferredAddressStr != null)) {
@@ -484,6 +491,9 @@ protected void doOnResponseStatus(final AgentSpan span, final int status) {
       if (!BlockingException.class.getName().equals(span.getTag("error.type"))) {
         span.setError(SERVER_ERROR_STATUSES.get(status), ErrorPriorities.HTTP_SERVER_DECORATOR);
       }
+      if (OTEL_SEMANTICS && SERVER_ERROR_STATUSES.get(status)) {
+        OtelHttpSemantics.setErrorType(span, status);
+      }
     }
 
     if (SHOULD_SET_404_RESOURCE_NAME && status == 404) {

@@ -8,19 +8,23 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.datastreams.DataStreamsContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.OtelHttpSemantics;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import java.net.URI;
 import javax.annotation.Nonnull;
 
 public abstract class UriBasedClientDecorator extends ClientDecorator {
+  private static final boolean OTEL_SEMANTICS = Config.get().isTraceOtelSemanticsEnabled();
+
   public void onURI(@Nonnull final AgentSpan span, @Nonnull final URI uri) {
     String host = uri.getHost();
-    int port = uri.getPort();
     if (null != host && !host.isEmpty()) {
       span.setTag(Tags.PEER_HOSTNAME, host);
       if (Config.get().isHttpClientSplitByDomain() && host.charAt(0) >= 'A') {
         span.setServiceName(host, component());
       }
+      // Port tagging must follow domain splitting so split-by-tags keeps its precedence.
+      int port = OTEL_SEMANTICS ? OtelHttpSemantics.serverPort(uri) : uri.getPort();
       if (port > 0) {
         setPeerPort(span, port);
       }

@@ -1,12 +1,15 @@
 package datadog.trace.bootstrap.instrumentation.decorator;
 
+import datadog.trace.api.Config;
 import datadog.trace.api.cache.DDCache;
 import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
-import datadog.trace.bootstrap.instrumentation.api.Tags;
+import datadog.trace.bootstrap.instrumentation.api.TagExtractor;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
+import datadog.trace.bootstrap.instrumentation.api.http.DatadogClientUrl;
+import datadog.trace.bootstrap.instrumentation.api.http.OtelClientUrl;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -16,6 +19,10 @@
 import org.slf4j.LoggerFactory;
 
 public class UrlConnectionDecorator extends UriBasedClientDecorator {
+  private static final TagExtractor<URI> URL_TAGS =
+      Config.get().isTraceOtelSemanticsEnabled()
+          ? OtelClientUrl.INSTANCE
+          : DatadogClientUrl.FULL_URL;
   private static final DDCache<String, CharSequence> CACHE = DDCaches.newFixedSizeCache(16);
 
   private static final Function<String, CharSequence> ADDER =
@@ -51,7 +58,7 @@ protected String service() {
   @Override
   public void onURI(@Nonnull AgentSpan span, @Nonnull URI uri) {
     super.onURI(span, uri);
-    span.setTag(Tags.HTTP_URL, uri.toString());
+    span.setTagsFrom(uri, URL_TAGS);
   }
 
   public void onURL(@Nonnull final AgentSpan span, @Nonnull final URL url) {