File tree Expand file tree Collapse file tree 3 files changed +10
-4
lines changed
javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension
main/java/io/opentelemetry/instrumentation/sdk
test/java/io/opentelemetry/instrumentation/sdk Expand file tree Collapse file tree 3 files changed +10
-4
lines changed Original file line number Diff line number Diff line change 77
88import io .opentelemetry .api .incubator .config .ConfigProvider ;
99import io .opentelemetry .api .incubator .config .DeclarativeConfigProperties ;
10+ import io .opentelemetry .instrumentation .sdk .DeclarativeConfigPropertiesBridge ;
1011import io .opentelemetry .sdk .autoconfigure .AutoConfiguredOpenTelemetrySdk ;
1112import io .opentelemetry .sdk .autoconfigure .internal .AutoConfigureUtil ;
1213import io .opentelemetry .sdk .autoconfigure .spi .ConfigProperties ;
@@ -44,7 +45,7 @@ static ConfigProperties resolveConfigProperties(
4445 DeclarativeConfigProperties instrumentationConfig = configProvider .getInstrumentationConfig ();
4546
4647 if (instrumentationConfig != null ) {
47- return new DeclarativeConfigPropertiesBridge (instrumentationConfig );
48+ return DeclarativeConfigPropertiesBridge . create (instrumentationConfig );
4849 }
4950 }
5051 // Should never happen
Original file line number Diff line number Diff line change @@ -52,10 +52,15 @@ public final class DeclarativeConfigPropertiesBridge implements ConfigProperties
5252 // The node at .instrumentation.java
5353 private final DeclarativeConfigProperties instrumentationJavaNode ;
5454
55- public DeclarativeConfigPropertiesBridge (DeclarativeConfigProperties instrumentationNode ) {
55+ private DeclarativeConfigPropertiesBridge (DeclarativeConfigProperties instrumentationNode ) {
5656 instrumentationJavaNode = instrumentationNode .getStructured ("java" , DeclarativeConfigProperties .empty ());
5757 }
5858
59+ public static DeclarativeConfigPropertiesBridge create (
60+ DeclarativeConfigProperties instrumentationNode ) {
61+ return new DeclarativeConfigPropertiesBridge (instrumentationNode );
62+ }
63+
5964 @ Nullable
6065 @ Override
6166 public String getString (String propertyName ) {
Original file line number Diff line number Diff line change @@ -56,15 +56,15 @@ void setup() {
5656 new ByteArrayInputStream (YAML .getBytes (StandardCharsets .UTF_8 )));
5757 SdkConfigProvider configProvider = SdkConfigProvider .create (model );
5858 bridge =
59- new DeclarativeConfigPropertiesBridge (
59+ DeclarativeConfigPropertiesBridge . create (
6060 Objects .requireNonNull (configProvider .getInstrumentationConfig ()));
6161
6262 OpenTelemetryConfigurationModel emptyModel =
6363 new OpenTelemetryConfigurationModel ()
6464 .withAdditionalProperty ("instrumentation/development" , new InstrumentationModel ());
6565 SdkConfigProvider emptyConfigProvider = SdkConfigProvider .create (emptyModel );
6666 emptyBridge =
67- new DeclarativeConfigPropertiesBridge (
67+ DeclarativeConfigPropertiesBridge . create (
6868 Objects .requireNonNull (emptyConfigProvider .getInstrumentationConfig ()));
6969 }
7070
You can’t perform that action at this time.
0 commit comments