Skip to content

Commit ddf185f

Browse files
committed
feat(o11y): configure instrumentation version on open telemetry meter
Updated GoldenSignalsMetricsRecorder to automatically apply the library version retrieved from LibraryMetadata as the instrumentation version on the built OpenTelemetry Meter.
1 parent 33bb5f5 commit ddf185f

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsRecorder.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,14 @@ class GoldenSignalsMetricsRecorder {
5353
900.0, 3600.0);
5454
final DoubleHistogram clientRequestDurationRecorder;
5555

56-
GoldenSignalsMetricsRecorder(OpenTelemetry openTelemetry, String libraryName) {
57-
Meter meter = openTelemetry.meterBuilder(libraryName).build();
56+
GoldenSignalsMetricsRecorder(
57+
OpenTelemetry openTelemetry, String libraryName, String libraryVersion) {
58+
io.opentelemetry.api.metrics.MeterBuilder meterBuilder =
59+
openTelemetry.meterBuilder(libraryName);
60+
if (libraryVersion != null && !libraryVersion.isEmpty()) {
61+
meterBuilder.setInstrumentationVersion(libraryVersion);
62+
}
63+
Meter meter = meterBuilder.build();
5864

5965
this.clientRequestDurationRecorder =
6066
meter

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ public ApiTracerFactory withContext(ApiTracerContext context) {
8686
this.clientLevelTracerContext = context;
8787
this.metricsRecorder =
8888
new GoldenSignalsMetricsRecorder(
89-
openTelemetry, clientLevelTracerContext.libraryMetadata().artifactName());
89+
openTelemetry,
90+
clientLevelTracerContext.libraryMetadata().artifactName(),
91+
clientLevelTracerContext.libraryMetadata().version());
9092
return this;
9193
}
9294
}

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsRecorderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void setUp() {
6262
SdkMeterProvider.builder().registerMetricReader(metricReader).build();
6363
OpenTelemetry openTelemetry =
6464
OpenTelemetrySdk.builder().setMeterProvider(meterProvider).build();
65-
recorder = new GoldenSignalsMetricsRecorder(openTelemetry, ARTIFACT_NAME);
65+
recorder = new GoldenSignalsMetricsRecorder(openTelemetry, ARTIFACT_NAME, "1.2.3");
6666
}
6767

6868
@Test

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void setUp() {
6868
ticker = new FakeTicker();
6969
tracer =
7070
new GoldenSignalsMetricsTracer(
71-
new GoldenSignalsMetricsRecorder(openTelemetry, ARTIFACT_NAME),
71+
new GoldenSignalsMetricsRecorder(openTelemetry, ARTIFACT_NAME, "1.2.3"),
7272
ApiTracerContext.empty(),
7373
ticker);
7474
}

0 commit comments

Comments
 (0)