Skip to content

Commit

Permalink
PR review
Browse files Browse the repository at this point in the history
  • Loading branch information
zeitlinger committed Mar 11, 2024
1 parent eebb8bb commit 977b08d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.TracerProvider;
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.MapConverter;
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SpringComponentLoader;
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OpenTelemetrySdkComponentLoader;
import io.opentelemetry.instrumentation.spring.autoconfigure.properties.OtelResourceProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.properties.OtlpExporterProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.properties.PropagationProperties;
Expand Down Expand Up @@ -60,8 +60,9 @@ public MapConverter mapConverter() {
}

@Bean
public SpringComponentLoader springComponentLoader(ApplicationContext applicationContext) {
return new SpringComponentLoader(applicationContext);
public OpenTelemetrySdkComponentLoader openTelemetrySdkComponentLoader(
ApplicationContext applicationContext) {
return new OpenTelemetrySdkComponentLoader(applicationContext);
}

@Bean
Expand All @@ -82,7 +83,7 @@ public OpenTelemetry openTelemetry(
OtlpExporterProperties otlpExporterProperties,
OtelResourceProperties resourceProperties,
PropagationProperties propagationProperties,
SpringComponentLoader componentLoader,
OpenTelemetrySdkComponentLoader componentLoader,
ObjectProvider<OpenTelemetryInjector> openTelemetryConsumerProvider) {

OpenTelemetry openTelemetry =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
* any time.
*/
public class SpringComponentLoader implements ComponentLoader {
public class OpenTelemetrySdkComponentLoader implements ComponentLoader {
private final ApplicationContext applicationContext;

private final SpiHelper spiHelper =
SpiHelper.create(SpringComponentLoader.class.getClassLoader());
SpiHelper.create(OpenTelemetrySdkComponentLoader.class.getClassLoader());

public SpringComponentLoader(ApplicationContext applicationContext) {
public OpenTelemetrySdkComponentLoader(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}

Expand Down

0 comments on commit 977b08d

Please sign in to comment.