Internal - remove workaround, bug fixed in sdk v1.61.0.

libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagator.java

@@ -171,7 +171,6 @@ public <C> Context extract(Context context, C carrier, TextMapGetter<C> getter)
         context =
             context.with(TriggerTraceContextKey.XTRACE_OPTIONS_SIGNATURE, traceOptionsSignature);
       }
-      PropagatedContext.set(xTraceOptions);
     }
 
     final String traceState = getter.get(carrier, TRACE_STATE);

libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsSampler.java

@@ -104,77 +104,68 @@ public SamplingResult shouldSample(
 
     final SamplingResult samplingResult;
     final AttributesBuilder additionalAttributesBuilder = Attributes.builder();
-    XtraceOptions xTraceOptions = parentContext.get(TriggerTraceContextKey.KEY);
-
-    if (xTraceOptions == null) {
-      xTraceOptions = PropagatedContext.getXtraceOptions();
-    }
+    final XtraceOptions xTraceOptions = parentContext.get(TriggerTraceContextKey.KEY);
 
     String xtraceOptionsResponseStr = null;
     List<String> signals =
         Arrays.asList(
             constructUrl(attributes), String.format(LAYER_NAME_PLACEHOLDER, spanKind, name.trim()));
 
-    try {
-      if (!parentSpanContext.isValid()) { // no valid traceparent, it is a new trace
-        TraceDecision traceDecision = shouldTraceRequest(name, null, xTraceOptions, signals);
-        samplingResult = toOtSamplingResult(traceDecision, xTraceOptions, true);
-        XTraceOptionsResponse xtraceOptionsResponse =
-            XTraceOptionsResponse.computeResponse(xTraceOptions, traceDecision, true);
+    if (!parentSpanContext.isValid()) { // no valid traceparent, it is a new trace
+      TraceDecision traceDecision = shouldTraceRequest(name, null, xTraceOptions, signals);
+      samplingResult = toOtSamplingResult(traceDecision, xTraceOptions, true);
+      XTraceOptionsResponse xtraceOptionsResponse =
+          XTraceOptionsResponse.computeResponse(xTraceOptions, traceDecision, true);
 
-        if (xtraceOptionsResponse != null) {
-          xtraceOptionsResponseStr = xtraceOptionsResponse.toString();
-        }
+      if (xtraceOptionsResponse != null) {
+        xtraceOptionsResponseStr = xtraceOptionsResponse.toString();
+      }
 
-      } else if (parentSpanContext.isRemote()) {
-        final String swTraceState = traceState.get(SW_TRACESTATE_KEY);
-
-        if (SamplingUtil.isValidSwTraceState(swTraceState)) { // pass through for request counting
-          additionalAttributesBuilder.put(Constants.SW_PARENT_ID, swTraceState.split("-")[0]);
-          final String xTraceId = Util.w3cContextToHexString(parentSpanContext);
-          final TraceDecision traceDecision =
-              shouldTraceRequest(name, xTraceId, xTraceOptions, signals);
-
-          samplingResult = toOtSamplingResult(traceDecision, xTraceOptions, false);
-          final XTraceOptionsResponse xTraceOptionsResponse =
-              XTraceOptionsResponse.computeResponse(xTraceOptions, traceDecision, false);
-
-          if (xTraceOptionsResponse != null) {
-            xtraceOptionsResponseStr = xTraceOptionsResponse.toString();
-          }
-
-        } else { // no swTraceState, treat it as a new trace
-          final TraceDecision traceDecision =
-              shouldTraceRequest(name, null, xTraceOptions, signals);
-          samplingResult = toOtSamplingResult(traceDecision, xTraceOptions, true);
-
-          final XTraceOptionsResponse xTraceOptionsResponse =
-              XTraceOptionsResponse.computeResponse(xTraceOptions, traceDecision, true);
-          if (xTraceOptionsResponse != null) {
-            xtraceOptionsResponseStr = xTraceOptionsResponse.toString();
-          }
-        }
+    } else if (parentSpanContext.isRemote()) {
+      final String swTraceState = traceState.get(SW_TRACESTATE_KEY);
+
+      if (SamplingUtil.isValidSwTraceState(swTraceState)) { // pass through for request counting
+        additionalAttributesBuilder.put(Constants.SW_PARENT_ID, swTraceState.split("-")[0]);
+        final String xTraceId = Util.w3cContextToHexString(parentSpanContext);
+        final TraceDecision traceDecision =
+            shouldTraceRequest(name, xTraceId, xTraceOptions, signals);
+
+        samplingResult = toOtSamplingResult(traceDecision, xTraceOptions, false);
+        final XTraceOptionsResponse xTraceOptionsResponse =
+            XTraceOptionsResponse.computeResponse(xTraceOptions, traceDecision, false);
 
-        final String traceStateValue = parentContext.get(TraceStateKey.KEY);
-        if (traceStateValue != null) {
-          additionalAttributesBuilder.put(Constants.SW_UPSTREAM_TRACESTATE, traceStateValue);
+        if (xTraceOptionsResponse != null) {
+          xtraceOptionsResponseStr = xTraceOptionsResponse.toString();
         }
 
-      } else { // local span, continue with parent based sampling
-        samplingResult =
-            Sampler.parentBased(Sampler.alwaysOff())
-                .shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks);
+      } else { // no swTraceState, treat it as a new trace
+        final TraceDecision traceDecision = shouldTraceRequest(name, null, xTraceOptions, signals);
+        samplingResult = toOtSamplingResult(traceDecision, xTraceOptions, true);
+
+        final XTraceOptionsResponse xTraceOptionsResponse =
+            XTraceOptionsResponse.computeResponse(xTraceOptions, traceDecision, true);
+        if (xTraceOptionsResponse != null) {
+          xtraceOptionsResponseStr = xTraceOptionsResponse.toString();
+        }
       }
 
-      SamplingResult result =
-          TraceStateSamplingResult.wrap(
-              samplingResult, additionalAttributesBuilder.build(), xtraceOptionsResponseStr);
+      final String traceStateValue = parentContext.get(TraceStateKey.KEY);
+      if (traceStateValue != null) {
+        additionalAttributesBuilder.put(Constants.SW_UPSTREAM_TRACESTATE, traceStateValue);
+      }
 
-      logger.trace(String.format("Sampling decision: %s", result.getDecision()));
-      return result;
-    } finally {
-      PropagatedContext.clear();
+    } else { // local span, continue with parent based sampling
+      samplingResult =
+          Sampler.parentBased(Sampler.alwaysOff())
+              .shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks);
     }
+
+    SamplingResult result =
+        TraceStateSamplingResult.wrap(
+            samplingResult, additionalAttributesBuilder.build(), xtraceOptionsResponseStr);
+
+    logger.trace(String.format("Sampling decision: %s", result.getDecision()));
+    return result;
   }
 
   String constructUrl(Attributes attributes) {

libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorTest.java

@@ -203,22 +203,6 @@ void verifyThatXtraceOptionsSignatureIsExtractedAndPutIntoContext() {
     assertEquals("test-sig", newContext.get(XTRACE_OPTIONS_SIGNATURE));
   }
 
-  @Test
-  void verifyThatExtractPopulatesPropagatedContext() {
-    PropagatedContext.clear();
-    final Map<String, String> carrier =
-        new HashMap<String, String>() {
-          {
-            put("X-Trace-Options", "trigger-trace;custom-senderhost=chubi;");
-          }
-        };
-
-    solarwindsContextPropagator.extract(Context.current(), carrier, textMapGetterStub);
-
-    assertNotNull(PropagatedContext.getXtraceOptions());
-    PropagatedContext.clear();
-  }
-
   @Test
   void verifyThatTracestateIsExtractedAndPutIntoContext() {
     final Map<String, String> carrier =

libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsSamplerTest.java

@@ -269,44 +269,6 @@ void returnDropDecisionWhenLocalSpanAndParentIsNotSampled() {
     }
   }
 
-  @Test
-  void verifyThatSamplerFallsBackToPropagatedContextForRootSpan() {
-    try (MockedStatic<Span> spanMockedStatic = mockStatic(Span.class);
-        MockedStatic<TraceDecisionUtil> traceDecisionUtilMockedStatic =
-            mockStatic(TraceDecisionUtil.class)) {
-      spanMockedStatic.when(() -> Span.fromContext(any())).thenReturn(spanMock);
-
-      when(spanContextMock.isValid()).thenReturn(false);
-      when(spanMock.getSpanContext()).thenReturn(spanContextMock);
-
-      when(traceDecisionMock.isSampled()).thenReturn(false);
-      when(traceDecisionMock.isReportMetrics()).thenReturn(false);
-
-      XtraceOptions realOptions =
-          XtraceOptions.getXTraceOptions("trigger-trace;custom-senderhost=test;", null);
-
-      ArgumentCaptor<XtraceOptions> xtraceCaptor = ArgumentCaptor.forClass(XtraceOptions.class);
-      traceDecisionUtilMockedStatic
-          .when(() -> TraceDecisionUtil.shouldTraceRequest(any(), any(), any(), any()))
-          .thenReturn(traceDecisionMock);
-
-      PropagatedContext.set(realOptions);
-
-      tested.shouldSample(
-          Context.root(),
-          idGenerator.generateTraceId(),
-          "name",
-          SpanKind.SERVER,
-          Attributes.empty(),
-          Collections.emptyList());
-
-      traceDecisionUtilMockedStatic.verify(
-          () -> TraceDecisionUtil.shouldTraceRequest(any(), any(), xtraceCaptor.capture(), any()));
-      assertEquals(realOptions, xtraceCaptor.getValue());
-      assertNull(PropagatedContext.getXtraceOptions());
-    }
-  }
-
   @ParameterizedTest
   @MethodSource("constructParams")
   void testConstructUrl(String expected, Attributes attributes) {