From a4a99c6dff37ba4d36b18f2c2175f4c61e3b82dc Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Fri, 27 Feb 2026 11:11:20 +0100 Subject: [PATCH] Move EndpointResolver to internal-api --- dd-java-agent/appsec/build.gradle | 1 - .../java/com/datadog/appsec/gateway/AppSecRequestContext.java | 2 +- .../trace/core/tagprocessor/HttpEndpointPostProcessor.java | 2 +- .../core/tagprocessor/HttpEndpointPostProcessorTest.groovy | 2 +- .../main/java/datadog/trace/api}/endpoint/EndpointResolver.java | 2 +- .../java/datadog/trace/api}/endpoint/EndpointSimplifier.java | 2 +- .../main/java/datadog/trace/api}/endpoint/SegmentPattern.java | 2 +- .../datadog/trace/api}/endpoint/EndpointResolverTest.groovy | 2 +- .../datadog/trace/api}/endpoint/EndpointSimplifierTest.groovy | 2 +- .../datadog/trace/api}/endpoint/SegmentPatternTest.groovy | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) rename {dd-trace-core/src/main/java/datadog/trace/core => internal-api/src/main/java/datadog/trace/api}/endpoint/EndpointResolver.java (99%) rename {dd-trace-core/src/main/java/datadog/trace/core => internal-api/src/main/java/datadog/trace/api}/endpoint/EndpointSimplifier.java (99%) rename {dd-trace-core/src/main/java/datadog/trace/core => internal-api/src/main/java/datadog/trace/api}/endpoint/SegmentPattern.java (98%) rename {dd-trace-core/src/test/groovy/datadog/trace/core => internal-api/src/test/groovy/datadog/trace/api}/endpoint/EndpointResolverTest.groovy (99%) rename {dd-trace-core/src/test/groovy/datadog/trace/core => internal-api/src/test/groovy/datadog/trace/api}/endpoint/EndpointSimplifierTest.groovy (99%) rename {dd-trace-core/src/test/groovy/datadog/trace/core => internal-api/src/test/groovy/datadog/trace/api}/endpoint/SegmentPatternTest.groovy (99%) diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index 8a375b2541e..879560d0c03 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -16,7 +16,6 @@ dependencies { implementation project(':communication') implementation project(':products:metrics:metrics-api') implementation project(':telemetry') - implementation project(':dd-trace-core') implementation group: 'io.sqreen', name: 'libsqreen', version: '17.3.0' implementation libs.moshi diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java index 419c6263a20..0c48cc27347 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java @@ -11,9 +11,9 @@ import com.datadog.ddwaf.WafHandle; import com.datadog.ddwaf.WafMetrics; import datadog.trace.api.Config; +import datadog.trace.api.endpoint.EndpointResolver; import datadog.trace.api.http.StoredBodySupplier; import datadog.trace.api.internal.TraceSegment; -import datadog.trace.core.endpoint.EndpointResolver; import datadog.trace.util.Numbers; import datadog.trace.util.stacktrace.StackTraceEvent; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java index 5a545dc0381..2da8b40a843 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java @@ -5,11 +5,11 @@ import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_URL; import datadog.trace.api.TagMap; +import datadog.trace.api.endpoint.EndpointResolver; import datadog.trace.api.normalize.HttpResourceNames; import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink; import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities; import datadog.trace.core.DDSpanContext; -import datadog.trace.core.endpoint.EndpointResolver; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.groovy index e292fe3748b..af2a9627847 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.groovy @@ -3,7 +3,7 @@ package datadog.trace.core.tagprocessor import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.core.DDSpanContext -import datadog.trace.core.endpoint.EndpointResolver +import datadog.trace.api.endpoint.EndpointResolver import spock.lang.Specification class HttpEndpointPostProcessorTest extends Specification { diff --git a/dd-trace-core/src/main/java/datadog/trace/core/endpoint/EndpointResolver.java b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointResolver.java similarity index 99% rename from dd-trace-core/src/main/java/datadog/trace/core/endpoint/EndpointResolver.java rename to internal-api/src/main/java/datadog/trace/api/endpoint/EndpointResolver.java index 9e8ee325b07..c5e47328734 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/endpoint/EndpointResolver.java +++ b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointResolver.java @@ -1,4 +1,4 @@ -package datadog.trace.core.endpoint; +package datadog.trace.api.endpoint; import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_ENDPOINT; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/endpoint/EndpointSimplifier.java b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointSimplifier.java similarity index 99% rename from dd-trace-core/src/main/java/datadog/trace/core/endpoint/EndpointSimplifier.java rename to internal-api/src/main/java/datadog/trace/api/endpoint/EndpointSimplifier.java index 93ff6053629..7f3f1bd79fa 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/endpoint/EndpointSimplifier.java +++ b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointSimplifier.java @@ -1,4 +1,4 @@ -package datadog.trace.core.endpoint; +package datadog.trace.api.endpoint; import java.util.ArrayList; import java.util.List; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/endpoint/SegmentPattern.java b/internal-api/src/main/java/datadog/trace/api/endpoint/SegmentPattern.java similarity index 98% rename from dd-trace-core/src/main/java/datadog/trace/core/endpoint/SegmentPattern.java rename to internal-api/src/main/java/datadog/trace/api/endpoint/SegmentPattern.java index 1bfb2323703..0bdf67d5443 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/endpoint/SegmentPattern.java +++ b/internal-api/src/main/java/datadog/trace/api/endpoint/SegmentPattern.java @@ -1,4 +1,4 @@ -package datadog.trace.core.endpoint; +package datadog.trace.api.endpoint; import java.util.regex.Pattern; diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/EndpointResolverTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/endpoint/EndpointResolverTest.groovy similarity index 99% rename from dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/EndpointResolverTest.groovy rename to internal-api/src/test/groovy/datadog/trace/api/endpoint/EndpointResolverTest.groovy index 07525fdafb0..db87e4a2b5a 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/EndpointResolverTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/endpoint/EndpointResolverTest.groovy @@ -1,4 +1,4 @@ -package datadog.trace.core.endpoint +package datadog.trace.api.endpoint import spock.lang.Specification diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/EndpointSimplifierTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/endpoint/EndpointSimplifierTest.groovy similarity index 99% rename from dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/EndpointSimplifierTest.groovy rename to internal-api/src/test/groovy/datadog/trace/api/endpoint/EndpointSimplifierTest.groovy index 3bc8e808280..4a369b2b5a9 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/EndpointSimplifierTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/endpoint/EndpointSimplifierTest.groovy @@ -1,4 +1,4 @@ -package datadog.trace.core.endpoint +package datadog.trace.api.endpoint import spock.lang.Specification diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/SegmentPatternTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/endpoint/SegmentPatternTest.groovy similarity index 99% rename from dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/SegmentPatternTest.groovy rename to internal-api/src/test/groovy/datadog/trace/api/endpoint/SegmentPatternTest.groovy index 08ba5127db6..a7726f3172d 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/endpoint/SegmentPatternTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/endpoint/SegmentPatternTest.groovy @@ -1,4 +1,4 @@ -package datadog.trace.core.endpoint +package datadog.trace.api.endpoint import spock.lang.Specification