Skip to content

Commit 811b037

Browse files
committed
improve handling of general properties, signal if declarative config is available at all
1 parent 6a1d539 commit 811b037

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class DeclarativeConfigPropertiesBridgeTest {
2727

2828
@BeforeEach
2929
void setup() {
30-
bridge = create("config.yaml", Collections.emptyMap());
30+
bridge = create(Collections.emptyMap());
3131

3232
OpenTelemetryConfigurationModel emptyModel =
3333
new OpenTelemetryConfigurationModel()
@@ -37,11 +37,12 @@ void setup() {
3737
Objects.requireNonNull(SdkConfigProvider.create(emptyModel)), Collections.emptyMap());
3838
}
3939

40-
private static DeclarativeConfigPropertiesBridge create(
41-
String name, Map<String, Object> earlyInitProperties) {
40+
private static DeclarativeConfigPropertiesBridge create(Map<String, Object> earlyInitProperties) {
4241
OpenTelemetryConfigurationModel model =
4342
DeclarativeConfiguration.parse(
44-
DeclarativeConfigPropertiesBridgeTest.class.getClassLoader().getResourceAsStream(name));
43+
DeclarativeConfigPropertiesBridgeTest.class
44+
.getClassLoader()
45+
.getResourceAsStream("config.yaml"));
4546
SdkConfigProvider configProvider = SdkConfigProvider.create(model);
4647
return new DeclarativeConfigPropertiesBridge(
4748
Objects.requireNonNull(configProvider), earlyInitProperties);
@@ -129,7 +130,7 @@ void agent() {
129130
Map<String, Object> earlyInitProperties = new HashMap<>();
130131
earlyInitProperties.put("otel.javaagent.debug", true);
131132
earlyInitProperties.put("otel.javaagent.logging", "application");
132-
DeclarativeConfigPropertiesBridge bridge = create("config.yaml", earlyInitProperties);
133+
DeclarativeConfigPropertiesBridge bridge = create(earlyInitProperties);
133134

134135
assertThat(bridge.getBoolean("otel.javaagent.debug")).isTrue();
135136
assertThat(bridge.getBoolean("otel.javaagent.experimental.indy")).isTrue();

0 commit comments

Comments
 (0)