4.x: Replace deprecated method Span.baggage(key) on Span.baggage().get(key)

tracing/providers/jaeger/src/test/java/io/helidon/tracing/providers/jaeger/JaegerBaggageTest.java

@@ -40,7 +40,7 @@ class JaegerBaggageTest {
     void testBaggage(){
         Span span = tracer.spanBuilder("test-span").start();
         Span spanWithBaggage = span.baggage("key", "value");
-        Optional<String> result = spanWithBaggage.baggage("key");
+        Optional<String> result = spanWithBaggage.baggage().get("key");
         assertThat(result.isPresent(), is(true));
         assertThat(result.get(), equalTo("value"));
 

tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/OpenTelemetrySpan.java

@@ -281,7 +281,7 @@ public Span baggage(String key, String value) {
 
         @Override
         public Optional<String> baggage(String key) {
-            return delegate.baggage(key);
+            return delegate.baggage().get(key);
         }
 
         @Override

tracing/providers/opentelemetry/src/test/java/io/helidon/tracing/providers/opentelemetry/TestBaggageApi.java

@@ -49,7 +49,7 @@ void testWritableBaggageFromSpan() {
 
         baggage.set("keyB", "valB");
         assertThat("Assigned baggage via baggage API value from span",
-                   span.baggage("keyB"),
+                   span.baggage().get("keyB"),
                    OptionalMatcher.optionalValue(is(equalTo("valB"))));
         assertThat("Assigned via baggage API value is present", baggage.containsKey("keyB"), is(true));
         assertThat("Assigned via baggage API value from baggage API",

tracing/providers/opentelemetry/src/test/java/io/helidon/tracing/providers/opentelemetry/TestSpanAndBaggage.java

@@ -104,8 +104,8 @@ void testIncomingBaggage() {
         assertThat("Span context from inbound headers", spanContextOpt, OptionalMatcher.optionalPresent());
         Span span = tracer.spanBuilder("inbound").parent(spanContextOpt.get()).start();
         span.end();
-        assertThat("Inbound baggage bag1", span.baggage("bag1"), OptionalMatcher.optionalValue(is("val1")));
-        assertThat("Inbound baggage bag1", span.baggage("bag2"), OptionalMatcher.optionalValue(is("val2")));
+        assertThat("Inbound baggage bag1", span.baggage().get("bag1"), OptionalMatcher.optionalValue(is("val1")));
+        assertThat("Inbound baggage bag1", span.baggage().get("bag2"), OptionalMatcher.optionalValue(is("val2")));
     }
 
     @Test
@@ -161,7 +161,7 @@ void testBaggageAddedAfterActivation() {
     }
 
     private void checkBaggage(Tracer tracer, Span span, Supplier<SpanContext> spanContextSupplier) {
-        String value = span.baggage(BAGGAGE_KEY).orElseThrow();
+        String value = span.baggage().get(BAGGAGE_KEY).orElseThrow();
         assertThat("baggage value right after set", value, Matchers.is(Matchers.equalTo(BAGGAGE_VALUE)));
 
         // Inject the span (context) into the consumer

tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracingSpan.java

@@ -209,7 +209,7 @@ public Span baggage(String key, String value) {
 
         @Override
         public Optional<String> baggage(String key) {
-            return delegate.baggage(key);
+            return delegate.baggage().get(key);
         }
 
         @Override

tracing/providers/opentracing/src/test/java/io/helidon/tracing/providers/opentracing/TestBaggageApi.java

@@ -48,7 +48,7 @@ void testWritableBaggageFromSpan() {
 
         baggage.set("keyB", "valB");
         assertThat("Assigned baggage via baggage API value from span",
-                   span.baggage("keyB"),
+                   span.baggage().get("keyB"),
                    OptionalMatcher.optionalValue(is(equalTo("valB"))));
         assertThat("Assigned via baggage API value is present", baggage.containsKey("keyB"), is(true));
         assertThat("Assigned via baggage API value from baggage API",