4.x: Replace deprecated method Span.baggage(key,value) on Span.baggag…

…e().set(key,value)
Captain1653 · Aug 3, 2024 · 70f5b47 · 70f5b47
1 parent 45e0005
commit 70f5b47
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...providers/jaeger/src/test/java/io/helidon/tracing/providers/jaeger/JaegerBaggageTest.java b/...providers/jaeger/src/test/java/io/helidon/tracing/providers/jaeger/JaegerBaggageTest.java
@@ -39,8 +39,8 @@ class JaegerBaggageTest {
     @Test
     void testBaggage(){
         Span span = tracer.spanBuilder("test-span").start();
-        Span spanWithBaggage = span.baggage("key", "value");
-        Optional<String> result = spanWithBaggage.baggage().get("key");
+        span.baggage().set("key", "value");
+        Optional<String> result = span.baggage().get("key");
         assertThat(result.isPresent(), is(true));
         assertThat(result.get(), equalTo("value"));
 
@@ -49,8 +49,8 @@ void testBaggage(){
     @Test
     void testBadBaggage(){
         Span span = tracer.spanBuilder("test-bad-span").start();
-        assertThrows(NullPointerException.class, () -> span.baggage(null, "value"));
-        assertThrows(NullPointerException.class, () -> span.baggage("key", null));
-        assertThrows(NullPointerException.class, () -> span.baggage(null, null));
+        assertThrows(NullPointerException.class, () -> span.baggage().set(null, "value"));
+        assertThrows(NullPointerException.class, () -> span.baggage().set("key", null));
+        assertThrows(NullPointerException.class, () -> span.baggage().set(null, null));
     }
 }
diff --git a/...pentelemetry/src/test/java/io/helidon/tracing/providers/opentelemetry/TestBaggageApi.java b/...pentelemetry/src/test/java/io/helidon/tracing/providers/opentelemetry/TestBaggageApi.java
@@ -41,7 +41,7 @@ class TestBaggageApi {
     void testWritableBaggageFromSpan() {
         Span span = Tracer.global().spanBuilder("otel-span").start();
         WritableBaggage baggage = span.baggage();
-        span.baggage("keyA", "valA");
+        span.baggage().set("keyA", "valA");
         assertThat("Assigned baggage via span is present", baggage.containsKey("keyA"), is(true));
         assertThat("Assigned baggage via span value from baggage",
                    baggage.get("keyA"),

diff --git a/...elemetry/src/test/java/io/helidon/tracing/providers/opentelemetry/TestSpanAndBaggage.java b/...elemetry/src/test/java/io/helidon/tracing/providers/opentelemetry/TestSpanAndBaggage.java
@@ -83,7 +83,7 @@ void testActiveSpanScopeWithBaggage() {
                        currentJustAfterActivation.get().context().spanId(),
                        is(outerSpan.context().spanId()));
 
-            outerSpan.baggage("myItem", "myValue");
+            outerSpan.baggage().set("myItem", "myValue");
             outerSpan.end();
         } catch (Exception e) {
             outerSpan.end(e);

diff --git a/...rs/opentracing/src/test/java/io/helidon/tracing/providers/opentracing/TestBaggageApi.java b/...rs/opentracing/src/test/java/io/helidon/tracing/providers/opentracing/TestBaggageApi.java
@@ -40,7 +40,7 @@ class TestBaggageApi {
     void testWritableBaggageFromSpan() {
         Span span = io.helidon.tracing.Tracer.global().spanBuilder("otel-span").start();
         WritableBaggage baggage = span.baggage();
-        span.baggage("keyA", "valA");
+        span.baggage().set("keyA", "valA");
         assertThat("Assigned baggage via span is present", baggage.containsKey("keyA"), is(true));
         assertThat("Assigned baggage via span value from baggage",
                    baggage.get("keyA"),