Merge branch 'main' into assertions-refactoring

Author: robsunday

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,6 +17,7 @@ body:
         - jfr-connection
         - jfr-events
         - jmx-metrics
+        - jmx-scraper
         - maven-extension
         - micrometer-meter-provider
         - noop-api

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -17,6 +17,7 @@ body:
         - jfr-connection
         - jfr-events
         - jmx-metrics
+        - jmx-scraper
         - maven-extension
         - micrometer-meter-provider
         - noop-api

.github/component_owners.yml

@@ -56,6 +56,7 @@ components:
   processors:
     - LikeTheSalad
     - breedx-splk
+    - jack-berg
   prometheus-collector:
     - jkwatson
   resource-providers:

.github/renovate.json5

@@ -85,6 +85,13 @@
       "matchPackagePrefixes": ["org.openjdk.jmc"],
       "matchUpdateTypes": ["major"],
       "enabled": false
+    },
+    {
+      // pinned version for compatibility
+      "matchFileNames": ["jmx-scraper/test-webapp/build.gradle.kts"],
+      "matchPackagePrefixes": ["jakarta.servlet:"],
+      "matchCurrentVersion": "5.0.0",
+      "enabled": false
     }
   ]
 }

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## Version 1.41.0 (2024-11-21)
+
+### Inferred spans
+
+- Allow customization of parent-override behavior
+  ([#1533](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1533))
+
+### Telemetry processors
+
+- Add LogRecordProcessor to record event log records as span events
+  ([#1551](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1551))
+
 ## Version 1.40.0 (2024-10-18)
 
 ### AWS X-Ray SDK support

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java

@@ -10,6 +10,7 @@
 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;
@@ -68,7 +69,7 @@ static class HttpsServerTest {
         new ServerExtension() {
           @Override
           protected void configure(ServerBuilder sb) {
-            sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
+            sb.tls(TlsKeyPair.of(certificate.privateKeyFile(), certificate.certificateFile()));
 
             sb.service("/", (ctx, req) -> HttpResponse.of("Thanks for trusting me"));
           }

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -90,12 +90,6 @@ tasks {
       breakIterator(true)
 
       addBooleanOption("html5", true)
-
-      // TODO (trask) revisit to see if url is fixed
-      // currently broken because https://docs.oracle.com/javase/8/docs/api/element-list is missing
-      // and redirects
-      // links("https://docs.oracle.com/javase/8/docs/api/")
-
       addBooleanOption("Xdoclint:all,-missing", true)
     }
   }

compressors/compressor-zstd/build.gradle.kts

@@ -9,7 +9,7 @@ otelJava.moduleName.set("io.opentelemetry.contrib.compressor.zstd")
 dependencies {
   api("io.opentelemetry:opentelemetry-exporter-common")
 
-  implementation("com.github.luben:zstd-jni:1.5.6-7")
+  implementation("com.github.luben:zstd-jni:1.5.6-8")
 
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
   testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")

dependencyManagement/build.gradle.kts

@@ -12,11 +12,11 @@ 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.30.1",
+  "com.linecorp.armeria:armeria-bom:1.31.1",
   "org.junit:junit-bom:5.11.3",
   "io.grpc:grpc-bom:1.68.1",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",
-  "org.testcontainers:testcontainers-bom:1.20.3"
+  "org.testcontainers:testcontainers-bom:1.20.4"
 )
 
 val autoServiceVersion = "1.1.1"
@@ -35,7 +35,7 @@ val CORE_DEPENDENCIES = listOf(
   "com.google.errorprone:error_prone_annotations:${errorProneVersion}",
   "com.google.errorprone:error_prone_core:${errorProneVersion}",
   "io.github.netmikey.logunit:logunit-jul:2.0.0",
-  "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
+  "io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha",
   // these two constraints can be removed once the opentelemetry-instrumentation-bom-alpha
   // is updated to contain the latest version of opentelemetry-semconv
   "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",
@@ -64,7 +64,7 @@ val DEPENDENCIES = listOf(
   "org.junit-pioneer:junit-pioneer:1.9.1",
   "org.skyscreamer:jsonassert:1.5.3",
   "org.apache.kafka:kafka-clients:3.9.0",
-  "org.testcontainers:kafka:1.20.3",
+  "org.testcontainers:kafka:1.20.4",
   "com.lmax:disruptor:3.4.4",
   "org.jctools:jctools-core:4.0.5",
   "tools.profiler:async-profiler:3.0",

disk-buffering/build.gradle.kts

@@ -53,7 +53,7 @@ wire {
   java {}
 
   sourcePath {
-    srcJar("io.opentelemetry.proto:opentelemetry-proto:1.1.0-alpha")
+    srcJar("io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha")
   }
 
   root(