Skip to content

Commit 920c02b

Browse files
committed
separate resource extraction from supported interfaces
1 parent c04a349 commit 920c02b

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import io.opentelemetry.api.common.AttributeKey;
1010
import io.opentelemetry.api.common.Attributes;
1111
import io.opentelemetry.api.common.AttributesBuilder;
12-
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1312
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1413
import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
1514
import io.opentelemetry.sdk.resources.Resource;
@@ -21,7 +20,6 @@
2120
import java.util.Set;
2221
import java.util.function.Function;
2322
import java.util.stream.Collectors;
24-
import javax.annotation.Nullable;
2523

2624
/**
2725
* An easier alternative to {@link io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider}, which
@@ -67,25 +65,16 @@ public final boolean shouldApply(ConfigProperties config, Resource existing) {
6765

6866
@Override
6967
public final Resource createResource(ConfigProperties config) {
70-
return create(filteredKeys);
71-
}
72-
73-
@SuppressWarnings({"unchecked", "rawtypes"})
74-
public final Resource createResource(DeclarativeConfigProperties config) {
75-
return create((Set) attributeGetters.keySet());
76-
}
77-
78-
private Resource create(@Nullable Set<AttributeKey<?>> keys) {
79-
if (keys == null) {
80-
throw new IllegalStateException("shouldApply should be called first");
81-
}
8268
return attributeProvider
8369
.readData()
8470
.map(
8571
data -> {
72+
if (filteredKeys == null) {
73+
throw new IllegalStateException("shouldApply should be called first");
74+
}
8675
AttributesBuilder builder = Attributes.builder();
8776
attributeGetters.entrySet().stream()
88-
.filter(e -> keys.contains(e.getKey()))
77+
.filter(e -> filteredKeys.contains(e.getKey()))
8978
.forEach(
9079
e ->
9180
e.getValue()

0 commit comments

Comments
 (0)