Skip to content

Config property util cleanup#15809

Merged
trask merged 27 commits intoopen-telemetry:mainfrom
zeitlinger:config-property-util-cleanup
Jan 26, 2026
Merged

Config property util cleanup#15809
trask merged 27 commits intoopen-telemetry:mainfrom
zeitlinger:config-property-util-cleanup

Conversation

@zeitlinger
Copy link
Copy Markdown
Member

@zeitlinger zeitlinger commented Jan 9, 2026 •
edited
Loading

Fixes #15807

@zeitlinger zeitlinger self-assigned this Jan 9, 2026
@github-actions github-actions Bot added the test native This label can be applied to PRs to trigger them to run native tests label Jan 9, 2026
@zeitlinger zeitlinger mentioned this pull request Jan 9, 2026
Open
@zeitlinger zeitlinger force-pushed the config-property-util-cleanup branch from dcf6adf to a510da4 Compare January 9, 2026 16:16
@zeitlinger zeitlinger marked this pull request as ready for review January 9, 2026 16:35
@zeitlinger zeitlinger requested a review from a team as a code owner January 9, 2026 16:35
@zeitlinger zeitlinger added this to the v2.24.0 milestone Jan 9, 2026
laurit
laurit reviewed Jan 12, 2026
View reviewed changes
Comment thread testing-common/integration-tests/build.gradle.kts Outdated
@zeitlinger zeitlinger force-pushed the config-property-util-cleanup branch from 48d8630 to 508c0dc Compare January 13, 2026 07:17
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Jan 15, 2026

@trask please have a look

@trask trask removed this from the v2.24.0 milestone Jan 16, 2026
@zeitlinger zeitlinger mentioned this pull request Jan 21, 2026
Merged
@zeitlinger zeitlinger force-pushed the config-property-util-cleanup branch from e874753 to 0fec018 Compare January 22, 2026 10:42
@zeitlinger zeitlinger force-pushed the config-property-util-cleanup branch from 0fec018 to 1dc2718 Compare January 22, 2026 18:21
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Jan 22, 2026

@trask please check again

trask
trask reviewed Jan 23, 2026
View reviewed changes
Comment thread javaagent-bootstrap/build.gradle.kts Outdated
Comment thread javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentInitializer.java Outdated
Comment thread javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java
Comment on lines -46 to +55
private static final String AGENT_INITIALIZER_JAR =
System.getProperty("otel.javaagent.experimental.initializer.jar", "");
@Nullable private static final String AGENT_INITIALIZER_JAR = initializerJar();

@Nullable
private static String initializerJar() {
String value = System.getProperty("otel.javaagent.experimental.initializer.jar");
if (value != null) {
return value;
}
return System.getenv("OTEL_JAVAAGENT_EXPERIMENTAL_INITIALIZER_JAR");
}
Copy link
Copy Markdown
Member

@trask trask Jan 23, 2026

Choose a reason for hiding this comment

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

can this use early init agent config?

Copy link
Copy Markdown
Member Author

@zeitlinger zeitlinger Jan 23, 2026

Choose a reason for hiding this comment

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

this is the bootstap project that doesn't have access to early init config.

Moving to bootstrap would do more in bootstrap, which might have some unintended results.

Comment thread ...on-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesUtil.java
Comment thread ...on-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesUtil.java Outdated
Comment thread ...api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java Outdated
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Jan 23, 2026

@trask please check again

trask
trask reviewed Jan 23, 2026
View reviewed changes
Comment thread ...pi/src/test/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesUtilTest.java
Comment thread ...agent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFile.java Outdated
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Jan 24, 2026

@trask please check again

trask
trask approved these changes Jan 24, 2026
View reviewed changes
Comment thread ...src/testConfigFile/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFileTest.java Outdated
Comment thread ...nt-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/EarlyInitAgentConfig.java Outdated
Comment thread ...ooling/src/test/java/io/opentelemetry/javaagent/tooling/config/EarlyInitAgentConfigTest.java
Comment thread ...nt-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/EarlyInitAgentConfig.java Outdated
@trask trask merged commit bbb1fc9 into open-telemetry:main Jan 26, 2026
87 checks passed
@zeitlinger zeitlinger deleted the config-property-util-cleanup branch January 26, 2026 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@laurit laurit laurit left review comments

@trask trask trask approved these changes

Assignees

@zeitlinger zeitlinger

Labels

test native This label can be applied to PRs to trigger them to run native tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Cleanup access to "otel.javaagent.*" / rename ConfigPropertiesUtil

3 participants

@zeitlinger @trask @laurit