fix incorrect delegate method (#4630)

* fix incorrect delegate method * add version test
open-telemetry · Nov 11, 2021 · 5cbd09e · 5cbd09e
1 parent 4719e4c
commit 5cbd09e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...ation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy b/...ation/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/...metry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java b/...metry/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/...ng-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy b/...ng-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