Skip to content

Commit 051899e

Browse files
committed
feat: add method to retrieve general instrumentation configuration by name
1 parent 5b60d37 commit 051899e

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/ConfigProvider.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ public interface ConfigProvider {
4242
*/
4343
default DeclarativeConfigProperties getJavaInstrumentationConfig(String name) {
4444
DeclarativeConfigProperties config = getInstrumentationConfig();
45-
if (config == null) {
46-
return empty();
47-
}
48-
return config.getStructured("java", empty()).getStructured(name, empty());
45+
return config == null ? empty() : config.get("java").get(name);
4946
}
5047

5148
/**
@@ -59,10 +56,7 @@ default DeclarativeConfigProperties getJavaInstrumentationConfig(String name) {
5956
*/
6057
default DeclarativeConfigProperties getGeneralInstrumentationConfig(String name) {
6158
DeclarativeConfigProperties config = getInstrumentationConfig();
62-
if (config == null) {
63-
return empty();
64-
}
65-
return config.getStructured("general", empty()).getStructured(name, empty());
59+
return config == null ? empty() : config.get("general").get(name);
6660
}
6761

6862
/** Returns a no-op {@link ConfigProvider}. */

sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.sdk.autoconfigure;
77

8-
import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
98
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
109
import static java.util.Collections.singletonMap;
1110
import static org.assertj.core.api.Assertions.assertThatCode;
@@ -239,7 +238,7 @@ void configFile_ConfigProvider() {
239238
assertThat(
240239
globalConfigProvider
241240
.getGeneralInstrumentationConfig("http")
242-
.getStructured("client", empty())
241+
.get("client")
243242
.getScalarList("request_captured_headers", String.class))
244243
.isEqualTo(Arrays.asList("Content-Type", "Accept"));
245244
}

0 commit comments

Comments
 (0)