Update opentelemetry-java to 1.30.1 (#9433)

open-telemetry · Sep 11, 2023 · 7e16e40 · 7e16e40
1 parent 43ebdb8
commit 7e16e40
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 53 deletions.
diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -420,3 +420,9 @@ configurations.configureEach {
     exclude("io.opentelemetry.instrumentation", "opentelemetry-instrumentation-bom-alpha")
   }
 }
+
+// Pin opentelemetry-semconv to last version where io.opentelemetry.semconv.trace.attributes.SemanticAttributes
+// isn't deprecated.
+configurations.configureEach {
+  resolutionStrategy.force("io.opentelemetry:opentelemetry-semconv:1.29.0-alpha")
+}
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.29.0"
+val otelSdkVersion = "1.30.1"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars

diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
@@ -27,7 +27,7 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.29.0",
+      opentelemetrySdk           : "1.30.1",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "1.30.0-SNAPSHOT",

diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -23,7 +23,7 @@ version '1.0'
 ext {
   versions = [
     // this line is managed by .github/scripts/update-sdk-version.sh
-    opentelemetrySdk           : "1.29.0",
+    opentelemetrySdk           : "1.30.1",
 
     // these lines are managed by .github/scripts/update-version.sh
     opentelemetryJavaagent     : "1.30.0-SNAPSHOT",

diff --git a/...ources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java b/...ources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java
@@ -40,7 +40,7 @@ static Resource buildResource() {
       attributes.put(ResourceAttributes.HOST_ARCH, hostArch);
     }
 
-    return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL);
+    return Resource.create(attributes.build(), ResourceConstants.SCHEMA_URL);
   }
 
   private HostResource() {}

diff --git a/...esources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java b/...esources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java
@@ -56,7 +56,7 @@ static Resource buildResource() {
     String osDescription = version != null ? os + ' ' + version : os;
     attributes.put(ResourceAttributes.OS_DESCRIPTION, osDescription);
 
-    return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL);
+    return Resource.create(attributes.build(), ResourceConstants.SCHEMA_URL);
   }
 
   @Nullable

diff --git a/...ces/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java b/...ces/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java
@@ -105,7 +105,7 @@ private static Resource doBuildResource() {
       }
     }
 
-    return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL);
+    return Resource.create(attributes.build(), ResourceConstants.SCHEMA_URL);
   }
 
   private ProcessResource() {}

diff --git a/...rary/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java b/...rary/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java
@@ -11,7 +11,6 @@
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
 
 /** Factory of a {@link Resource} which provides information about the Java runtime. */
 public final class ProcessRuntimeResource {
@@ -43,7 +42,7 @@ static Resource buildResource() {
               version,
               PROCESS_RUNTIME_DESCRIPTION,
               description),
-          ResourceAttributes.SCHEMA_URL);
+          ResourceConstants.SCHEMA_URL);
     } catch (SecurityException ignored) {
       return Resource.empty();
     }

diff --git a/...s/library/src/main/java/io/opentelemetry/instrumentation/resources/ResourceConstants.java b/...s/library/src/main/java/io/opentelemetry/instrumentation/resources/ResourceConstants.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.resources;
+
+// TODO: this can be deleted after we start using the new semantic conventions artifact
+final class ResourceConstants {
+  public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.21.0";
+
+  private ResourceConstants() {}
+}
diff --git a/...es/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java b/...es/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java
@@ -25,7 +25,7 @@ void shouldCreateRuntimeAttributes() {
     Attributes attributes = resource.getAttributes();
 
     // then
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(attributes.get(ResourceAttributes.HOST_NAME)).isNotBlank();
     assertThat(attributes.get(ResourceAttributes.HOST_ARCH)).isNotBlank();
   }

diff --git a/...rces/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java b/...rces/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java
@@ -23,7 +23,7 @@ class OsResourceTest {
   @SetSystemProperty(key = "os.name", value = "Linux 4.11")
   void linux() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.LINUX);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -33,7 +33,7 @@ void linux() {
   @SetSystemProperty(key = "os.name", value = "MacOS X 11")
   void macos() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.DARWIN);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -43,7 +43,7 @@ void macos() {
   @SetSystemProperty(key = "os.name", value = "Windows 10")
   void windows() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.WINDOWS);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -53,7 +53,7 @@ void windows() {
   @SetSystemProperty(key = "os.name", value = "FreeBSD 10")
   void freebsd() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.FREEBSD);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -63,7 +63,7 @@ void freebsd() {
   @SetSystemProperty(key = "os.name", value = "NetBSD 10")
   void netbsd() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.NETBSD);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -73,7 +73,7 @@ void netbsd() {
   @SetSystemProperty(key = "os.name", value = "OpenBSD 10")
   void openbsd() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.OPENBSD);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -83,7 +83,7 @@ void openbsd() {
   @SetSystemProperty(key = "os.name", value = "DragonFlyBSD 10")
   void dragonflybsd() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.DRAGONFLYBSD);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -93,7 +93,7 @@ void dragonflybsd() {
   @SetSystemProperty(key = "os.name", value = "HP-UX 10")
   void hpux() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.HPUX);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -103,7 +103,7 @@ void hpux() {
   @SetSystemProperty(key = "os.name", value = "AIX 10")
   void aix() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.AIX);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -113,7 +113,7 @@ void aix() {
   @SetSystemProperty(key = "os.name", value = "Solaris 10")
   void solaris() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.SOLARIS);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -123,7 +123,7 @@ void solaris() {
   @SetSystemProperty(key = "os.name", value = "Z/OS 10")
   void zos() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE))
         .isEqualTo(ResourceAttributes.OsTypeValues.Z_OS);
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
@@ -133,7 +133,7 @@ void zos() {
   @SetSystemProperty(key = "os.name", value = "RagOS 10")
   void unknown() {
     Resource resource = OsResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)).isNull();
     assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
   }

diff --git a/...library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java b/...library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java
@@ -24,7 +24,7 @@ class ProcessResourceTest {
   @SetSystemProperty(key = "os.name", value = "Linux 4.12")
   void notWindows() {
     Resource resource = ProcessResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     Attributes attributes = resource.getAttributes();
 
     assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1);
@@ -39,7 +39,7 @@ void notWindows() {
   @SetSystemProperty(key = "os.name", value = "Windows 10")
   void windows() {
     Resource resource = ProcessResource.buildResource();
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     Attributes attributes = resource.getAttributes();
 
     assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1);

diff --git a/.../src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java b/.../src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java
@@ -25,7 +25,7 @@ void shouldCreateRuntimeAttributes() {
     Attributes attributes = resource.getAttributes();
 
     // then
-    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL);
+    assertThat(resource.getSchemaUrl()).isEqualTo(ResourceConstants.SCHEMA_URL);
     assertThat(attributes.get(ResourceAttributes.PROCESS_RUNTIME_NAME)).isNotBlank();
     assertThat(attributes.get(ResourceAttributes.PROCESS_RUNTIME_VERSION)).isNotBlank();
     assertThat(attributes.get(ResourceAttributes.PROCESS_RUNTIME_DESCRIPTION)).isNotBlank();
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,7 +105,7 @@ private static Resource doBuildResource() { @@
           }
         }
-        return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL);
+        return Resource.create(attributes.build(), ResourceConstants.SCHEMA_URL);
       }
       private ProcessResource() {}
@@ Expand Down @@