Context propagation update (OTEP 66)

api/src/jmh/java/io/opentelemetry/trace/propagation/HttpTraceContextExtractBenchmark.java

@@ -16,8 +16,10 @@
 
 package io.opentelemetry.trace.propagation;
 
+import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat.Getter;
 import io.opentelemetry.trace.SpanContext;
+import io.opentelemetry.trace.TracingContextUtils;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -70,7 +72,8 @@ public void setup() {
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   @Warmup(iterations = 5, time = 1)
   public SpanContext measureExtract() {
-    return httpTraceContext.extract(carrier, getter);
+    return TracingContextUtils.getSpanContext(
+        httpTraceContext.extract(Context.current(), carrier, getter));
   }
 
   @TearDown(Level.Iteration)

api/src/jmh/java/io/opentelemetry/trace/propagation/HttpTraceContextInjectBenchmark.java

@@ -16,12 +16,14 @@
 
 package io.opentelemetry.trace.propagation;
 
+import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat.Setter;
 import io.opentelemetry.trace.SpanContext;
 import io.opentelemetry.trace.SpanId;
 import io.opentelemetry.trace.TraceFlags;
 import io.opentelemetry.trace.TraceId;
 import io.opentelemetry.trace.TraceState;
+import io.opentelemetry.trace.TracingContextUtils;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -69,7 +71,8 @@ public void set(Map<String, String> carrier, String key, String value) {
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   @Warmup(iterations = 5, time = 1)
   public Map<String, String> measureInject() {
-    httpTraceContext.inject(contextToTest, carrier, setter);
+    Context context = TracingContextUtils.withSpanContext(contextToTest, Context.current());
+    httpTraceContext.inject(context, carrier, setter);
     return carrier;
   }
 

api/src/main/java/io/opentelemetry/OpenTelemetry.java

@@ -16,10 +16,13 @@
 
 package io.opentelemetry;
 
+import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.context.propagation.DefaultContextPropagators;
 import io.opentelemetry.correlationcontext.CorrelationContextManager;
 import io.opentelemetry.correlationcontext.DefaultCorrelationContextManager;
 import io.opentelemetry.correlationcontext.DefaultCorrelationContextManagerProvider;
 import io.opentelemetry.correlationcontext.spi.CorrelationContextManagerProvider;
+import io.opentelemetry.internal.Utils;
 import io.opentelemetry.metrics.DefaultMeterProvider;
 import io.opentelemetry.metrics.DefaultMetricsProvider;
 import io.opentelemetry.metrics.Meter;
@@ -29,6 +32,7 @@
 import io.opentelemetry.trace.DefaultTracerProvider;
 import io.opentelemetry.trace.Tracer;
 import io.opentelemetry.trace.TracerProvider;
+import io.opentelemetry.trace.propagation.HttpTraceContext;
 import io.opentelemetry.trace.spi.TraceProvider;
 import java.util.ServiceLoader;
 import javax.annotation.Nullable;
@@ -53,6 +57,9 @@ public final class OpenTelemetry {
   private final MeterProvider meterProvider;
   private final CorrelationContextManager contextManager;
 
+  private volatile ContextPropagators propagators =
+      DefaultContextPropagators.builder().addHttpTextFormat(new HttpTraceContext()).build();
+
   /**
    * Returns a singleton {@link TracerProvider}.
    *
@@ -90,6 +97,35 @@ public static CorrelationContextManager getCorrelationContextManager() {
     return getInstance().contextManager;
   }
 
+  /**
+   * Returns a {@link ContextPropagators} object, which can be used to access the set of registered
+   * propagators for each supported format.
+   *
+   * @return registered propagators container, defaulting to a {@link ContextPropagators} object
+   *     with {@link HttpTraceContext} registered.
+   * @throws IllegalStateException if a specified manager (via system properties) could not be
+   *     found.
+   * @since 0.3.0
+   */
+  public static ContextPropagators getPropagators() {
+    return getInstance().propagators;
+  }
+
+  /**
+   * Sets the {@link ContextPropagators} object, which can be used to access the set of registered
+   * propagators for each supported format.
+   *
+   * @param propagators the {@link ContextPropagators} object to be registered.
+   * @throws IllegalStateException if a specified manager (via system properties) could not be
+   *     found.
+   * @throws NullPointerException if {@code propagators} is {@code null}.
+   * @since 0.3.0
+   */
+  public static void setPropagators(ContextPropagators propagators) {
+    Utils.checkNotNull(propagators, "propagators");
+    getInstance().propagators = propagators;
+  }
+
   /** Lazy loads an instance. */
   private static OpenTelemetry getInstance() {
     if (instance == null) {

api/src/main/java/io/opentelemetry/correlationcontext/CorrelationContextManager.java

@@ -17,7 +17,6 @@
 package io.opentelemetry.correlationcontext;
 
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.context.propagation.HttpTextFormat;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -63,53 +62,4 @@ public interface CorrelationContextManager {
    * @since 0.1.0
    */
   Scope withContext(CorrelationContext distContext);
-
-  /**
-   * Returns the {@link HttpTextFormat} for this implementation.
-   *
-   * <p>Usually this will be the W3C Correlation Context as the HTTP text format. For more details,
-   * see <a href="https://github.com/w3c/correlation-context">correlation-context</a>.
-   *
-   * <p>Example of usage on the client:
-   *
-   * <pre>{@code
-   * private static final CorrelationContextManager contextManager =
-   *     OpenTelemetry.getCorrelationContextManager();
-   * private static final HttpTextFormat textFormat = contextManager.getHttpTextFormat();
-   *
-   * private static final HttpTextFormat.Setter setter =
-   *     new HttpTextFormat.Setter<HttpURLConnection>() {
-   *       public void put(HttpURLConnection carrier, String key, String value) {
-   *         carrier.setRequestProperty(field, value);
-   *       }
-   *     };
-   *
-   * void makeHttpRequest() {
-   *   HttpURLConnection connection =
-   *       (HttpURLConnection) new URL("http://myserver").openConnection();
-   *   textFormat.inject(contextManager.getCurrentContext(), connection, httpURLConnectionSetter);
-   *   // Send the request, wait for response and maybe set the status if not ok.
-   * }
-   * }</pre>
-   *
-   * <p>Example of usage on the server:
-   *
-   * <pre>{@code
-   * private static final CorrelationContextManager contextManager =
-   *     OpenTelemetry.getCorrelationContextManager();
-   * private static final HttpTextFormat textFormat = contextManager.getHttpTextFormat();
-   * private static final HttpTextFormat.Getter<HttpRequest> getter = ...;
-   *
-   * void onRequestReceived(HttpRequest request) {
-   *   CorrelationContext distContext = textFormat.extract(request, getter);
-   *   try (Scope s = contextManager.withContext(distContext)) {
-   *     // Handle request and send response back.
-   *   }
-   * }
-   * }</pre>
-   *
-   * @return the {@code HttpTextFormat} for this implementation.
-   * @since 0.1.0
-   */
-  HttpTextFormat<CorrelationContext> getHttpTextFormat();
 }

api/src/main/java/io/opentelemetry/correlationcontext/CorrelationsContextUtils.java

@@ -31,7 +31,8 @@
 @Immutable
 public final class CorrelationsContextUtils {
   private static final Context.Key<CorrelationContext> CORR_CONTEXT_KEY =
-      Context.key("opentelemetry-corr-context-key");
+      Context.keyWithDefault(
+          "opentelemetry-corr-context-key", EmptyCorrelationContext.getInstance());
 
   /**
    * Creates a new {@code Context} with the given value set.
@@ -65,8 +66,7 @@ public static CorrelationContext getCurrentCorrelationContext() {
    * @since 0.3.0
    */
   public static CorrelationContext getCorrelationContext(Context context) {
-    CorrelationContext corrContext = CORR_CONTEXT_KEY.get(context);
-    return corrContext == null ? EmptyCorrelationContext.getInstance() : corrContext;
+    return CORR_CONTEXT_KEY.get(context);
   }
 
   /**
@@ -79,7 +79,8 @@ public static CorrelationContext getCorrelationContext(Context context) {
    */
   @Nullable
   public static CorrelationContext getCorrelationContextWithoutDefault(Context context) {
-    return CORR_CONTEXT_KEY.get(context);
+    CorrelationContext corrContext = CORR_CONTEXT_KEY.get(context);
+    return corrContext == EmptyCorrelationContext.getInstance() ? null : corrContext;
   }
 
   /**

api/src/main/java/io/opentelemetry/correlationcontext/DefaultCorrelationContextManager.java

@@ -17,10 +17,7 @@
 package io.opentelemetry.correlationcontext;
 
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.context.propagation.HttpTextFormat;
 import io.opentelemetry.internal.Utils;
-import java.util.Collections;
-import java.util.List;
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -33,8 +30,6 @@
 public final class DefaultCorrelationContextManager implements CorrelationContextManager {
   private static final DefaultCorrelationContextManager INSTANCE =
       new DefaultCorrelationContextManager();
-  private static final HttpTextFormat<CorrelationContext> HTTP_TEXT_FORMAT =
-      new NoopHttpTextFormat();
 
   /**
    * Returns a {@code CorrelationContextManager} singleton that is the default implementation for
@@ -62,11 +57,6 @@ public Scope withContext(CorrelationContext distContext) {
     return CorrelationsContextUtils.currentContextWith(distContext);
   }
 
-  @Override
-  public HttpTextFormat<CorrelationContext> getHttpTextFormat() {
-    return HTTP_TEXT_FORMAT;
-  }
-
   @Immutable
   private static final class NoopCorrelationContextBuilder implements CorrelationContext.Builder {
     @Override
@@ -82,10 +72,10 @@ public CorrelationContext.Builder setNoParent() {
 
     @Override
     public CorrelationContext.Builder put(
-        EntryKey key, EntryValue value, EntryMetadata tagMetadata) {
+        EntryKey key, EntryValue value, EntryMetadata entryMetadata) {
       Utils.checkNotNull(key, "key");
       Utils.checkNotNull(value, "value");
-      Utils.checkNotNull(tagMetadata, "tagMetadata");
+      Utils.checkNotNull(entryMetadata, "entryMetadata");
       return this;
     }
 
@@ -100,26 +90,4 @@ public CorrelationContext build() {
       return EmptyCorrelationContext.getInstance();
     }
   }
-
-  @Immutable
-  private static final class NoopHttpTextFormat implements HttpTextFormat<CorrelationContext> {
-    @Override
-    public List<String> fields() {
-      return Collections.emptyList();
-    }
-
-    @Override
-    public <C> void inject(CorrelationContext distContext, C carrier, Setter<C> setter) {
-      Utils.checkNotNull(distContext, "distContext");
-      Utils.checkNotNull(carrier, "carrier");
-      Utils.checkNotNull(setter, "setter");
-    }
-
-    @Override
-    public <C> CorrelationContext extract(C carrier, Getter<C> getter) {
-      Utils.checkNotNull(carrier, "carrier");
-      Utils.checkNotNull(getter, "getter");
-      return EmptyCorrelationContext.getInstance();
-    }
-  }
 }

api/src/main/java/io/opentelemetry/trace/DefaultTracer.java

@@ -16,12 +16,12 @@
 
 package io.opentelemetry.trace;
 
+import io.grpc.Context;
 import io.opentelemetry.common.AttributeValue;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.context.propagation.HttpTextFormat;
 import io.opentelemetry.internal.Utils;
-import io.opentelemetry.trace.propagation.HttpTraceContext;
 import java.util.Map;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -32,7 +32,6 @@
 @ThreadSafe
 public final class DefaultTracer implements Tracer {
   private static final DefaultTracer INSTANCE = new DefaultTracer();
-  private static final HttpTextFormat<SpanContext> HTTP_TEXT_FORMAT = new HttpTraceContext();
 
   /**
    * Returns a {@code Tracer} singleton that is the default implementations for {@link Tracer}.
@@ -56,30 +55,24 @@ public Scope withSpan(Span span) {
 
   @Override
   public Span.Builder spanBuilder(String spanName) {
-    return NoopSpanBuilder.create(this, spanName);
-  }
-
-  @Override
-  public HttpTextFormat<SpanContext> getHttpTextFormat() {
-    return HTTP_TEXT_FORMAT;
+    return NoopSpanBuilder.create(spanName);
   }
 
   private DefaultTracer() {}
 
   // Noop implementation of Span.Builder.
   private static final class NoopSpanBuilder implements Span.Builder {
-    static NoopSpanBuilder create(Tracer tracer, String spanName) {
-      return new NoopSpanBuilder(tracer, spanName);
+    static NoopSpanBuilder create(String spanName) {
+      return new NoopSpanBuilder(spanName);
     }
 
-    private final Tracer tracer;
     private boolean isRootSpan;
-    private SpanContext spanContext;
+    @Nullable private SpanContext spanContext;
 
     @Override
     public Span startSpan() {
       if (spanContext == null && !isRootSpan) {
-        spanContext = tracer.getCurrentSpan().getContext();
+        spanContext = TracingContextUtils.getEffectiveSpanContext(Context.current());
       }
 
       return spanContext != null && !SpanContext.getInvalid().equals(spanContext)
@@ -165,9 +158,8 @@ public NoopSpanBuilder setStartTimestamp(long startTimestamp) {
       return this;
     }
 
-    private NoopSpanBuilder(Tracer tracer, String name) {
+    private NoopSpanBuilder(String name) {
       Utils.checkNotNull(name, "name");
-      this.tracer = tracer;
     }
   }
 }