This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch camel-4.10.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.10.x by this push:
new b56f436dffc fix(observation): create a generic log event
b56f436dffc is described below
commit b56f436dffc95b9045bc423d434706721a9f2d3e
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Mar 13 11:25:46 2025 +0100
fix(observation): create a generic log event
Instead of a log event for each different log message.
Closes CAMEL-21854
---
.../observation/MicrometerObservationSpanAdapter.java | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git
a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
index d500cff8093..84e93392b55 100644
---
a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
+++
b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
@@ -108,13 +108,9 @@ public class MicrometerObservationSpanAdapter implements
SpanAdapter {
public void log(Map<String, String> fields) {
String event = fields.get("event");
if ("error".equalsIgnoreCase(event)) {
- if (fields.containsKey("message")) {
- observation.error(new RuntimeException(fields.get("message")));
- } else {
- setError(true);
- }
+ setError(true);
} else {
- observation.event(() -> getMessageNameFromFields(fields));
+ observation.event(() -> DEFAULT_EVENT_NAME);
}
}
@@ -139,14 +135,6 @@ public class MicrometerObservationSpanAdapter implements
SpanAdapter {
return observation.openScope();
}
- String getMessageNameFromFields(Map<String, ?> fields) {
- Object eventValue = fields == null ? null : fields.get("message");
- if (eventValue != null) {
- return eventValue.toString();
- }
- return DEFAULT_EVENT_NAME;
- }
-
public void setCorrelationContextItem(String key, String value) {
Baggage baggage = tracer.createBaggage(key);
Span span = getTracingContext().getSpan();