Skip to content

translate /development in DeclarativeConfigPropertiesBridge #15606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeitlinger wants to merge 6 commits into
base: main
Choose a base branch
from
Open

translate /development in DeclarativeConfigPropertiesBridge #15606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
438d6eb
translate /development in DeclarativeConfigPropertiesBridge
zeitlinger Dec 11, 2025
3adc07e
translate /development in DeclarativeConfigPropertiesBridge
zeitlinger Dec 11, 2025
ca58eff
translate internal "experimental", too
zeitlinger Dec 11, 2025
fa83b26
translate internal "experimental", too
zeitlinger Dec 11, 2025
93b7b68
use pre-compiled
zeitlinger Dec 11, 2025
35219d6
clean up
zeitlinger Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions ...ava/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.Objects;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.regex.Pattern;
import javax.annotation.Nullable;

/**
Expand Down Expand Up @@ -51,6 +52,9 @@
final class DeclarativeConfigPropertiesBridge implements ConfigProperties {

private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
private static final Pattern EXPERIMENTAL_PATTERN = Pattern.compile("\\.experimental[.-]([^.]+)");
private static final Pattern EXPERIMENTAL_IN_NAME_PATTERN =
Pattern.compile("\\.([^.]+experimental[^.]+)");

private final DeclarativeConfigProperties baseNode;

Expand Down Expand Up @@ -178,11 +182,22 @@ private <T> T getPropertyValue(
}

static String[] getSegments(String property) {
// Remove "otel.instrumentation." prefix if present
if (property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
property = property.substring(OTEL_INSTRUMENTATION_PREFIX.length());
}
// Split the remainder of the property on "."
return property.replace('-', '_').split("\\.");

// Transform experimental patterns:
// - ".experimental-foo" or ".experimental.foo" becomes ".foo/development"
String transformed = EXPERIMENTAL_PATTERN.matcher(property).replaceAll(".$1/development");
// - ".foo-experimental-bar" becomes ".foo_experimental_bar/development"
transformed = EXPERIMENTAL_IN_NAME_PATTERN.matcher(transformed).replaceAll(".$1/development");

// Replace dashes with underscores for property normalization
transformed = transformed.replace('-', '_');

// Split into segments on dots
return transformed.split("\\.");
}

private String translateProperty(String property) {
Expand Down
16 changes: 15 additions & 1 deletion ...io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void getProperties() {
.isTrue();

// common cases
assertThat(bridge.getBoolean("otel.instrumentation.runtime-telemetry.enabled")).isFalse();
assertThat(bridge.getBoolean("otel.instrumentation.runtime-telemetry.enabled")).isTrue();

// check all the types
Map<String, String> expectedMap = new HashMap<>();
Expand Down Expand Up @@ -141,4 +141,18 @@ void agentTranslation() {
assertThat(bridge.getBoolean("otel.javaagent.experimental.indy")).isTrue();
assertThat(bridge.getString("otel.javaagent.logging")).isEqualTo("application");
}

@Test
void developmentTranslation() {
String prefix = "otel.instrumentation.runtime-telemetry";
assertThat(bridge.getBoolean(prefix + ".experimental-gc-profiler.experimental-metrics"))
.isTrue();
assertThat(bridge.getBoolean(prefix + ".experimental.gc-profiler.experimental.metrics"))
.isTrue();

// experimental in the middle of the property name should be preserved
assertThat(
bridge.getBoolean("otel.instrumentation.runtime-telemetry.emit-experimental-telemetry"))
Copy link
Member Author

@zeitlinger zeitlinger Dec 11, 2025

Choose a reason for hiding this comment

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

it's really only this setting - so we can define a custom mapping like emit-experimental-telemetry/development

Copy link
Member Author

@zeitlinger zeitlinger Dec 11, 2025

Choose a reason for hiding this comment

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

I just added this mapping

.isTrue();
}
}
8 changes: 5 additions & 3 deletions declarative-config-bridge/src/test/resources/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ instrumentation/development:
full_name:
preserved: true
agent:
experimental:
indy: true
indy/development: true
runtime_telemetry:
enabled: false
emit_experimental_telemetry/development: true
enabled: true
gc_profiler/development:
metrics/development: true
example_instrumentation:
string_key: value
bool_key: true
Expand Down
2 changes: 1 addition & 1 deletion instrumentation-api-incubator/javaagent-testing/src/test/resources/declarative-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ instrumentation/development:
java:
http:
client:
emit_experimental_telemetry: true
emit_experimental_telemetry/development: true
url_template_rules:
- pattern: "http://localhost:.*/hello/.*"
template: "/hello/*"
4 changes: 2 additions & 2 deletions smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ otel:
instrumentation/development:
java:
runtime-telemetry:
emit_experimental_telemetry: true
emit_experimental_telemetry/development: true
http:
client:
emit_experimental_telemetry: true
emit_experimental_telemetry/development: true
4 changes: 2 additions & 2 deletions smoke-tests-otel-starter/spring-boot-3.2/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ otel:
instrumentation/development:
java:
runtime-telemetry:
emit_experimental_telemetry: true
emit_experimental_telemetry/development: true
http:
client:
emit_experimental_telemetry: true
emit_experimental_telemetry/development: true
Loading