Skip to content

Commit 68c4e0b

Browse files
committed
copy declarative config bridge from instrumentation
1 parent fc80e8a commit 68c4e0b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

declarative-config-bridge/src/main/java/io/opentelemetry/contrib/sdk/autoconfigure/ConfigPropertiesUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public static ConfigProperties resolveModel(OpenTelemetryConfigurationModel mode
5454
}
5555

5656
public static String propertyYamlPath(String propertyName) {
57-
// todo test if this is correct
5857
return DeclarativeConfigPropertiesBridge.yamlPath(propertyName);
5958
}
6059
}

declarative-config-bridge/src/test/java/io/opentelemetry/contrib/sdk/autoconfigure/ConfigPropertiesUtilTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.contrib.sdk.autoconfigure;
77

88

9+
import static org.assertj.core.api.Assertions.assertThat;
910
import static org.mockito.ArgumentMatchers.any;
1011
import static org.mockito.ArgumentMatchers.eq;
1112
import static org.mockito.Mockito.mock;
@@ -84,4 +85,10 @@ void shouldUseConfigProviderForDeclarativeConfiguration_noInstrumentationConfig(
8485
assertThat(configProperties.getString("testProperty")).isEqualTo(null);
8586
}
8687
}
88+
89+
@Test
90+
void propertyYamlPath() {
91+
assertThat(ConfigPropertiesUtil.propertyYamlPath("google.otel.auth.target.signals"))
92+
.isEqualTo("'instrumentation/development' / 'java' / 'google' / 'otel' / 'auth' / 'target' / 'signals'");
93+
}
8794
}

declarative-config-bridge/src/test/java/io/opentelemetry/contrib/sdk/autoconfigure/DeclarativeConfigPropertiesBridgeTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
import static org.assertj.core.api.Assertions.assertThat;
7+
68
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
9+
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
711
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
812
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
913
import java.io.ByteArrayInputStream;
@@ -53,15 +57,15 @@ void setup() {
5357
new ByteArrayInputStream(YAML.getBytes(StandardCharsets.UTF_8)));
5458
SdkConfigProvider configProvider = SdkConfigProvider.create(model);
5559
bridge =
56-
new ConfigPropertiesUtil.DeclarativeConfigPropertiesBridge(
60+
new DeclarativeConfigPropertiesBridge(
5761
Objects.requireNonNull(configProvider.getInstrumentationConfig()));
5862

5963
OpenTelemetryConfigurationModel emptyModel =
6064
new OpenTelemetryConfigurationModel()
6165
.withAdditionalProperty("instrumentation/development", new InstrumentationModel());
6266
SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
6367
emptyBridge =
64-
new ConfigPropertiesUtil.DeclarativeConfigPropertiesBridge(
68+
new DeclarativeConfigPropertiesBridge(
6569
Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig()));
6670
}
6771

0 commit comments

Comments
 (0)