Skip to content

Commit 27180c2

Browse files
committed
create sdk from previously read config model
1 parent 5118929 commit 27180c2

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java

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

66
package io.opentelemetry.javaagent.extension;
77

8-
import io.opentelemetry.api.incubator.config.ConfigProvider;
98
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
109
import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
1110
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -32,16 +31,12 @@ public interface AgentListener extends Ordered {
3231
/** Resolve {@link ConfigProperties} from the {@code autoConfiguredOpenTelemetrySdk}. */
3332
static ConfigProperties resolveConfigProperties(
3433
AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
34+
// todo inline this method and remove the if statement?
3535
ConfigProperties sdkConfigProperties =
3636
AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
3737
if (sdkConfigProperties != null) {
3838
return sdkConfigProperties;
3939
}
40-
ConfigProvider configProvider =
41-
AutoConfigureUtil.getConfigProvider(autoConfiguredOpenTelemetrySdk);
42-
if (configProvider != null) {
43-
return new DeclarativeConfigPropertiesBridge(configProvider);
44-
}
4540
// Should never happen
4641
throw new IllegalStateException(
4742
"AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or DeclarativeConfigProperties. This is likely a programming error in opentelemetry-java");

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/DeclarativeConfigEarlyInitAgentConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(ClassLoader extens
9797
Object.class);
9898
method.setAccessible(true);
9999
return (AutoConfiguredOpenTelemetrySdk)
100-
method.invoke(null, sdk, Resource.getDefault(), null, this.configProvider);
100+
method.invoke(null, sdk, Resource.getDefault(), this.declarativeConfigProperties, this.configProvider);
101101
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
102102
throw new IllegalStateException("Error calling create on AutoConfiguredOpenTelemetrySdk", e);
103103
}

0 commit comments

Comments
 (0)