Remove public headers

Author: OStevan

tracing-jersey/src/main/java/com/palantir/tracing/jersey/TraceEnrichingFilter.java

@@ -16,8 +16,8 @@
 
 package com.palantir.tracing.jersey;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
-import com.palantir.tracing.InternalTraceHttpHeaders;
 import com.palantir.tracing.Observability;
 import com.palantir.tracing.TagTranslator;
 import com.palantir.tracing.TraceMetadata;
@@ -57,6 +57,9 @@ public final class TraceEnrichingFilter implements ContainerRequestFilter, Conta
 
     public static final String SAMPLED_PROPERTY_NAME = "com.palantir.tracing.sampled";
 
+    @VisibleForTesting
+    static final String FETCH_USER_AGENT_HEADER = "Fetch-User-Agent";
+
     @Context
     @SuppressWarnings("NullAway") // instantiated using by Jersey using reflection
     private ExtendedUriInfo uriInfo;
@@ -149,7 +152,7 @@ private static Optional<String> getForUserAgent(ContainerRequestContext context)
         if (forUserAgent != null) {
             return Optional.of(forUserAgent);
         }
-        String fetchUserAgent = context.getHeaderString(InternalTraceHttpHeaders.FETCH_USER_AGENT);
+        String fetchUserAgent = context.getHeaderString(FETCH_USER_AGENT_HEADER);
         if (fetchUserAgent != null) {
             return Optional.of(fetchUserAgent);
         }

tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java

@@ -25,7 +25,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.palantir.tracing.InternalTraceHttpHeaders;
 import com.palantir.tracing.InternalTracers;
 import com.palantir.tracing.TraceSampler;
 import com.palantir.tracing.Tracer;
@@ -253,7 +252,8 @@ public void testFilter_setsUserAgentAsForUserAgent() throws Exception {
     @Test
     public void testFilter_setsFetchUserAgentAsForUserAgent() throws Exception {
         when(request.getHeaderString(TraceHttpHeaders.TRACE_ID)).thenReturn("traceId");
-        when(request.getHeaderString(InternalTraceHttpHeaders.FETCH_USER_AGENT)).thenReturn("fetchUserAgent");
+        when(request.getHeaderString(TraceEnrichingFilter.FETCH_USER_AGENT_HEADER))
+                .thenReturn("fetchUserAgent");
         TraceEnrichingFilter.INSTANCE.filter(request);
 
         assertThat(InternalTracers.getForUserAgent()).contains("fetchUserAgent");

tracing-undertow/src/main/java/com/palantir/tracing/undertow/UndertowTracing.java

@@ -16,13 +16,13 @@
 
 package com.palantir.tracing.undertow;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.logsafe.logger.SafeLogger;
 import com.palantir.logsafe.logger.SafeLoggerFactory;
 import com.palantir.tracing.DetachedSpan;
-import com.palantir.tracing.InternalTraceHttpHeaders;
 import com.palantir.tracing.InternalTracers;
 import com.palantir.tracing.Observability;
 import com.palantir.tracing.TagTranslator;
@@ -52,8 +52,9 @@ final class UndertowTracing {
     private static final HttpString IS_SAMPLED = HttpString.tryFromString(TraceHttpHeaders.IS_SAMPLED);
     // Tracing headers for obtaining for constructing forUserAgent.
     private static final HttpString FOR_USER_AGENT = HttpString.tryFromString(TraceHttpHeaders.FOR_USER_AGENT);
-    private static final HttpString FETCH_USER_AGENT =
-            HttpString.tryFromString(InternalTraceHttpHeaders.FETCH_USER_AGENT);
+
+    @VisibleForTesting
+    static final HttpString FETCH_USER_AGENT = HttpString.tryFromString("Fetch-User-Agent");
 
     // Consider moving this to TracingAttachments and making it public. For now it's well encapsulated
     // here because we expect the two handler implementations to be sufficient.

tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedOperationHandlerTest.java

@@ -25,7 +25,6 @@
 import static org.mockito.Mockito.when;
 
 import com.palantir.tracing.DetachedSpan;
-import com.palantir.tracing.InternalTraceHttpHeaders;
 import com.palantir.tracing.InternalTracers;
 import com.palantir.tracing.TraceSampler;
 import com.palantir.tracing.Tracer;
@@ -233,7 +232,7 @@ private void setUserAgent(String userAgent) {
     }
 
     private void setFetchUserAgent(String fetchUserAgent) {
-        setHeader(InternalTraceHttpHeaders.FETCH_USER_AGENT, fetchUserAgent);
+        setHeader(UndertowTracing.FETCH_USER_AGENT, fetchUserAgent);
     }
 
     private void setForUserAgent(String forUserAgent) {