Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java-contrib into event-to-span-event-bridge

jack-berg · jack-berg · commit 02d078987e66 · 2024-11-18T15:33:49.000-06:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -153,7 +153,7 @@ jobs:
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
 
   required-status-check:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && always()
     needs:
       - build
       - integration-test
diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java
@@ -10,7 +10,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.linecorp.armeria.common.AggregatedHttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
-import com.linecorp.armeria.common.TlsKeyPair;
 import com.linecorp.armeria.server.ServerBuilder;
 import com.linecorp.armeria.testing.junit5.server.SelfSignedCertificateExtension;
 import com.linecorp.armeria.testing.junit5.server.ServerExtension;
@@ -69,7 +68,7 @@ static class HttpsServerTest {
         new ServerExtension() {
           @Override
           protected void configure(ServerBuilder sb) {
-            sb.tls(TlsKeyPair.of(certificate.privateKeyFile(), certificate.certificateFile()));
+            sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
 
             sb.service("/", (ctx, req) -> HttpResponse.of("Thanks for trusting me"));
           }
diff --git a/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsComponentProviderTest.java b/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsComponentProviderTest.java
@@ -20,7 +20,7 @@ class AwsComponentProviderTest {
 
   @Test
   void endToEnd() {
-    String yaml = "file_format: 0.1\n" + "propagator:\n" + "  composite: [xray, xray-lambda]\n";
+    String yaml = "file_format: 0.3\n" + "propagator:\n" + "  composite: [xray, xray-lambda]\n";
 
     OpenTelemetrySdk openTelemetrySdk =
         FileConfiguration.parseAndCreate(
diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessor.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessor.java
@@ -16,8 +16,8 @@
 import io.opentelemetry.sdk.trace.ReadableSpan;
 import io.opentelemetry.sdk.trace.SpanProcessor;
 import io.opentelemetry.sdk.trace.data.EventData;
+import io.opentelemetry.sdk.trace.data.ExceptionEventData;
 import io.opentelemetry.sdk.trace.data.SpanData;
-import io.opentelemetry.sdk.trace.internal.data.ExceptionEventData;
 import java.lang.reflect.Method;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessorTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessorTest.java
@@ -27,8 +27,8 @@
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
 import io.opentelemetry.sdk.trace.ReadableSpan;
 import io.opentelemetry.sdk.trace.data.EventData;
+import io.opentelemetry.sdk.trace.data.ExceptionEventData;
 import io.opentelemetry.sdk.trace.data.SpanData;
-import io.opentelemetry.sdk.trace.internal.data.ExceptionEventData;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.1.0")
-  implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.1")
+  implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.2")
 }
 
 spotless {
diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -1,4 +1,3 @@
-import com.gradle.enterprise.gradleplugin.testretry.retry
 import io.opentelemetry.gradle.OtelJavaExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
@@ -73,7 +72,7 @@ tasks {
       showStackTraces = true
     }
 
-    retry {
+    develocity.testRetry {
       // You can see tests that were retried by this mechanism in the collected test reports and build scans.
       if (System.getenv().containsKey("CI") || rootProject.hasProperty("retryTests")) {
         maxRetries.set(5)
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -7,12 +7,12 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
-val otelInstrumentationVersion = "2.9.0-alpha"
+val otelInstrumentationVersion = "2.10.0-alpha"
 
 val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.18.1",
   "com.google.guava:guava-bom:33.3.1-jre",
-  "com.linecorp.armeria:armeria-bom:1.31.0",
+  "com.linecorp.armeria:armeria-bom:1.30.1",
   "org.junit:junit-bom:5.11.3",
   "io.grpc:grpc-bom:1.68.1",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",
diff --git a/disk-buffering/build.gradle.kts b/disk-buffering/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
   id("otel.publish-conventions")
   id("com.github.johnrengelman.shadow")
   id("me.champeau.jmh") version "0.7.2"
-  id("ru.vyarus.animalsniffer") version "1.7.1"
+  id("ru.vyarus.animalsniffer") version "1.7.2"
   id("com.squareup.wire") version "5.1.0"
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/micrometer-meter-provider/build.gradle.kts b/micrometer-meter-provider/build.gradle.kts
@@ -20,14 +20,14 @@ dependencies {
   annotationProcessor("com.google.auto.value:auto-value")
   compileOnly("com.google.auto.value:auto-value-annotations")
 
-  testImplementation("io.micrometer:micrometer-core:1.14.0")
+  testImplementation("io.micrometer:micrometer-core:1.14.1")
 }
 
 testing {
   suites {
     val integrationTest by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("io.micrometer:micrometer-registry-prometheus:1.14.0")
+        implementation("io.micrometer:micrometer-registry-prometheus:1.14.1")
       }
     }
   }
diff --git a/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java b/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java
@@ -38,7 +38,7 @@ class RuleBasedRoutingSamplerComponentProviderTest {
   @Test
   void endToEnd() {
     String yaml =
-        "file_format: 0.1\n"
+        "file_format: 0.3\n"
             + "tracer_provider:\n"
             + "  sampler:\n"
             + "    parent_based:\n"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
   plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("com.gradle.develocity") version "3.18.1"
+    id("com.gradle.develocity") version "3.18.2"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ dependencies {`
`15`	`15`	`implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")`
`16`	`16`	`implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")`
`17`	`17`	`implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.1.0")`
`18`		`- implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.1")`
	`18`	`+ implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.2")`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`spotless {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`id("otel.publish-conventions")`
`7`	`7`	`id("com.github.johnrengelman.shadow")`
`8`	`8`	`id("me.champeau.jmh") version "0.7.2"`
`9`		`- id("ru.vyarus.animalsniffer") version "1.7.1"`
	`9`	`+ id("ru.vyarus.animalsniffer") version "1.7.2"`
`10`	`10`	`id("com.squareup.wire") version "5.1.0"`
`11`	`11`	`}`
`12`	`12`