Update name.

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

@@ -76,7 +76,7 @@ private static List<Context> createContexts(List<SpanContext> spanContexts) {
     List<Context> contexts = new ArrayList<>();
     for (SpanContext context : spanContexts) {
       contexts.add(
-          OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(context), Context.ROOT));
+          OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(context), Context.ROOT));
     }
     return contexts;
   }

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

@@ -97,7 +97,7 @@ default Span getCurrentSpan(Context context) {
   }
 
   /** Sets the Span for the specified Context. */
-  default Context setCurrentSpan(Span span, Context context) {
+  default Context contextWithSpan(Span span, Context context) {
     return TracingContextUtils.withSpan(span, context);
   }
 

api/src/main/java/io/opentelemetry/trace/propagation/HttpTraceContext.java

@@ -149,7 +149,7 @@ public <C> void inject(Context context, C carrier, Setter<C> setter) {
       return context;
     }
 
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   private static <C> SpanContext extractImpl(C carrier, Getter<C> getter) {

api/src/test/java/io/opentelemetry/trace/propagation/HttpTraceContextTest.java

@@ -52,7 +52,7 @@ private static SpanContext getSpanContext(Context context) {
   }
 
   private static Context withSpanContext(SpanContext spanContext, Context context) {
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   @Test

extensions/trace_propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextInjectBenchmark.java

@@ -64,7 +64,7 @@ public abstract static class AbstractContextInjectBenchmark {
     public Map<String, String> measureInject() {
       Context context =
           OpenTelemetry.getTracer()
-              .setCurrentSpan(DefaultSpan.create(contextToTest), Context.current());
+              .contextWithSpan(DefaultSpan.create(contextToTest), Context.current());
       doInject(context, carrier);
       return carrier;
     }

extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagator.java

@@ -128,7 +128,7 @@ public <C> Context extract(Context context, C carrier, Getter<C> getter) {
       return context;
     }
 
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   private static <C> SpanContext getSpanContextFromHeader(C carrier, Getter<C> getter) {

extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorMultipleHeaders.java

@@ -32,7 +32,7 @@ public <C> Context extract(Context context, C carrier, TextMapPropagator.Getter<
       return context;
     }
 
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   private static <C> SpanContext getSpanContextFromMultipleHeaders(

extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorSingleHeader.java

@@ -31,7 +31,7 @@ public <C> Context extract(Context context, C carrier, TextMapPropagator.Getter<
       return context;
     }
 
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   @SuppressWarnings("StringSplitter")

extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagator.java

@@ -118,7 +118,7 @@ public <C> Context extract(Context context, C carrier, Getter<C> getter) {
       return context;
     }
 
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   @SuppressWarnings("StringSplitter")

extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagator.java

@@ -79,7 +79,7 @@ public <C> Context extract(Context context, C carrier, Getter<C> getter) {
     if (!spanContext.isValid()) {
       return context;
     }
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   static SpanContext buildSpanContext(String traceId, String spanId, String sampled) {

extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagatorTest.java

@@ -244,7 +244,7 @@ void extract_InvalidFlags_NonNumeric() {
   }
 
   private static Context withSpanContext(SpanContext spanContext, Context context) {
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   private static SpanContext getSpanContext(Context context) {

extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorTest.java

@@ -52,7 +52,7 @@ private static SpanContext getSpanContext(Context context) {
   }
 
   private static Context withSpanContext(SpanContext spanContext, Context context) {
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   @Test

extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagatorTest.java

@@ -64,7 +64,7 @@ private static SpanContext getSpanContext(Context context) {
   }
 
   private static Context withSpanContext(SpanContext spanContext, Context context) {
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   @Test

extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagatorTest.java

@@ -40,7 +40,7 @@ private static SpanContext getSpanContext(Context context) {
   }
 
   private static Context withSpanContext(SpanContext spanContext, Context context) {
-    return OpenTelemetry.getTracer().setCurrentSpan(DefaultSpan.create(spanContext), context);
+    return OpenTelemetry.getTracer().contextWithSpan(DefaultSpan.create(spanContext), context);
   }
 
   @Test

extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/TraceMultiPropagatorTest.java

@@ -48,7 +48,7 @@ private static Span getSpan(Context context) {
   }
 
   private static Context withSpan(Span span, Context context) {
-    return OpenTelemetry.getTracer().setCurrentSpan(span, context);
+    return OpenTelemetry.getTracer().contextWithSpan(span, context);
   }
 
   @BeforeEach

extensions/trace_utils/src/main/java/io/opentelemetry/extensions/trace/CurrentSpanUtils.java

@@ -55,7 +55,7 @@ private RunnableInSpan(Span span, Runnable runnable, boolean endSpan) {
     @Override
     public void run() {
       Context origContext =
-          OpenTelemetry.getTracer().setCurrentSpan(span, Context.current()).attach();
+          OpenTelemetry.getTracer().contextWithSpan(span, Context.current()).attach();
       try {
         runnable.run();
       } catch (Throwable t) {
@@ -89,7 +89,7 @@ private CallableInSpan(Span span, Callable<V> callable, boolean endSpan) {
     @Override
     public V call() throws Exception {
       Context origContext =
-          OpenTelemetry.getTracer().setCurrentSpan(span, Context.current()).attach();
+          OpenTelemetry.getTracer().contextWithSpan(span, Context.current()).attach();
       try {
         return callable.call();
       } catch (Exception e) {

integration_tests/tracecontext/src/main/java/io/opentelemetry/Application.java

@@ -91,7 +91,7 @@ public String get(HttpServletRequest carrier, String key) {
                       .setParent(context)
                       .startSpan();
 
-              Context withSpanContext = OpenTelemetry.getTracer().setCurrentSpan(span, context);
+              Context withSpanContext = OpenTelemetry.getTracer().contextWithSpan(span, context);
 
               // Make a new request using the builder
               okhttp3.Request.Builder reqBuilder = new okhttp3.Request.Builder();

opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/Propagation.java

@@ -25,7 +25,7 @@ final class Propagation extends BaseShimObject {
   public void injectTextMap(SpanContextShim contextShim, TextMapInject carrier) {
     Context context =
         OpenTelemetry.getTracer()
-            .setCurrentSpan(DefaultSpan.create(contextShim.getSpanContext()), Context.current());
+            .contextWithSpan(DefaultSpan.create(contextShim.getSpanContext()), Context.current());
     context = BaggageUtils.withBaggage(contextShim.getBaggage(), context);
 
     propagators().getTextMapPropagator().inject(context, carrier, TextMapSetter.INSTANCE);

opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java

@@ -185,13 +185,13 @@ public Span start() {
       builder.setNoParent();
     } else if (parentSpan != null) {
       builder.setParent(
-          OpenTelemetry.getTracer().setCurrentSpan(parentSpan.getSpan(), Context.ROOT));
+          OpenTelemetry.getTracer().contextWithSpan(parentSpan.getSpan(), Context.ROOT));
       SpanContextShim contextShim = spanContextTable().get(parentSpan);
       distContext = contextShim == null ? null : contextShim.getBaggage();
     } else if (parentSpanContext != null) {
       builder.setParent(
           OpenTelemetry.getTracer()
-              .setCurrentSpan(
+              .contextWithSpan(
                   DefaultSpan.create(parentSpanContext.getSpanContext()), Context.ROOT));
       distContext = parentSpanContext.getBaggage();
     }

sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java

@@ -585,7 +585,7 @@ void noParent_override() {
               tracerSdk
                   .spanBuilder(SPAN_NAME)
                   .setNoParent()
-                  .setParent(OpenTelemetry.getTracer().setCurrentSpan(parent, Context.current()))
+                  .setParent(OpenTelemetry.getTracer().contextWithSpan(parent, Context.current()))
                   .startSpan();
       try {
         assertThat(span.getContext().getTraceIdAsHexString())
@@ -598,7 +598,7 @@ void noParent_override() {
                 tracerSdk
                     .spanBuilder(SPAN_NAME)
                     .setNoParent()
-                    .setParent(OpenTelemetry.getTracer().setCurrentSpan(parent, Context.current()))
+                    .setParent(OpenTelemetry.getTracer().contextWithSpan(parent, Context.current()))
                     .startSpan();
         try {
           assertThat(span2.getContext().getTraceIdAsHexString())
@@ -624,7 +624,7 @@ void overrideNoParent_remoteParent() {
               tracerSdk
                   .spanBuilder(SPAN_NAME)
                   .setNoParent()
-                  .setParent(OpenTelemetry.getTracer().setCurrentSpan(parent, Context.current()))
+                  .setParent(OpenTelemetry.getTracer().contextWithSpan(parent, Context.current()))
                   .startSpan();
       try {
         assertThat(span.getContext().getTraceIdAsHexString())
@@ -642,7 +642,7 @@ void overrideNoParent_remoteParent() {
   @Test
   void parent_fromContext() {
     Span parent = tracerSdk.spanBuilder(SPAN_NAME).startSpan();
-    Context context = OpenTelemetry.getTracer().setCurrentSpan(parent, Context.current());
+    Context context = OpenTelemetry.getTracer().contextWithSpan(parent, Context.current());
     try {
       RecordEventsReadableSpan span =
           (RecordEventsReadableSpan)
@@ -712,7 +712,7 @@ void parent_invalidContext() {
         (RecordEventsReadableSpan)
             tracerSdk
                 .spanBuilder(SPAN_NAME)
-                .setParent(OpenTelemetry.getTracer().setCurrentSpan(parent, Context.current()))
+                .setParent(OpenTelemetry.getTracer().contextWithSpan(parent, Context.current()))
                 .startSpan();
     try {
       assertThat(span.getContext().getTraceIdAsHexString())

sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/TracerSdkTest.java

@@ -64,7 +64,7 @@ void defaultSpanBuilder() {
   void getCurrentSpan() {
     assertThat(tracer.getCurrentSpan()).isInstanceOf(DefaultSpan.class);
     Context origContext =
-        OpenTelemetry.getTracer().setCurrentSpan(span, Context.current()).attach();
+        OpenTelemetry.getTracer().contextWithSpan(span, Context.current()).attach();
     // Make sure context is detached even if test fails.
     try {
       assertThat(tracer.getCurrentSpan()).isSameAs(span);

sdk_extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/HandlerTest.java

@@ -102,7 +102,8 @@ void bad_solution_to_set_parent() throws Exception {
       client =
           new Client(
               new RequestHandler(
-                  tracer, OpenTelemetry.getTracer().setCurrentSpan(parentSpan, Context.current())));
+                  tracer,
+                  OpenTelemetry.getTracer().contextWithSpan(parentSpan, Context.current())));
       String response = client.send("correct_parent").get(15, TimeUnit.SECONDS);
       assertThat(response).isEqualTo("correct_parent:response");
     } finally {