upgrade to OTel 1.18.0 (#49)

eclipse · Oct 4, 2022 · 14280a6 · 14280a6
1 parent 09a4086
commit 14280a6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,8 +31,8 @@
 
     <properties>
         <inceptionYear>2022</inceptionYear>
-        <opentelemetry.spec.version>1.11.0</opentelemetry.spec.version>
-        <opentelemetry.java.version>1.14.0</opentelemetry.java.version>
+        <opentelemetry.spec.version>1.12.0</opentelemetry.spec.version>
+        <opentelemetry.java.version>1.18.0</opentelemetry.java.version>
         <version.microprofile.tck.bom>3.0</version.microprofile.tck.bom>
     </properties>
 
@@ -60,12 +60,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!--            <dependency>-->
-            <!--                    <groupId>io.opentelemetry</groupId>-->
-            <!--                    <artifactId>opentelemetry-api</artifactId>-->
-            <!--                    <version>${opentelemetry.java.version}</version>-->
-            <!--                    <scope>provided</scope>-->
-            <!--            </dependency>-->
             <!-- This BOM includes the opentelemetry-bom and the opentelemetry-bom-alpha -->
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
@@ -80,7 +74,7 @@
     <modules>
         <module>tracing</module>
     </modules>
-    
+
     <build>
     	<pluginManagement>
     		<plugins>
@@ -93,7 +87,7 @@
                             <otel-java-version>${opentelemetry.java.version}</otel-java-version>
                         </attributes>
                     </configuration>
-                 </plugin>   
+                 </plugin>
     		</plugins>
     	</pluginManagement>
     </build>

diff --git a/tracing/tck/pom.xml b/tracing/tck/pom.xml
@@ -48,14 +48,6 @@
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-core-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-context</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk</artifactId>
@@ -64,21 +56,13 @@
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk-trace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-extension-annotations</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-instrumentation-api</artifactId>
+            <artifactId>opentelemetry-instrumentation-annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-instrumentation-api-annotation-support</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-semconv</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>

diff --git a/...n/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestClientSpanDefaultTest.java b/...n/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestClientSpanDefaultTest.java
@@ -43,7 +43,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;

diff --git a/.../java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestClientSpanDisabledTest.java b/.../java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestClientSpanDisabledTest.java
@@ -43,7 +43,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;

diff --git a/...src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestClientSpanTest.java b/...src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestClientSpanTest.java
@@ -54,7 +54,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.RequestScoped;

diff --git a/...g/tck/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestSpanTest.java b/...g/tck/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/RestSpanTest.java
@@ -46,7 +46,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.restassured.RestAssured;
 import jakarta.ws.rs.ApplicationPath;
@@ -91,8 +91,7 @@ void span() {
                 spanItems.get(0).getResource().getAttribute(SERVICE_NAME));
         assertEquals("0.1.0-SNAPSHOT", spanItems.get(0).getResource().getAttribute(SERVICE_VERSION));
 
-        // FIXME drop deprecated lib use
-        InstrumentationLibraryInfo libraryInfo = spanItems.get(0).getInstrumentationLibraryInfo();
+        InstrumentationScopeInfo libraryInfo = spanItems.get(0).getInstrumentationScopeInfo();
         // Was decided at the MP Call on 13/06/2022 that lib name and version are responsibility of lib implementations
         assertNotNull(libraryInfo.getName());
         assertNotNull(libraryInfo.getVersion());