Skip to content

Conversation

zeitlinger
Copy link
Member

Fixes #14432

@zeitlinger zeitlinger requested a review from a team as a code owner September 5, 2025 08:49
@zeitlinger
Copy link
Member Author

@trask please have a look

@otelbot-java-instrumentation
Copy link
Contributor

🔧 The result from spotlessApply was committed to the PR branch.

@zeitlinger zeitlinger added this to the v2.20.0 milestone Sep 11, 2025
@zeitlinger
Copy link
Member Author

@laurit @trask can we get this into the next release?

This would allow us to have milestone 1 ready for the release after that.

if (fail) {
assertThatCode(() -> configPropertiesSupplier.get())
.isInstanceOf(ConfigurationException.class)
.hasMessage("Unknown instrumentation profile: invalid");
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
.hasMessage("Unknown instrumentation profile: invalid");
.hasMessage("Unknown instrumentation mode: invalid");

})
void defaultEnabledInDeclarativeConfigPropertiesBridge(
String propertyValue, boolean expected, boolean fail) {
String profile = propertyValue == null ? "" : "instrumentation_mode: \"" + propertyValue + "\"";
Copy link
Member

Choose a reason for hiding this comment

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

everywhere profile -> mode

@trask trask merged commit bf7c964 into open-telemetry:main Sep 11, 2025
89 checks passed
@zeitlinger zeitlinger deleted the common-enabled branch September 12, 2025 07:55
@zeitlinger
Copy link
Member Author

follow up with cleanups: #14641

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

declarative config: map enabled and common-enabled

4 participants