File tree Expand file tree Collapse file tree 3 files changed +8
-7
lines changed
com/splunk/opentelemetry/profiler
io/opentelemetry/sdk/autoconfigure Expand file tree Collapse file tree 3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 3838import io .opentelemetry .sdk .autoconfigure .spi .ConfigProperties ;
3939import io .opentelemetry .sdk .autoconfigure .spi .ConfigurationException ;
4040import io .opentelemetry .sdk .extension .incubator .fileconfig .YamlDeclarativeConfigProperties ;
41+ import io .opentelemetry .sdk .extension .incubator .fileconfig .internal .model .ExperimentalLanguageSpecificInstrumentationPropertyModel ;
4142import io .opentelemetry .sdk .extension .incubator .fileconfig .internal .model .OpenTelemetryConfigurationModel ;
4243import io .opentelemetry .sdk .logs .export .LogRecordExporter ;
4344import java .util .Map ;
@@ -236,8 +237,10 @@ void shouldThrowExceptionForInvalidProtocol() {
236237 // For now it is temporary placed under the instrumentation node.
237238 private static DeclarativeConfigProperties getExporterConfig (
238239 OpenTelemetryConfigurationModel model ) {
239- Map <String , Object > properties =
240+ Map <String , ExperimentalLanguageSpecificInstrumentationPropertyModel > original =
240241 model .getInstrumentationDevelopment ().getJava ().getAdditionalProperties ();
242+ Map <String , Object > properties =
243+ Map .of ("distribution" , original .get ("distribution" ).getAdditionalProperties ());
241244 ComponentLoader componentLoader =
242245 ComponentLoader .forClassLoader (DeclarativeConfigProperties .class .getClassLoader ());
243246 DeclarativeConfigProperties declarativeConfigProperties =
Original file line number Diff line number Diff line change 2424import io .opentelemetry .api .incubator .config .DeclarativeConfigProperties ;
2525import io .opentelemetry .common .ComponentLoader ;
2626import io .opentelemetry .sdk .extension .incubator .fileconfig .YamlDeclarativeConfigProperties ;
27+ import io .opentelemetry .sdk .extension .incubator .fileconfig .internal .model .ExperimentalLanguageSpecificInstrumentationPropertyModel ;
2728import io .opentelemetry .sdk .extension .incubator .fileconfig .internal .model .OpenTelemetryConfigurationModel ;
2829import java .time .Duration ;
2930import java .util .Map ;
@@ -85,8 +86,10 @@ void shouldMapYamlToConfiguration() {
8586
8687 private static DeclarativeConfigProperties getProfilingConfig (
8788 OpenTelemetryConfigurationModel model ) {
88- Map <String , Object > properties =
89+ Map <String , ExperimentalLanguageSpecificInstrumentationPropertyModel > original =
8990 model .getInstrumentationDevelopment ().getJava ().getAdditionalProperties ();
91+ Map <String , Object > properties =
92+ Map .of ("distribution" , original .get ("distribution" ).getAdditionalProperties ());
9093 ComponentLoader componentLoader =
9194 ComponentLoader .forClassLoader (DeclarativeConfigProperties .class .getClassLoader ());
9295 DeclarativeConfigProperties declarativeConfigProperties =
Original file line number Diff line number Diff line change @@ -121,11 +121,6 @@ public ConfigProperties getConfig() {
121121 return properties ;
122122 }
123123
124- @ Override
125- Object getConfigProvider () {
126- return null ;
127- }
128-
129124 @ Override
130125 public boolean supportsParameter (
131126 ParameterContext parameterContext , ExtensionContext extensionContext ) {
You can’t perform that action at this time.
0 commit comments