Added otel to dependabot config, upgraded dependencies

elastic · Oct 16, 2023 · 839212a · 839212a
1 parent 36acd23
commit 839212a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -36,6 +36,8 @@ updates:
       - dependency-name: "io.vertx:*"
       - dependency-name: "org.apache.logging.log4j:*"
       - dependency-name: "org.springframework.boot:*"
+      - dependency-name: "io.opentelemetry:*"
+      - dependency-name: "io.opentelemetry.semconv:*"
     ignore:
       - dependency-name: "net.bytebuddy:byte-buddy-agent"
         # We deliberately want to keep this older version of Byte Buddy for our runtime attach test

diff --git a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/pom.xml b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/pom.xml
@@ -23,9 +23,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.opentelemetry</groupId>
+            <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
-            <version>${version.opentelemetry}-alpha</version>
+            <version>${version.opentelemetry-semconv}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/...in/src/test/java/co/elastic/apm/agent/opentelemetry/tracing/ElasticOpenTelemetryTest.java b/...in/src/test/java/co/elastic/apm/agent/opentelemetry/tracing/ElasticOpenTelemetryTest.java
@@ -33,7 +33,7 @@
 import io.opentelemetry.context.ContextKey;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.context.propagation.TextMapGetter;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...pentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java b/...pentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java
@@ -37,7 +37,7 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;

diff --git a/apm-agent-plugins/apm-opentelemetry/pom.xml b/apm-agent-plugins/apm-opentelemetry/pom.xml
@@ -19,7 +19,8 @@
         When updating the version, add the old version to OpenTelemetryVersionIT
         to make sure that in the future we stay compatible with the previous version.
         -->
-        <version.opentelemetry>1.22.0</version.opentelemetry>
+        <version.opentelemetry>1.31.0</version.opentelemetry>
+        <version.opentelemetry-semconv>1.21.0-alpha</version.opentelemetry-semconv>
 
         <maven.compiler.target>8</maven.compiler.target>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/integration-tests/external-plugin-otel-test/pom.xml b/integration-tests/external-plugin-otel-test/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <apm-agent-parent.base.dir>${project.basedir}/../..</apm-agent-parent.base.dir>
 
-        <otel.version>1.20.0</otel.version>
+        <otel.version>1.31.0</otel.version>
 
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>