Skip to content

Commit ac02271

Browse files
committed
remove methods that are only needed by contrib
1 parent 9e3f469 commit ac02271

File tree

4 files changed

+3
-43
lines changed

4 files changed

+3
-43
lines changed

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/ConfigPropertiesUtil.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeBuilder.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,8 @@ public ConfigProperties resolveInstrumentationConfig(
5858
if (instrumentationConfig == null) {
5959
instrumentationConfig = DeclarativeConfigProperties.empty();
6060
}
61-
return resolveConfig(instrumentationConfig.getStructured("java", empty()));
62-
}
63-
64-
public ConfigProperties resolveConfig(@Nullable DeclarativeConfigProperties config) {
6561
return new DeclarativeConfigPropertiesBridge(
66-
config, new ConfigPropertiesTranslator(translationMap, fixedValues));
62+
instrumentationConfig.getStructured("java", empty()),
63+
new ConfigPropertiesTranslator(translationMap, fixedValues));
6764
}
6865
}

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void shouldUseConfigProviderForDeclarativeConfiguration_noInstrumentationConfig(
7878
ConfigProperties configProperties =
7979
new DeclarativeConfigPropertiesBridgeBuilder().resolveConfigProperties(sdkMock);
8080

81-
assertThat(configProperties.getString("testProperty")).isEqualTo(null);
81+
assertThat(configProperties.getString("testProperty")).isNull();
8282
}
8383
}
8484
}

0 commit comments

Comments
 (0)