Update otel version (#1041)

trask · web-flow · commit 811d8d7e1cdc · 2023-09-17T11:11:49.000-07:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -4,6 +4,16 @@
     "config:base"
   ],
   "packageRules": [
+    {
+      "matchPackageNames": [
+        "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha"
+      ],
+      // Renovate's default behavior is only to update from unstable -> unstable if it's for the
+      // major.minor.patch, under the assumption that you would want to update to the stable version
+      // of that release instead of the unstable version for a future release (but there's never any
+      // stable version of opentelemetry-instrumentation-bom-alpha so this logic doesn't apply
+      "ignoreUnstable": false
+    },
     {
       "matchPackagePrefixes": ["ch.qos.logback:"],
       "groupName": "logback packages"
diff --git a/aws-resources/build.gradle.kts b/aws-resources/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
   api("io.opentelemetry:opentelemetry-api")
   api("io.opentelemetry:opentelemetry-sdk")
 
-  implementation("io.opentelemetry:opentelemetry-semconv")
+  implementation("io.opentelemetry.semconv:opentelemetry-semconv")
 
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
 
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Locale;
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResource.java
@@ -8,7 +8,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.util.Map;
 import java.util.stream.Stream;
 
diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceTest.java
@@ -13,7 +13,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.File;
 import java.io.IOException;
 import java.util.ServiceLoader;
diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceTest.java
@@ -16,7 +16,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.util.ServiceLoader;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java
@@ -14,7 +14,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EksResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EksResourceTest.java
@@ -18,7 +18,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.File;
 import java.io.IOException;
 import java.util.ServiceLoader;
diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/LambdaResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/LambdaResourceTest.java
@@ -13,7 +13,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
diff --git a/aws-xray/build.gradle.kts b/aws-xray/build.gradle.kts
@@ -45,3 +45,10 @@ testing {
     }
   }
 }
+
+configurations.all {
+  resolutionStrategy {
+    // TODO this module still needs to be updated to the latest semconv
+    force("io.opentelemetry:opentelemetry-semconv:1.28.0-alpha")
+  }
+}
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -13,7 +13,7 @@ val DEPENDENCY_BOMS = listOf(
   "com.linecorp.armeria:armeria-bom:1.25.2",
   "org.junit:junit-bom:5.10.0",
   "io.grpc:grpc-bom:1.58.0",
-  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha",
+  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha",
   "org.testcontainers:testcontainers-bom:1.19.0"
 )
 
@@ -46,7 +46,6 @@ val CORE_DEPENDENCIES = listOf(
 )
 
 val DEPENDENCIES = listOf(
-  "io.opentelemetry.javaagent:opentelemetry-javaagent:1.30.0",
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.squareup.okhttp3:okhttp:4.11.0",
diff --git a/jmx-metrics/build.gradle.kts b/jmx-metrics/build.gradle.kts
@@ -19,10 +19,6 @@ repositories {
       includeGroupByRegex("""org\.terracotta.*""")
     }
   }
-  maven {
-    url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-  }
-  mavenLocal()
 }
 
 val groovyVersion = "3.0.19"
diff --git a/maven-extension/build.gradle.kts b/maven-extension/build.gradle.kts
@@ -60,3 +60,10 @@ tasks {
 }
 
 tasks.getByName("test").dependsOn("shadowJar")
+
+configurations.all {
+  resolutionStrategy {
+    // TODO this module still needs to be updated to the latest semconv
+    force("io.opentelemetry:opentelemetry-semconv:1.28.0-alpha")
+  }
+}
diff --git a/resource-providers/build.gradle.kts b/resource-providers/build.gradle.kts
@@ -14,9 +14,9 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-sdk")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  compileOnly("io.opentelemetry:opentelemetry-semconv")
+  compileOnly("io.opentelemetry.semconv:opentelemetry-semconv")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
-  testImplementation("io.opentelemetry:opentelemetry-semconv")
+  testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")
   testImplementation("com.google.auto.service:auto-service")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") {
diff --git a/resource-providers/src/main/java/io/opentelemetry/contrib/resourceproviders/AppServerServiceNameProvider.java b/resource-providers/src/main/java/io/opentelemetry/contrib/resourceproviders/AppServerServiceNameProvider.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.resourceproviders;
 
-import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME;
+import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
diff --git a/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/AppServerServiceNameProviderTest.java b/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/AppServerServiceNameProviderTest.java
@@ -12,7 +12,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
diff --git a/samplers/build.gradle.kts b/samplers/build.gradle.kts
@@ -8,7 +8,7 @@ otelJava.moduleName.set("io.opentelemetry.contrib.sampler")
 
 dependencies {
   api("io.opentelemetry:opentelemetry-sdk")
-  api("io.opentelemetry:opentelemetry-semconv")
+  api("io.opentelemetry.semconv:opentelemetry-semconv")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
 }
diff --git a/samplers/src/test/java/io/opentelemetry/contrib/sampler/LinksBasedSamplerTest.java b/samplers/src/test/java/io/opentelemetry/contrib/sampler/LinksBasedSamplerTest.java
@@ -14,17 +14,16 @@
 import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.api.trace.TraceState;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.trace.IdGenerator;
 import io.opentelemetry.sdk.trace.data.LinkData;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 
 class LinksBasedSamplerTest {
@@ -191,23 +190,22 @@ void testTwoUnsampled() {
   }
 
   @Test
-  void testProvider() throws Exception {
-    Method method =
-        Class.forName("io.opentelemetry.sdk.autoconfigure.TracerProviderConfiguration")
-            .getDeclaredMethod(
-                "configureSampler", String.class, ConfigProperties.class, ClassLoader.class);
-    method.setAccessible(true);
-
-    Sampler sampler =
-        (Sampler)
-            method.invoke(
-                null,
-                "linksbased_parentbased_always_on",
-                DefaultConfigProperties.createForTest(Collections.emptyMap()),
-                AutoConfiguredOpenTelemetrySdkBuilder.class.getClassLoader());
-
-    assertThat(sampler.getDescription())
-        .isEqualTo(
-            LinksBasedSampler.create(Sampler.parentBased(Sampler.alwaysOn())).getDescription());
+  void testProvider() {
+    Map<String, String> config = new HashMap<>();
+    config.put("otel.traces.exporter", "none");
+    config.put("otel.metrics.exporter", "none");
+    config.put("otel.logs.exporter", "none");
+    config.put("otel.traces.sampler", "linksbased_parentbased_always_on");
+    AutoConfiguredOpenTelemetrySdk.builder()
+        .addPropertiesSupplier(() -> config)
+        .addSamplerCustomizer(
+            (sampler, configProperties) -> {
+              assertThat(sampler.getDescription())
+                  .isEqualTo(
+                      LinksBasedSampler.create(Sampler.parentBased(Sampler.alwaysOn()))
+                          .getDescription());
+              return sampler;
+            })
+        .build();
   }
 }
diff --git a/samplers/src/test/java/io/opentelemetry/contrib/sampler/RuleBasedRoutingSamplerTest.java b/samplers/src/test/java/io/opentelemetry/contrib/sampler/RuleBasedRoutingSamplerTest.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.contrib.sampler;
 
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_TARGET;
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_URL;
+import static io.opentelemetry.semconv.SemanticAttributes.URL_FULL;
+import static io.opentelemetry.semconv.SemanticAttributes.URL_PATH;
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -57,8 +57,8 @@ public void setup() {
     when(delegate.shouldSample(any(), any(), any(), any(), any(), any()))
         .thenReturn(SamplingResult.create(SamplingDecision.RECORD_AND_SAMPLE));
 
-    patterns.add(new SamplingRule(HTTP_URL, ".*/healthcheck", Sampler.alwaysOff()));
-    patterns.add(new SamplingRule(HTTP_TARGET, "/actuator", Sampler.alwaysOff()));
+    patterns.add(new SamplingRule(URL_FULL, ".*/healthcheck", Sampler.alwaysOff()));
+    patterns.add(new SamplingRule(URL_PATH, "/actuator", Sampler.alwaysOff()));
   }
 
   @Test
@@ -83,7 +83,7 @@ public void testThatThrowsOnNullParameter() {
 
     assertThatExceptionOfType(NullPointerException.class)
         .isThrownBy(
-            () -> RuleBasedRoutingSampler.builder(SPAN_KIND, delegate).drop(HTTP_URL, null));
+            () -> RuleBasedRoutingSampler.builder(SPAN_KIND, delegate).drop(URL_FULL, null));
 
     assertThatExceptionOfType(NullPointerException.class)
         .isThrownBy(
@@ -93,7 +93,7 @@ public void testThatThrowsOnNullParameter() {
         .isThrownBy(
             () ->
                 RuleBasedRoutingSampler.builder(SPAN_KIND, delegate)
-                    .recordAndSample(HTTP_URL, null));
+                    .recordAndSample(URL_FULL, null));
   }
 
   @Test
@@ -109,7 +109,7 @@ public void testThatDelegatesIfNoRulesGiven() {
     clearInvocations(delegate);
 
     // with http.url attribute
-    attributes = Attributes.of(HTTP_URL, "https://example.com");
+    attributes = Attributes.of(URL_FULL, "https://example.com");
     sampler.shouldSample(parentContext, traceId, SPAN_NAME, SPAN_KIND, attributes, emptyList());
     verify(delegate)
         .shouldSample(parentContext, traceId, SPAN_NAME, SPAN_KIND, attributes, emptyList());
@@ -160,7 +160,7 @@ public void testDelegateOnMalformedUrl() {
   public void testVerifiesAllGivenAttributes() {
     RuleBasedRoutingSampler sampler =
         addRules(RuleBasedRoutingSampler.builder(SPAN_KIND, delegate)).build();
-    Attributes attributes = Attributes.of(HTTP_TARGET, "/actuator/info");
+    Attributes attributes = Attributes.of(URL_PATH, "/actuator/info");
     assertThat(
             sampler
                 .shouldSample(parentContext, traceId, SPAN_NAME, SPAN_KIND, attributes, emptyList())
@@ -170,10 +170,10 @@ public void testVerifiesAllGivenAttributes() {
 
   @Test
   void customSampler() {
-    Attributes attributes = Attributes.of(HTTP_TARGET, "/test");
+    Attributes attributes = Attributes.of(URL_PATH, "/test");
     RuleBasedRoutingSampler testSampler =
         RuleBasedRoutingSampler.builder(SPAN_KIND, delegate)
-            .customize(HTTP_TARGET, ".*test", new AlternatingSampler())
+            .customize(URL_PATH, ".*test", new AlternatingSampler())
             .build();
     assertThat(
             testSampler
@@ -188,13 +188,13 @@ void customSampler() {
   }
 
   private SamplingResult shouldSample(Sampler sampler, String url) {
-    Attributes attributes = Attributes.of(HTTP_URL, url);
+    Attributes attributes = Attributes.of(URL_FULL, url);
     return sampler.shouldSample(
         parentContext, traceId, SPAN_NAME, SPAN_KIND, attributes, emptyList());
   }
 
   private static RuleBasedRoutingSamplerBuilder addRules(RuleBasedRoutingSamplerBuilder builder) {
-    return builder.drop(HTTP_URL, ".*/healthcheck").drop(HTTP_TARGET, "/actuator");
+    return builder.drop(URL_FULL, ".*/healthcheck").drop(URL_PATH, "/actuator");
   }
 
   /** Silly sampler that alternates decisions for testing. */
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,10 +13,6 @@ plugins {
 dependencyResolutionManagement {
   repositories {
     mavenCentral()
-    maven {
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-    }
-    mavenLocal()
   }
 }
 
