Allow configuring MDC key names for trace_id, span_id, trace_flags #11329
+468
−122
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
continue in this pr @pavelvodrazka |
This was referenced May 10, 2024
laurit
reviewed
May 14, 2024
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 14, 2024
...tion/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 14, 2024
instrumentation/logback/logback-mdc-1.0/library/build.gradle.kts
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 14, 2024
...y/src/main/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/OpenTelemetryAppender.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 17, 2024
...y/src/main/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/OpenTelemetryAppender.java
Outdated
Show resolved
Hide resolved
.../opentelemetry/instrumentation/log4j/contextdata/v2_17/OpenTelemetryContextDataProvider.java
Outdated
Show resolved
Hide resolved
...y/src/main/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/OpenTelemetryAppender.java
Outdated
Show resolved
Hide resolved
...y/src/main/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/OpenTelemetryAppender.java
Outdated
Show resolved
Hide resolved
...-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/CommonConfig.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 24, 2024
.../opentelemetry/instrumentation/log4j/contextdata/v2_17/OpenTelemetryContextDataProvider.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 24, 2024
...mon/testing/src/main/java/io/opentelemetry/instrumentation/log4j/contextdata/Log4j2Test.java
Show resolved
Hide resolved
laurit
reviewed
May 24, 2024
instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/javaagent/README.md
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 24, 2024
...y/src/main/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/OpenTelemetryAppender.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 24, 2024
...-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/CommonConfig.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2024
instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/javaagent/build.gradle.kts
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2024
...y/src/main/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/OpenTelemetryAppender.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 29, 2024
Comment on lines
29
to
33
| sources { | ||
| java { | ||
| setSrcDirs(listOf("src/test/java")) | ||
| } | ||
| } |
There was a problem hiding this comment.
You shouldn't have removed this. The intent here is that this test suite uses the same test sources as the main test. If you remove it then it will use src/testDisableThreadLocals/java as test sources, as that directory does not exist it won't run any tests.
There was a problem hiding this comment.
Thank you for your answer
|
I think this is almost done. Only https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/README.md and https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/logback/logback-mdc-1.0/library/README.md (seems to be missing the |
|
Why |
laurit
reviewed
May 31, 2024
Comment on lines
35
to
40
| If the `otel.instrumentation.logback-mdc.add-baggage` system property (or the | ||
| `OTEL_INSTRUMENTATION_LOGBACK_MDC_ADD_BAGGAGE` environment variable) is set to `true`, | ||
| key/value pairs in [baggage](https://opentelemetry.io/docs/concepts/signals/baggage/) will be added to the context too. | ||
|
|
||
| - `baggage.<entry_name>` | ||
|
|
There was a problem hiding this comment.
in library instrumentation logback appender is configured via logback.xml not system properties or environment variables, see
laurit
reviewed
May 31, 2024
Comment on lines
74
to
81
|
|
||
| If you want to customize the names of these keys, you can set system property or environment variable: | ||
|
|
||
| | System property | Environment variable | | ||
| |-------------------------------------------------------|---------------------------------------------------| | ||
| | `otel.instrumentation.common.logging.trace-id` | `OTEL_INSTRUMENTATION_COMMON_LOGGING_TRACE_ID` | | ||
| | `otel.instrumentation.common.logging.span-id` | `OTEL_INSTRUMENTATION_COMMON_LOGGING_SPAN_ID` | | ||
| | `otel.instrumentation.common.logging.trace-flags` | `OTEL_INSTRUMENTATION_COMMON_LOGGING_TRACE_FLAGS` | |
There was a problem hiding this comment.
these are also configured in logback.xml
laurit
reviewed
May 31, 2024
| @@ -42,6 +42,14 @@ will be added to the context when a log statement is made when a span is active: | |||
| - `span_id` | |||
| - `trace_flags` | |||
|
|
|||
| If you want to customize the names of these keys, you can set system property or environment variable: | |||
There was a problem hiding this comment.
Suggested change
| If you want to customize the names of these keys, you can set system property or environment variable: | |
| These keys can be customized using the following system properties or environment variables: |
laurit
approved these changes
Jun 3, 2024
|
Hi, is this request planned to be merged / included in the next release? |
zeitlinger
pushed a commit
to zeitlinger/opentelemetry-java-instrumentation
that referenced
this pull request
Jun 12, 2024
…pen-telemetry#11329) Co-authored-by: Lauri Tulmin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolve issue
continue with PR