self-cr

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

@@ -18,6 +18,7 @@
 
 import com.google.common.base.Strings;
 import com.palantir.tracing.Observability;
+import com.palantir.tracing.TraceMetadata;
 import com.palantir.tracing.Tracer;
 import com.palantir.tracing.Tracers;
 import com.palantir.tracing.api.Span;
@@ -86,7 +87,9 @@ public void filter(ContainerRequestContext requestContext) throws IOException {
         // Give asynchronous downstream handlers access to the trace id
         requestContext.setProperty(TRACE_ID_PROPERTY_NAME, Tracer.getTraceId());
         requestContext.setProperty(SAMPLED_PROPERTY_NAME, Tracer.isTraceObservable());
-        Tracer.getRequestId().ifPresent(requestId -> requestContext.setProperty(REQUEST_ID_PROPERTY_NAME, requestId));
+        Tracer.maybeGetTraceMetadata()
+                .flatMap(TraceMetadata::getRequestId)
+                .ifPresent(requestId -> requestContext.setProperty(REQUEST_ID_PROPERTY_NAME, requestId));
     }
 
     // Handles outgoing response

tracing/src/main/java/com/palantir/tracing/DetachedSpan.java

@@ -64,22 +64,6 @@ static DetachedSpan start(
         return Tracer.detachInternal(observability, traceId, parentSpanId, operation, type);
     }
 
-    /**
-     * Marks the beginning of a span, which you can {@link #complete} on any other thread.
-     *
-     * @see DetachedSpan#start(String)
-     */
-    @CheckReturnValue
-    static DetachedSpan start(
-            Observability observability,
-            String traceId,
-            Optional<String> requestId,
-            Optional<String> parentSpanId,
-            String operation,
-            SpanType type) {
-        return Tracer.detachInternal(observability, traceId, requestId, parentSpanId, operation, type);
-    }
-
     /**
      * Equivalent to {@link Tracer#startSpan(String, SpanType)}, but using this {@link DetachedSpan} as the parent
      * instead of thread state.

tracing/src/main/java/com/palantir/tracing/TraceMetadata.java

@@ -27,6 +27,12 @@ public interface TraceMetadata {
     /** Corresponds to {@link com.palantir.tracing.api.TraceHttpHeaders#TRACE_ID}. */
     String getTraceId();
 
+    /**
+     * Returns the unique request identifier for this thread's trace.
+     * Corresponds to {@link com.palantir.tracing.Tracers#REQUEST_ID_KEY}.
+     */
+    Optional<String> getRequestId();
+
     /** Corresponds to {@link com.palantir.tracing.api.TraceHttpHeaders#SPAN_ID}. */
     String getSpanId();
 

tracing/src/main/java/com/palantir/tracing/Tracer.java

@@ -298,11 +298,6 @@ static Optional<String> getRequestId(DetachedSpan detachedSpan) {
         throw new SafeIllegalStateException("Unknown span type", SafeArg.of("detachedSpan", detachedSpan));
     }
 
-    /** Returns the unique request identifier for this thread's trace. */
-    public static Optional<String> getRequestId() {
-        return checkNotNull(currentTrace.get(), "There is no trace").getRequestId();
-    }
-
     static boolean isSampled(DetachedSpan detachedSpan) {
         return detachedSpan instanceof SampledDetachedSpan;
     }