Skip to content

Commit f4fde98

Browse files
committed
pr feedback
1 parent 23e8fe6 commit f4fde98

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static java.util.logging.Level.FINER;
1010

1111
import com.google.auto.service.AutoService;
12+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1213
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1314
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1415
import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
@@ -74,7 +75,11 @@ public Resource createResource(ConfigProperties config) {
7475
return create();
7576
}
7677

77-
Resource create() {
78+
public Resource createResource(DeclarativeConfigProperties config) {
79+
return create();
80+
}
81+
82+
private Resource create() {
7883
logger.log(FINER, "Performing Spring Boot service name auto-detection...");
7984
// Note: The order should be consistent with the order of Spring matching, but noting
8085
// that we have "first one wins" while Spring has "last one wins".

instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static java.util.logging.Level.FINE;
99

1010
import com.google.auto.service.AutoService;
11+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1112
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1213
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1314
import io.opentelemetry.sdk.resources.Resource;
@@ -44,7 +45,11 @@ public Resource createResource(ConfigProperties config) {
4445
return create();
4546
}
4647

47-
Resource create() {
48+
public Resource createResource(DeclarativeConfigProperties config) {
49+
return create();
50+
}
51+
52+
private Resource create() {
4853
return getServiceVersionFromBuildInfo()
4954
.map(
5055
version -> {

instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringResourceComponentProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public String getName() {
3333
@Override
3434
public Resource create(DeclarativeConfigProperties config) {
3535
return new SpringBootServiceVersionDetector()
36-
.create()
37-
.merge(new SpringBootServiceNameDetector().create());
36+
.createResource(config)
37+
.merge(new SpringBootServiceNameDetector().createResource(config));
3838
}
3939
}

0 commit comments

Comments
 (0)