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 7
7
8
8
import io .opentelemetry .api .incubator .config .ConfigProvider ;
9
9
import io .opentelemetry .api .incubator .config .DeclarativeConfigProperties ;
10
+ import io .opentelemetry .instrumentation .sdk .DeclarativeConfigPropertiesBridge ;
10
11
import io .opentelemetry .sdk .autoconfigure .AutoConfiguredOpenTelemetrySdk ;
11
12
import io .opentelemetry .sdk .autoconfigure .internal .AutoConfigureUtil ;
12
13
import io .opentelemetry .sdk .autoconfigure .spi .ConfigProperties ;
@@ -44,7 +45,7 @@ static ConfigProperties resolveConfigProperties(
44
45
DeclarativeConfigProperties instrumentationConfig = configProvider .getInstrumentationConfig ();
45
46
46
47
if (instrumentationConfig != null ) {
47
- return new DeclarativeConfigPropertiesBridge (instrumentationConfig );
48
+ return DeclarativeConfigPropertiesBridge . create (instrumentationConfig );
48
49
}
49
50
}
50
51
// Should never happen
Original file line number Diff line number Diff line change @@ -52,10 +52,15 @@ public final class DeclarativeConfigPropertiesBridge implements ConfigProperties
52
52
// The node at .instrumentation.java
53
53
private final DeclarativeConfigProperties instrumentationJavaNode ;
54
54
55
- public DeclarativeConfigPropertiesBridge (DeclarativeConfigProperties instrumentationNode ) {
55
+ private DeclarativeConfigPropertiesBridge (DeclarativeConfigProperties instrumentationNode ) {
56
56
instrumentationJavaNode = instrumentationNode .getStructured ("java" , DeclarativeConfigProperties .empty ());
57
57
}
58
58
59
+ public static DeclarativeConfigPropertiesBridge create (
60
+ DeclarativeConfigProperties instrumentationNode ) {
61
+ return new DeclarativeConfigPropertiesBridge (instrumentationNode );
62
+ }
63
+
59
64
@ Nullable
60
65
@ Override
61
66
public String getString (String propertyName ) {
Original file line number Diff line number Diff line change @@ -56,15 +56,15 @@ void setup() {
56
56
new ByteArrayInputStream (YAML .getBytes (StandardCharsets .UTF_8 )));
57
57
SdkConfigProvider configProvider = SdkConfigProvider .create (model );
58
58
bridge =
59
- new DeclarativeConfigPropertiesBridge (
59
+ DeclarativeConfigPropertiesBridge . create (
60
60
Objects .requireNonNull (configProvider .getInstrumentationConfig ()));
61
61
62
62
OpenTelemetryConfigurationModel emptyModel =
63
63
new OpenTelemetryConfigurationModel ()
64
64
.withAdditionalProperty ("instrumentation/development" , new InstrumentationModel ());
65
65
SdkConfigProvider emptyConfigProvider = SdkConfigProvider .create (emptyModel );
66
66
emptyBridge =
67
- new DeclarativeConfigPropertiesBridge (
67
+ DeclarativeConfigPropertiesBridge . create (
68
68
Objects .requireNonNull (emptyConfigProvider .getInstrumentationConfig ()));
69
69
}
70
70
You can’t perform that action at this time.
0 commit comments