Skip to content

Rename common logging properties#18851

Merged
trask merged 14 commits into
open-telemetry:mainfrom
laurit:logging-key
Jun 12, 2026
Merged

Rename common logging properties#18851
trask merged 14 commits into
open-telemetry:mainfrom
laurit:logging-key

Conversation

@laurit

@laurit laurit commented May 26, 2026

Copy link
Copy Markdown
Contributor

Resolves #18470

@github-actions github-actions Bot mentioned this pull request May 26, 2026
Open
laurit
laurit commented May 26, 2026
View reviewed changes
Comment thread ...c/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java Outdated
logger.warning(
"The '"
+ oldDeclarativeProperty
+ "' declarative configuration is deprecated"

@laurit laurit May 26, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't know whether declarative config or properties were used

@laurit laurit marked this pull request as ready for review May 26, 2026 12:26
@laurit laurit requested a review from a team as a code owner May 26, 2026 12:26
Copilot AI review requested due to automatic review settings May 26, 2026 12:26
@laurit laurit closed this May 26, 2026
@laurit laurit reopened this May 26, 2026
Copilot AI reviewed May 26, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@laurit laurit closed this May 26, 2026
@laurit laurit reopened this May 26, 2026
@laurit laurit requested a review from Copilot May 26, 2026 17:18
Copilot AI reviewed May 26, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 2 comments.

Comment thread docs/instrumentation-list.yaml
Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java Outdated
@laurit laurit added this to the v2.29.0 milestone Jun 1, 2026
@trask trask mentioned this pull request Jun 6, 2026
Closed
@trask

trask commented Jun 6, 2026

Copy link
Copy Markdown
Member

I sent a commit (84263f4) to follow this pattern:

opentelemetry-java-instrumentation/instrumentation/graphql-java/graphql-java-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v20_0/GraphqlSingletons.java

Lines 99 to 104 in eafc57e

logger.warning(
"The otel.instrumentation.graphql.query-sanitizer.enabled setting or equivalent"
+ " declarative configuration is deprecated and will be"
+ " removed in 3.0. Use "
+ "otel.instrumentation.graphql.query-sanitization.enabled"
+ " or equivalent declarative configuration instead.");

mainly so we don't display declarative config paths to java agent system properties users (due to the bridge we can't tell).

@trask trask requested a review from Copilot June 6, 2026 22:52
Copilot AI reviewed Jun 6, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 1 comment.

Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java
@trask trask requested a review from Copilot June 6, 2026 23:09
Copilot AI reviewed Jun 6, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 19 out of 19 changed files in this pull request and generated 1 comment.

Comment thread ...entation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java
@trask trask requested a review from Copilot June 7, 2026 23:57
Copilot AI reviewed Jun 8, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 19 out of 19 changed files in this pull request and generated 2 comments.

Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java
Comment thread ...c/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java Outdated
@trask trask requested a review from Copilot June 8, 2026 00:24
Copilot AI reviewed Jun 8, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java
@trask trask requested a review from Copilot June 8, 2026 03:03
Copilot AI reviewed Jun 8, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 21 out of 21 changed files in this pull request and generated 3 comments.

Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java
Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java Outdated
Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java Outdated
@trask trask requested a review from Copilot June 8, 2026 03:16
Copilot AI reviewed Jun 8, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 21 out of 21 changed files in this pull request and generated 2 comments.

Comment thread ...entation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java
Comment thread .../java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java
trask added 2 commits June 7, 2026 20:31
@trask
Address review comment: disambiguate Logback logger locals
1afd9c9
@trask
Merge remote-tracking branch 'upstream/main' into logging-key
3eaaf40 
# Conflicts:
#	instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java
#	instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java
#	instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/README.md
#	instrumentation/log4j/log4j-mdc-1.2/javaagent/README.md
@trask trask requested a review from Copilot June 11, 2026 21:30
Copilot AI reviewed Jun 11, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated no new comments.

@trask trask requested a review from Copilot June 12, 2026 02:58
Copilot AI reviewed Jun 12, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 1 comment.

Comment thread ...boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@trask trask enabled auto-merge (squash) June 12, 2026 03:08
@trask trask merged commit 69e74ca into open-telemetry:main Jun 12, 2026
186 of 188 checks passed
@laurit laurit deleted the logging-key branch June 16, 2026 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@trask trask trask approved these changes

Copilot code review Copilot Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.29.0

Development

Successfully merging this pull request may close these issues.

Rename common logging properties to make it clear they configure key names

3 participants

@laurit @trask