This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 468825942477316d4c415b2373335d63d61e1072 Author: Thomas Heggelund <[email protected]> AuthorDate: Tue Feb 9 14:57:57 2021 +0100 [CAMEL-16172] Update to OpenTelemetry v0.15.0 --- .../org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java | 5 ++--- .../java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java | 8 ++++---- .../camel/opentelemetry/CamelOpenTelemetryTestSupport.java | 9 ++++++--- parent/pom.xml | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java index b62f1ed..d357f42 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java @@ -21,11 +21,10 @@ import java.util.Map; import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.api.baggage.BaggageBuilder; -import io.opentelemetry.api.baggage.EntryMetadata; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.api.trace.attributes.SemanticAttributes; import io.opentelemetry.context.Context; +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.apache.camel.tracing.SpanAdapter; import org.apache.camel.tracing.Tag; @@ -147,7 +146,7 @@ public class OpenTelemetrySpanAdapter implements SpanAdapter { if (baggage != null) { builder = builder.setParent(Context.current().with(baggage)); } - baggage = builder.put(key, value, EntryMetadata.EMPTY).build(); + baggage = builder.put(key, value).build(); } public String getContextPropagationItem(String key) { diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java index 0d5a3cd..624a10c 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java @@ -18,7 +18,7 @@ package org.apache.camel.opentelemetry; import java.util.Set; -import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanBuilder; @@ -78,7 +78,7 @@ public class OpenTelemetryTracer extends org.apache.camel.tracing.Tracer { } if (tracer == null) { - tracer = OpenTelemetry.get().getTracer(instrumentationName); + tracer = GlobalOpenTelemetry.get().getTracer(instrumentationName); } if (tracer == null) { @@ -111,7 +111,7 @@ public class OpenTelemetryTracer extends org.apache.camel.tracing.Tracer { baggage = spanFromExchange.getBaggage(); } else { ExtractAdapter adapter = sd.getExtractAdapter(exchange.getIn().getHeaders(), encoding); - Context ctx = OpenTelemetry.get().getPropagators().getTextMapPropagator().extract(Context.current(), adapter, + Context ctx = GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator().extract(Context.current(), adapter, new OpenTelemetryGetter(adapter)); Span span = Span.fromContext(ctx); baggage = Baggage.fromContext(ctx); @@ -136,7 +136,7 @@ public class OpenTelemetryTracer extends org.apache.camel.tracing.Tracer { OpenTelemetrySpanAdapter spanFromExchange = (OpenTelemetrySpanAdapter) span; Span otelSpan = spanFromExchange.getOpenTelemetrySpan(); Context ctx = Context.current().with(otelSpan).with(spanFromExchange.getBaggage()); - OpenTelemetry.get().getPropagators().getTextMapPropagator().inject(ctx, adapter, new OpenTelemetrySetter()); + GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator().inject(ctx, adapter, new OpenTelemetrySetter()); } } diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java index d7631c0..3508eb4 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; -import io.opentelemetry.sdk.trace.TracerSdkProvider; +import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; import org.apache.camel.CamelContext; @@ -51,7 +51,7 @@ public class CamelOpenTelemetryTestSupport extends CamelTestSupport { private SpanTestData[] testdata; private Tracer tracer; private OpenTelemetryTracer ottracer; - private TracerSdkProvider tracerFactory = TracerSdkProvider.builder().build(); + private SdkTracerProvider tracerFactory; public CamelOpenTelemetryTestSupport(SpanTestData[] testdata) { this.testdata = testdata; @@ -61,7 +61,10 @@ public class CamelOpenTelemetryTestSupport extends CamelTestSupport { protected CamelContext createCamelContext() throws Exception { CamelContext context = super.createCamelContext(); ottracer = new OpenTelemetryTracer(); - tracerFactory.addSpanProcessor(SimpleSpanProcessor.builder(inMemorySpanExporter).build()); + + tracerFactory = SdkTracerProvider.builder() + .addSpanProcessor(SimpleSpanProcessor.create(inMemorySpanExporter)).build(); + tracer = tracerFactory.get("tracerTest"); ottracer.setTracer(tracer); ottracer.setExcludePatterns(getExcludePatterns()); diff --git a/parent/pom.xml b/parent/pom.xml index 95cedb0..c313468 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -441,7 +441,7 @@ <ognl-version>3.1.12</ognl-version> <openjpa-version>3.1.2</openjpa-version> <openstack4j-version>3.8</openstack4j-version> - <opentelemetry-version>0.11.0</opentelemetry-version> + <opentelemetry-version>0.15.0</opentelemetry-version> <!-- cannot upgrade opentracing until https://github.com/eclipse/microprofile-opentracing v2 is released --> <opentracing-version>0.31.0</opentracing-version> <opentracing-tracerresolver-version>0.1.8</opentracing-tracerresolver-version>
