You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/09/25 07:00:12 UTC
[camel] 01/02: Upgrade Opentelemetry to version 0.8.0
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 68da15a4c55eacef9dffbd23198e9140d21220ff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Sep 25 08:51:10 2020 +0200
Upgrade Opentelemetry to version 0.8.0
---
.../java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java | 1 +
.../main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java | 4 ++--
.../apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java | 4 ++--
.../apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java | 4 ++--
parent/pom.xml | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java
index bf7263f..7aeb29d 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java
@@ -38,6 +38,7 @@ public abstract class BaseEmbeddedKafkaTest extends CamelTestSupport {
protected static KafkaContainer kafkaBroker = new KafkaContainer(CONFLUENT_PLATFORM_VERSION)
.withEmbeddedZookeeper()
+ .withEnv("KAFKA_ZOOKEEPER_CONNECT", "zookeeper:2181")
.waitingFor(Wait.forListeningPort());
static {
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 1fd0233..a3c1d90 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
@@ -114,7 +114,7 @@ public class OpenTelemetryTracer extends org.apache.camel.tracing.Tracer {
correlationContext = spanFromExchange.getCorrelationContext();
} else {
ExtractAdapter adapter = sd.getExtractAdapter(exchange.getIn().getHeaders(), encoding);
- Context ctx = OpenTelemetry.getPropagators().getHttpTextFormat().extract(Context.current(), adapter,
+ Context ctx = OpenTelemetry.getPropagators().getTextMapPropagator().extract(Context.current(), adapter,
new OpenTelemetryGetter(adapter));
Span span = TracingContextUtils.getSpan(ctx);
SpanContext parentFromHeaders = span.getContext();
@@ -140,7 +140,7 @@ public class OpenTelemetryTracer extends org.apache.camel.tracing.Tracer {
OpenTelemetrySpanAdapter spanFromExchange = (OpenTelemetrySpanAdapter) span;
Context context = TracingContextUtils.withSpan(spanFromExchange.getOpenTelemetrySpan(), Context.current());
context = CorrelationsContextUtils.withCorrelationContext(spanFromExchange.getCorrelationContext(), context);
- OpenTelemetry.getPropagators().getHttpTextFormat().inject(context, adapter, new OpenTelemetrySetter());
+ OpenTelemetry.getPropagators().getTextMapPropagator().inject(context, adapter, new OpenTelemetrySetter());
}
}
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 00c0b44..2254270 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.HttpTextFormat;
+import io.opentelemetry.context.propagation.TextMapPropagator;
import org.apache.camel.tracing.ExtractAdapter;
-public class OpenTelemetryGetter implements HttpTextFormat.Getter<ExtractAdapter> {
+public class OpenTelemetryGetter implements TextMapPropagator.Getter<ExtractAdapter> {
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 aaef36c..3333898 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
@@ -18,10 +18,10 @@ package org.apache.camel.opentelemetry.propagators;
import javax.annotation.Nullable;
-import io.opentelemetry.context.propagation.HttpTextFormat;
+import io.opentelemetry.context.propagation.TextMapPropagator;
import org.apache.camel.tracing.InjectAdapter;
-public class OpenTelemetrySetter implements HttpTextFormat.Setter<InjectAdapter> {
+public class OpenTelemetrySetter implements TextMapPropagator.Setter<InjectAdapter> {
@Override
public void set(@Nullable InjectAdapter adapter, String key, String value) {
adapter.put(key, value);
diff --git a/parent/pom.xml b/parent/pom.xml
index 6e82744..4d0bc9d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -448,7 +448,7 @@
<ognl-version>3.1.12</ognl-version>
<openjpa-version>3.1.2</openjpa-version>
<openstack4j-version>3.0.2</openstack4j-version>
- <opentelemetry-version>0.7.0</opentelemetry-version>
+ <opentelemetry-version>0.8.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>