Skip to content

Commit de5c766

Browse files
committed
Revert "use access class"
This reverts commit 5476821.
1 parent 5faacbd commit de5c766

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/EmbeddedConfigFile.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55

66
package io.opentelemetry.instrumentation.spring.autoconfigure;
77

8-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationAccess;
8+
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
911
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
12+
import java.lang.reflect.Field;
1013
import java.util.ArrayList;
1114
import java.util.HashMap;
1215
import java.util.Map;
@@ -60,8 +63,17 @@ static OpenTelemetryConfigurationModel convertToOpenTelemetryConfigurationModel(
6063
Map<String, String> flatProps) {
6164
Map<String, Object> nested = convertFlatPropsToNested(flatProps);
6265

63-
return DeclarativeConfigurationAccess.getObjectMapper()
64-
.convertValue(nested, OpenTelemetryConfigurationModel.class);
66+
return getObjectMapper().convertValue(nested, OpenTelemetryConfigurationModel.class);
67+
}
68+
69+
static ObjectMapper getObjectMapper() {
70+
try {
71+
Field field = DeclarativeConfiguration.class.getDeclaredField("MAPPER");
72+
field.setAccessible(true);
73+
return (ObjectMapper) field.get(null);
74+
} catch (NoSuchFieldException | IllegalAccessException e) {
75+
throw new DeclarativeConfigException("Failed to access ObjectMapper", e);
76+
}
6577
}
6678

6779
/**

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/SpringConfigProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import io.opentelemetry.api.incubator.config.ConfigProvider;
1010
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1111
import io.opentelemetry.common.ComponentLoader;
12-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationAccess;
1312
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
1413
import java.util.Collections;
1514
import java.util.Map;
@@ -32,7 +31,7 @@ private SpringConfigProvider(
3231
private static DeclarativeConfigProperties toConfigProperties(
3332
Object model, ComponentLoader componentLoader) {
3433
Map<String, Object> configurationMap =
35-
DeclarativeConfigurationAccess.getObjectMapper()
34+
EmbeddedConfigFile.getObjectMapper()
3635
.convertValue(model, new TypeReference<Map<String, Object>>() {});
3736
if (configurationMap == null) {
3837
configurationMap = Collections.emptyMap();

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationAccess.java

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

0 commit comments

Comments
 (0)