Add version to the InstrumenterBuilder and Instrumenter

open-telemetry · Nov 8, 2021 · 614aef3 · 614aef3
1 parent a7e3696
commit 614aef3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...ion-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java b/...ion-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java
@@ -58,7 +58,17 @@ public static <REQUEST, RESPONSE> InstrumenterBuilder<REQUEST, RESPONSE> builder
  OpenTelemetry openTelemetry,
  String instrumentationName,
  SpanNameExtractor<? super REQUEST> spanNameExtractor) {
- return new InstrumenterBuilder<>(openTelemetry, instrumentationName, spanNameExtractor);
+ return new InstrumenterBuilder<>(
+ openTelemetry, InstrumentationVersion.VERSION, instrumentationName, spanNameExtractor);
+ }
+
+ public static <REQUEST, RESPONSE> InstrumenterBuilder<REQUEST, RESPONSE> builder(
+ OpenTelemetry openTelemetry,
+ String instrumentationName,
+ String instrumentationVersion,
+ SpanNameExtractor<? super REQUEST> spanNameExtractor) {
+ return new InstrumenterBuilder<>(
+ openTelemetry, instrumentationVersion, instrumentationName, spanNameExtractor);
  }
 
  private static final SupportabilityMetrics supportability = SupportabilityMetrics.instance();
@@ -82,7 +92,7 @@ public static <REQUEST, RESPONSE> InstrumenterBuilder<REQUEST, RESPONSE> builder
  Instrumenter(InstrumenterBuilder<REQUEST, RESPONSE> builder) {
  this.instrumentationName = builder.instrumentationName;
  this.tracer =
- builder.openTelemetry.getTracer(instrumentationName, InstrumentationVersion.VERSION);
+ builder.openTelemetry.getTracer(instrumentationName, builder.instrumentationVersion);
  this.spanNameExtractor = builder.spanNameExtractor;
  this.spanKindExtractor = builder.spanKindExtractor;
  this.spanStatusExtractor = builder.spanStatusExtractor;

diff --git a/.../src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/.../src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
@@ -42,6 +42,7 @@ public final class InstrumenterBuilder<REQUEST, RESPONSE> {
  final OpenTelemetry openTelemetry;
  final Meter meter;
  final String instrumentationName;
+ final String instrumentationVersion;
  final SpanNameExtractor<? super REQUEST> spanNameExtractor;
 
  final List<SpanLinksExtractor<? super REQUEST>> spanLinksExtractors = new ArrayList<>();
@@ -63,11 +64,13 @@ public final class InstrumenterBuilder<REQUEST, RESPONSE> {
  InstrumenterBuilder(
  OpenTelemetry openTelemetry,
  String instrumentationName,
+ String instrumentationVersion,
  SpanNameExtractor<? super REQUEST> spanNameExtractor) {
  this.openTelemetry = openTelemetry;
  // TODO(anuraaga): Retrieve from openTelemetry when not alpha anymore.
  this.meter = GlobalMeterProvider.get().get(instrumentationName);
  this.instrumentationName = instrumentationName;
+ this.instrumentationVersion = instrumentationVersion;
  this.spanNameExtractor = spanNameExtractor;
  }