Skip to content

Commit fe931a3

Browse files
committed
pr review
1 parent abb0093 commit fe931a3

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void customize(AutoConfigurationCustomizer config) {
2222
config.addTracerProviderCustomizer(
2323
(providerBuilder, properties) -> {
2424
if (properties.getBoolean(ENABLED_OPTION, false)) {
25-
providerBuilder.addSpanProcessor(InferredSpansConfig.create(properties));
25+
providerBuilder.addSpanProcessor(InferredSpansConfig.createSpanProcessor(properties));
2626
} else {
2727
log.finest(
2828
"Not enabling inferred spans processor because " + ENABLED_OPTION + " is not set");

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansConfig.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.inferredspans;
77

8+
import static java.util.Collections.unmodifiableList;
89
import static java.util.stream.Collectors.toList;
910

1011
import io.opentelemetry.api.trace.SpanBuilder;
@@ -37,7 +38,24 @@ private InferredSpansConfig() {}
3738
static final String PARENT_OVERRIDE_HANDLER_OPTION =
3839
"otel.inferred.spans.parent.override.handler";
3940

40-
static SpanProcessor create(ConfigProperties properties) {
41+
static final List<String> ALL_PROPERTIES =
42+
unmodifiableList(
43+
Arrays.asList(
44+
ENABLED_OPTION,
45+
LOGGING_OPTION,
46+
DIAGNOSTIC_FILES_OPTION,
47+
SAFEMODE_OPTION,
48+
POSTPROCESSING_OPTION,
49+
SAMPLING_INTERVAL_OPTION,
50+
MIN_DURATION_OPTION,
51+
INCLUDED_CLASSES_OPTION,
52+
EXCLUDED_CLASSES_OPTION,
53+
INTERVAL_OPTION,
54+
DURATION_OPTION,
55+
LIB_DIRECTORY_OPTION,
56+
PARENT_OVERRIDE_HANDLER_OPTION));
57+
58+
static SpanProcessor createSpanProcessor(ConfigProperties properties) {
4159
InferredSpansProcessorBuilder builder = InferredSpansProcessor.builder();
4260

4361
PropertiesApplier applier = new PropertiesApplier(properties);
Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313

1414
@SuppressWarnings("rawtypes")
1515
@AutoService(ComponentProvider.class)
16-
public class InferredSpansComponentProvider implements ComponentProvider<SpanProcessor> {
16+
public class InferredSpansSpanProcessorProvider implements ComponentProvider<SpanProcessor> {
17+
18+
private static final String PREFIX = "otel.inferred.spans.";
1719

1820
@Override
1921
public String getName() {
@@ -22,12 +24,16 @@ public String getName() {
2224

2325
@Override
2426
public SpanProcessor create(DeclarativeConfigProperties config) {
25-
return InferredSpansConfig.create(
26-
new DeclarativeConfigPropertiesBridgeBuilder()
27-
// crop the prefix, because the properties are under the "experimental_inferred_spans"
28-
// processor
29-
.addMapping("otel.inferred.spans.", "")
30-
.build(config));
27+
DeclarativeConfigPropertiesBridgeBuilder builder =
28+
new DeclarativeConfigPropertiesBridgeBuilder();
29+
30+
for (String property : InferredSpansConfig.ALL_PROPERTIES) {
31+
// 1. crop the prefix, because the properties are under the "experimental_inferred_spans"
32+
// 2. we want all properties flat under "otel.inferred.spans.*"
33+
builder.addMapping(property, property.substring(PREFIX.length()).replace('.', '_'));
34+
}
35+
36+
return InferredSpansConfig.createSpanProcessor(builder.build(config));
3137
}
3238

3339
@Override

inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansCustomizerProviderTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ void declarativeConfig() {
3737
+ " processors:\n"
3838
+ " - experimental_inferred_spans:\n"
3939
+ " enabled: false\n"
40-
+ " backup:\n"
41-
+ " diagnostic:\n"
42-
+ " files: true\n";
40+
+ " backup_diagnostic_files: true\n";
4341

4442
OpenTelemetrySdk sdk =
4543
DeclarativeConfiguration.parseAndCreate(

0 commit comments

Comments
 (0)