diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index c5b2fb65f620e..bf396a283929a 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -454,7 +454,7 @@ 4.8.0 3.1.2 3.8 - 0.15.0 + 1.1.0 0.1.8 0.33.0 1.7.3 diff --git a/components/camel-opentelemetry/pom.xml b/components/camel-opentelemetry/pom.xml index 6352762155336..65fe76ff20021 100644 --- a/components/camel-opentelemetry/pom.xml +++ b/components/camel-opentelemetry/pom.xml @@ -63,6 +63,11 @@ opentelemetry-api ${opentelemetry-version} + + io.opentelemetry + opentelemetry-semconv + ${opentelemetry-version}-alpha + org.apache.logging.log4j log4j-slf4j-impl 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 d357f429f4048..2773ffdc6846d 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 @@ -16,15 +16,14 @@ */ package org.apache.camel.opentelemetry; -import java.util.EnumMap; -import java.util.Map; - import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.api.baggage.BaggageBuilder; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; +import java.util.EnumMap; +import java.util.Map; import org.apache.camel.tracing.SpanAdapter; import org.apache.camel.tracing.Tag; @@ -144,8 +143,9 @@ public void setBaggage(Baggage baggage) { public void setCorrelationContextItem(String key, String value) { BaggageBuilder builder = Baggage.builder(); if (baggage != null) { - builder = builder.setParent(Context.current().with(baggage)); + builder = Baggage.fromContext(Context.current().with(baggage)).toBuilder(); } + baggage = builder.put(key, value).build(); } 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 624a10c026e55..a3096f47487fb 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 @@ -16,14 +16,13 @@ */ package org.apache.camel.opentelemetry; -import java.util.Set; - import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanBuilder; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Context; +import java.util.Set; import org.apache.camel.Exchange; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.opentelemetry.propagators.OpenTelemetryGetter; @@ -53,18 +52,18 @@ public void setInstrumentationName(String instrumentationName) { this.instrumentationName = instrumentationName; } - private Span.Kind mapToSpanKind(SpanKind kind) { + private io.opentelemetry.api.trace.SpanKind mapToSpanKind(SpanKind kind) { switch (kind) { case SPAN_KIND_CLIENT: - return Span.Kind.CLIENT; + return io.opentelemetry.api.trace.SpanKind.CLIENT; case SPAN_KIND_SERVER: - return Span.Kind.SERVER; + return io.opentelemetry.api.trace.SpanKind.SERVER; case CONSUMER: - return Span.Kind.CONSUMER; + return io.opentelemetry.api.trace.SpanKind.CONSUMER; case PRODUCER: - return Span.Kind.PRODUCER; + return io.opentelemetry.api.trace.SpanKind.PRODUCER; default: - return Span.Kind.SERVER; + return io.opentelemetry.api.trace.SpanKind.SERVER; } } @@ -81,10 +80,6 @@ protected void initTracer() { tracer = GlobalOpenTelemetry.get().getTracer(instrumentationName); } - if (tracer == null) { - // No tracer is available, so setup NoopTracer - tracer = Tracer.getDefault(); - } } @Override @@ -111,8 +106,8 @@ protected SpanAdapter startExchangeBeginSpan( baggage = spanFromExchange.getBaggage(); } else { ExtractAdapter adapter = sd.getExtractAdapter(exchange.getIn().getHeaders(), encoding); - Context ctx = GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator().extract(Context.current(), adapter, - new OpenTelemetryGetter(adapter)); + Context ctx = GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator() + .extract(Context.current(), adapter, new OpenTelemetryGetter(adapter)); Span span = Span.fromContext(ctx); baggage = Baggage.fromContext(ctx); if (span != null && span.getSpanContext().isValid()) { diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java index 856c7210e6d67..02533760588ff 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java @@ -16,10 +16,10 @@ */ package org.apache.camel.opentelemetry.propagators; -import io.opentelemetry.context.propagation.TextMapPropagator; +import io.opentelemetry.context.propagation.TextMapGetter; import org.apache.camel.tracing.ExtractAdapter; -public class OpenTelemetryGetter implements TextMapPropagator.Getter { +public class OpenTelemetryGetter implements TextMapGetter { ExtractAdapter adapter; diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java index 3333898e4c4e0..0df996b7bcf1f 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java @@ -16,12 +16,11 @@ */ package org.apache.camel.opentelemetry.propagators; +import io.opentelemetry.context.propagation.TextMapSetter; import javax.annotation.Nullable; - -import io.opentelemetry.context.propagation.TextMapPropagator; import org.apache.camel.tracing.InjectAdapter; -public class OpenTelemetrySetter implements TextMapPropagator.Setter { +public class OpenTelemetrySetter implements TextMapSetter { @Override public void set(@Nullable InjectAdapter adapter, String key, String value) { adapter.put(key, value); diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java index f7d8ba3b5296f..3c76ec3e463c6 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java @@ -16,20 +16,19 @@ */ package org.apache.camel.opentelemetry; +import io.opentelemetry.api.trace.SpanKind; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import io.opentelemetry.api.trace.Span; - public class SpanTestData { private String label; private String uri; private String operation; - private Span.Kind kind = Span.Kind.INTERNAL; + private SpanKind kind = SpanKind.INTERNAL; private int parentId = -1; private List logMessages = new ArrayList<>(); private Map tags = new HashMap<>(); @@ -63,11 +62,11 @@ public SpanTestData setOperation(String operation) { return this; } - public Span.Kind getKind() { + public SpanKind getKind() { return kind; } - public SpanTestData setKind(Span.Kind kind) { + public SpanTestData setKind(SpanKind kind) { this.kind = kind; return this; } diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java index 319202c249ae9..dbb52b12646d9 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java @@ -2,8 +2,11 @@ package org.apache.camel.component.sql.stored.template.generated; import java.io.Reader; - -import org.apache.camel.component.sql.stored.template.ast.*; +import org.apache.camel.component.sql.stored.template.ast.InOutParameter; +import org.apache.camel.component.sql.stored.template.ast.InParameter; +import org.apache.camel.component.sql.stored.template.ast.OutParameter; +import org.apache.camel.component.sql.stored.template.ast.ParseHelper; +import org.apache.camel.component.sql.stored.template.ast.Template; import org.apache.camel.spi.ClassResolver; public class SSPTParser implements SSPTParserConstants { diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java index db7f99c577cac..f5691470dcdac 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java @@ -1,8 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. SSPTParserTokenManager.java */ package org.apache.camel.component.sql.stored.template.generated; -import org.apache.camel.component.sql.stored.template.ast.*; - /** Token Manager. */ public class SSPTParserTokenManager implements SSPTParserConstants { diff --git a/parent/pom.xml b/parent/pom.xml index 314cab906a381..9faf37984afdf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -443,7 +443,7 @@ 3.1.12 3.1.2 3.8 - 0.15.0 + 1.1.0 0.33.0 0.1.8 8.5.0.Final