diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java index e9f2a994b5d9..6df3e02b54c1 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java @@ -52,7 +52,7 @@ public final class InstrumenterBuilder { private final List requestListeners = new ArrayList<>(); private final List requestMetrics = new ArrayList<>(); - private String instrumentationVersion; + @Nullable private String instrumentationVersion; @Nullable private String schemaUrl = null; SpanKindExtractor spanKindExtractor = SpanKindExtractor.alwaysInternal(); SpanStatusExtractor spanStatusExtractor = @@ -69,9 +69,9 @@ public final class InstrumenterBuilder { SpanNameExtractor spanNameExtractor) { this.openTelemetry = openTelemetry; this.instrumentationName = instrumentationName; + this.spanNameExtractor = spanNameExtractor; this.instrumentationVersion = EmbeddedInstrumentationProperties.findVersion(instrumentationName); - this.spanNameExtractor = spanNameExtractor; } /** @@ -288,10 +288,10 @@ private Instrumenter newInstrumenter( Tracer buildTracer() { TracerBuilder tracerBuilder = - openTelemetry - .getTracerProvider() - .tracerBuilder(instrumentationName) - .setInstrumentationVersion(instrumentationVersion); + openTelemetry.getTracerProvider().tracerBuilder(instrumentationName); + if (instrumentationVersion != null) { + tracerBuilder.setInstrumentationVersion(instrumentationVersion); + } if (schemaUrl != null) { tracerBuilder.setSchemaUrl(schemaUrl); } @@ -303,11 +303,10 @@ List buildRequestListeners() { new ArrayList<>(requestListeners.size() + requestMetrics.size()); listeners.addAll(requestListeners); - MeterBuilder meterBuilder = - openTelemetry - .getMeterProvider() - .meterBuilder(instrumentationName) - .setInstrumentationVersion(instrumentationVersion); + MeterBuilder meterBuilder = openTelemetry.getMeterProvider().meterBuilder(instrumentationName); + if (instrumentationVersion != null) { + meterBuilder.setInstrumentationVersion(instrumentationVersion); + } if (schemaUrl != null) { meterBuilder.setSchemaUrl(schemaUrl); }