This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f12421c5232 Polished
f12421c5232 is described below
commit f12421c5232a85fccad95b58f9f4b61e9fac0d84
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Oct 25 12:02:11 2023 +0200
Polished
---
.../camel-opentelemetry/src/main/docs/opentelemetry.adoc | 13 +++++++++----
.../apache/camel/opentelemetry/AttributeProcessor.java | 10 ----------
.../opentelemetry/OpenTelemetryTracingStrategy.java | 2 ++
.../opentelemetry/SetCorrelationContextProcessor.java | 16 ++--------------
.../opentelemetry/propagators/OpenTelemetrySetter.java | 1 +
5 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
b/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
index 26bbec426ad..c61cdd1bde8 100644
--- a/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
+++ b/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
@@ -69,19 +69,24 @@ This package includes the instrumentation agent as well as
instrumentations for
The package provides a completely automatic, out-of-the-box experience.
Enable the instrumentation agent using the `-javaagent` flag to the JVM.
-```
+
+[source,bash]
+----
java -javaagent:path/to/opentelemetry-javaagent.jar \
-jar myapp.jar
-```
+----
+
By default, the OpenTelemetry Java agent uses
https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/otlp[OTLP
exporter] configured to send data to
https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md[OpenTelemetry
collector] at `http://localhost:4317`.
Configuration parameters are passed as Java system properties (`-D` flags) or
as environment variables. See
https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/agent-config.md[the
configuration documentation] for the full list of configuration items. For
example:
-```
+
+[source,bash]
+----
java -javaagent:path/to/opentelemetry-javaagent.jar \
-Dotel.service.name=your-service-name \
-Dotel.traces.exporter=jaeger \
-jar myapp.jar
-```
+----
include::spring-boot:partial$starter.adoc[]
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
index 6a111aeb694..61d81726941 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
@@ -100,16 +100,6 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
return expression;
}
- @Override
- protected void doStart() throws Exception {
- // noop
- }
-
- @Override
- protected void doStop() throws Exception {
- // noop
- }
-
@Override
public String toString() {
return id;
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
index da3b3c854a7..9f3f3870cd1 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
@@ -31,7 +31,9 @@ import org.apache.camel.tracing.ActiveSpanManager;
import org.apache.camel.tracing.SpanDecorator;
public class OpenTelemetryTracingStrategy implements InterceptStrategy {
+
private static final String UNNAMED = "unnamed";
+
private final OpenTelemetryTracer tracer;
public OpenTelemetryTracingStrategy(OpenTelemetryTracer tracer) {
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
index 28330c199f2..3bb03a91252 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
@@ -28,9 +28,6 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * @author rvargasp
- */
public class SetCorrelationContextProcessor extends AsyncProcessorSupport
implements Traceable, IdAware, RouteIdAware {
private static final Logger LOG =
LoggerFactory.getLogger(SetCorrelationContextProcessor.class);
@@ -53,7 +50,8 @@ public class SetCorrelationContextProcessor extends
AsyncProcessorSupport implem
String item = expression.evaluate(exchange, String.class);
camelSpan.setCorrelationContextItem(baggageName, item);
} else {
- LOG.warn("OpenTelemetry: could not find managed span for
exchange={}", exchange);
+ // avoid spamming logs
+ LOG.debug("OpenTelemetry: Cannot find managed span for
Exchange: {}", exchange);
}
} catch (Exception e) {
exchange.setException(e);
@@ -98,16 +96,6 @@ public class SetCorrelationContextProcessor extends
AsyncProcessorSupport implem
return expression;
}
- @Override
- protected void doStart() throws Exception {
- // noop
- }
-
- @Override
- protected void doStop() throws Exception {
- // noop
- }
-
@Override
public String toString() {
return id;
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 78c58bdf2f9..f2663141d63 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
@@ -20,6 +20,7 @@ import io.opentelemetry.context.propagation.TextMapSetter;
import org.apache.camel.tracing.InjectAdapter;
public class OpenTelemetrySetter implements TextMapSetter<InjectAdapter> {
+
@Override
public void set(InjectAdapter adapter, String key, String value) {
adapter.put(key, value);
