You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/07/08 05:58:45 UTC

[camel] branch main updated: Regen for commit 04916f4e601d1c1cdb9c22cff9ff40e0a1070ffe (#5811)

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 0870175  Regen for commit 04916f4e601d1c1cdb9c22cff9ff40e0a1070ffe (#5811)
0870175 is described below

commit 087017533265178806cbe41b75d04cfa19ea929a
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Thu Jul 8 07:58:23 2021 +0200

    Regen for commit 04916f4e601d1c1cdb9c22cff9ff40e0a1070ffe (#5811)
    
    Signed-off-by: GitHub <no...@github.com>
    
    Co-authored-by: davsclaus <da...@users.noreply.github.com>
---
 .../resources/org/apache/camel/catalog/docs/opentelemetry.adoc       | 3 +++
 .../resources/org/apache/camel/catalog/docs/opentracing.adoc         | 5 +++++
 docs/components/modules/others/pages/opentelemetry.adoc              | 3 +++
 docs/components/modules/others/pages/opentracing.adoc                | 5 +++++
 4 files changed, 16 insertions(+)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentelemetry.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentelemetry.adoc
index 0bc16ef..709d656 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentelemetry.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentelemetry.adoc
@@ -51,3 +51,6 @@ otelTracer.init(camelContext);
 --------------------------------------------------------------------------------------------------
 
 include::{page-component-version}@camel-spring-boot::page$opentelemetry-starter.adoc[]
+
+== MDC Logging
+When MDC Logging is enabled for the active Camel context the Trace ID and Span ID will be added and removed from the MDC for each route, the keys are `traceId` and `spanId`, respectively.
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentracing.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentracing.adoc
index ad53667..b104334 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentracing.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/opentracing.adoc
@@ -135,3 +135,8 @@ Where the value of header "request-header" is "foo", the resulting trace from ex
 and the resulting message would contain:
 
 * Header "baggage-header" of value "foo"
+
+== MDC Logging
+When MDC Logging is enabled for the active Camel context the Trace ID and Span ID will be added and removed from the MDC for each route or processor (depending on the tracing strategy configured), the keys are `traceId` and `spanId`, respectively.
+
+If the `OpenTracingTracingStrategy` is enabled the span ID will be the one for the current processor that logs an entry, otherwise it will be the one for the current route.
diff --git a/docs/components/modules/others/pages/opentelemetry.adoc b/docs/components/modules/others/pages/opentelemetry.adoc
index ffa5695..9f275c7 100644
--- a/docs/components/modules/others/pages/opentelemetry.adoc
+++ b/docs/components/modules/others/pages/opentelemetry.adoc
@@ -53,3 +53,6 @@ otelTracer.init(camelContext);
 --------------------------------------------------------------------------------------------------
 
 include::{page-component-version}@camel-spring-boot::page$opentelemetry-starter.adoc[]
+
+== MDC Logging
+When MDC Logging is enabled for the active Camel context the Trace ID and Span ID will be added and removed from the MDC for each route, the keys are `traceId` and `spanId`, respectively.
diff --git a/docs/components/modules/others/pages/opentracing.adoc b/docs/components/modules/others/pages/opentracing.adoc
index 0db0280..2fbd457 100644
--- a/docs/components/modules/others/pages/opentracing.adoc
+++ b/docs/components/modules/others/pages/opentracing.adoc
@@ -137,3 +137,8 @@ Where the value of header "request-header" is "foo", the resulting trace from ex
 and the resulting message would contain:
 
 * Header "baggage-header" of value "foo"
+
+== MDC Logging
+When MDC Logging is enabled for the active Camel context the Trace ID and Span ID will be added and removed from the MDC for each route or processor (depending on the tracing strategy configured), the keys are `traceId` and `spanId`, respectively.
+
+If the `OpenTracingTracingStrategy` is enabled the span ID will be the one for the current processor that logs an entry, otherwise it will be the one for the current route.