Skip to content

Move InferredProxyContext to internal-api… #8795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Move InferredProxyContext to internal-api… #8795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9caf215
Move InferredProxyContext to internal-api and InferredProxyPropagator…
mcculls May 11, 2025
2557c43
InferredProxySpanGroup should be static class to avoid unnecessary de…
mcculls May 11, 2025
54de40f
Merge branch 'master' into mcculls/move-inferred-proxy-code-out-of-co…
mcculls May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;

import datadog.appsec.api.blocking.BlockingException;
import datadog.context.InferredProxyContext;
import datadog.context.propagation.Propagators;
import datadog.trace.api.Config;
import datadog.trace.api.DDTags;
Expand All @@ -31,6 +30,7 @@
import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
import datadog.trace.bootstrap.instrumentation.api.InferredProxyContext;
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
import datadog.trace.bootstrap.instrumentation.api.TagContext;
Expand All @@ -56,7 +56,7 @@
public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST_CARRIER>
extends ServerDecorator {

class InferredProxySpanGroup implements AgentSpan {
static class InferredProxySpanGroup implements AgentSpan {
private final AgentSpan inferredProxySpan;
private final AgentSpan serverSpan;

Expand Down
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import datadog.communication.ddagent.SharedCommunicationObjects;
import datadog.communication.monitor.Monitoring;
import datadog.communication.monitor.Recording;
import datadog.context.propagation.InferredProxyPropagator;
import datadog.context.propagation.Propagators;
import datadog.trace.api.ClassloaderConfigurationOverrides;
import datadog.trace.api.Config;
Expand Down Expand Up @@ -90,6 +89,7 @@
import datadog.trace.core.monitor.TracerHealthMetrics;
import datadog.trace.core.propagation.ExtractedContext;
import datadog.trace.core.propagation.HttpCodec;
import datadog.trace.core.propagation.InferredProxyPropagator;
import datadog.trace.core.propagation.PropagationTags;
import datadog.trace.core.propagation.TracingPropagator;
import datadog.trace.core.propagation.XRayPropagator;
Expand Down
7 changes: 5 additions & 2 deletions .../propagation/InferredProxyPropagator.java → .../propagation/InferredProxyPropagator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package datadog.context.propagation;
package datadog.trace.core.propagation;

import datadog.context.Context;
import datadog.context.InferredProxyContext;
import datadog.context.propagation.CarrierSetter;
import datadog.context.propagation.CarrierVisitor;
import datadog.context.propagation.Propagator;
import datadog.trace.bootstrap.instrumentation.api.InferredProxyContext;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
Expand Down
9 changes: 5 additions & 4 deletions ...og/context/InferredProxyHandlingTest.java → ...ropagation/InferredProxyHandlingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package datadog.context;
package datadog.trace.core.propagation;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import datadog.context.Context;
import datadog.context.propagation.CarrierVisitor;
import datadog.context.propagation.InferredProxyPropagator;
import datadog.trace.bootstrap.instrumentation.api.InferredProxyContext;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -105,7 +106,7 @@ class PropagatorTests { // Kept non-static

@ParameterizedTest(name = "{0}")
@MethodSource(
"datadog.context.InferredProxyHandlingTest#validHeadersProviderForPropagator") // Fully
"datadog.trace.core.propagation.InferredProxyHandlingTest#validHeadersProviderForPropagator") // Fully
// qualified
// name
@DisplayName("Should extract InferredProxyContext when valid headers are present")
Expand Down Expand Up @@ -141,7 +142,7 @@ void testSuccessfulExtraction(

@ParameterizedTest(name = "{0}")
@MethodSource(
"datadog.context.InferredProxyHandlingTest#invalidOrMissingHeadersProviderForPropagator") // Fully qualified name
"datadog.trace.core.propagation.InferredProxyHandlingTest#invalidOrMissingHeadersProviderForPropagator") // Fully qualified name
@DisplayName("Should create InferredProxyContext even if some critical headers are missing")
void testExtractionWithMissingCriticalHeaders(String description, Map<String, String> headers) {
Context rootContext = Context.root();
Expand Down
5 changes: 4 additions & 1 deletion ...datadog/context/InferredProxyContext.java → ...rumentation/api/InferredProxyContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package datadog.context;
package datadog.trace.bootstrap.instrumentation.api;

import datadog.context.Context;
import datadog.context.ContextKey;
import datadog.context.ImplicitContextKeyed;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
Expand Down
Loading