Skip to content

Commit 8995a1b

Browse files
committed
fix rebase
1 parent 4ccca89 commit 8995a1b

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ class DeclarativeConfigPropertiesBridgeTest {
3232
@BeforeEach
3333
void setup() {
3434
bridge = create("config.yaml");
35-
36-
OpenTelemetryConfigurationModel emptyModel =
37-
new OpenTelemetryConfigurationModel()
38-
.withAdditionalProperty("instrumentation/development", new InstrumentationModel());
39-
SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
4035
emptyBridge =
41-
new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(emptyConfigProvider), "DEBUG");
36+
create(
37+
new OpenTelemetryConfigurationModel()
38+
.withAdditionalProperty("instrumentation/development", new InstrumentationModel()));
4239
}
4340

4441
private static DeclarativeConfigPropertiesBridge create(String name) {
45-
OpenTelemetryConfigurationModel model =
42+
return create(
4643
DeclarativeConfiguration.parse(
47-
DeclarativeConfigPropertiesBridgeTest.class.getClassLoader().getResourceAsStream(name));
48-
SdkConfigProvider configProvider = SdkConfigProvider.create(model);
49-
DeclarativeConfigPropertiesBridge configPropertiesBridge =
50-
new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(configProvider), "DEBUG");
51-
return configPropertiesBridge;
44+
DeclarativeConfigPropertiesBridgeTest.class
45+
.getClassLoader()
46+
.getResourceAsStream(name)));
47+
}
48+
49+
private static DeclarativeConfigPropertiesBridge create(OpenTelemetryConfigurationModel model) {
50+
return new DeclarativeConfigPropertiesBridge(
51+
Objects.requireNonNull(SdkConfigProvider.create(model)), "DEBUG");
5252
}
5353

5454
@Test

0 commit comments

Comments
 (0)