diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy index 36488cc36c0e..e8227ea9d935 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy @@ -336,7 +336,7 @@ class TracerTest extends AgentInstrumentationSpecification { // this test uses opentelemetry-api-1.4 instrumentation def "test tracer builder"() { when: - def tracer = GlobalOpenTelemetry.get().tracerBuilder("test").build() + def tracer = GlobalOpenTelemetry.get().tracerBuilder("test").setInstrumentationVersion("1.2.3").build() def testSpan = tracer.spanBuilder("test").setSpanKind(PRODUCER).startSpan() testSpan.end() @@ -347,6 +347,7 @@ class TracerTest extends AgentInstrumentationSpecification { name "test" kind PRODUCER hasNoParent() + instrumentationLibraryVersion "1.2.3" attributes { } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java index b98fdffa7303..0e41be141445 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java @@ -18,14 +18,14 @@ public ApplicationTracerBuilder(io.opentelemetry.api.trace.TracerBuilder agentTr } @Override - public TracerBuilder setSchemaUrl(String s) { - agentTracerBuilder.setSchemaUrl(s); + public TracerBuilder setSchemaUrl(String schemaUrl) { + agentTracerBuilder.setSchemaUrl(schemaUrl); return this; } @Override - public TracerBuilder setInstrumentationVersion(String s) { - agentTracerBuilder.setSchemaUrl(s); + public TracerBuilder setInstrumentationVersion(String version) { + agentTracerBuilder.setInstrumentationVersion(version); return this; } diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy index a28ecfd0dd50..0c75a6990bec 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy @@ -65,6 +65,11 @@ class SpanAssert { checked.name = true } + def instrumentationLibraryVersion(String expected) { + assert span.instrumentationLibraryInfo.version == expected + checked.instrumentationLibraryVersion = true + } + def name(Pattern expected) { assert span.name =~ expected checked.name = true