Merge branch 'main' into jmx-metrics-advice

Author: SylvainJuge

README.md

@@ -134,7 +134,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 - [Lauri Tulmin](https://github.com/laurit), Splunk
 - [Trask Stalnaker](https://github.com/trask), Microsoft
 
-For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
+For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
 
 ### Approvers
 
@@ -148,7 +148,7 @@ For more information about the maintainer role, see the [community repository](h
 - [Steve Rao](https://github.com/steverao), Alibaba
 - [Sylvain Juge](https://github.com/SylvainJuge), Elastic
 
-For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).
+For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
 
 ### Emeritus maintainers
 

conventions/build.gradle.kts

@@ -67,7 +67,7 @@ dependencies {
   implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.17.6")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
-  implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
+  implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
 

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java

@@ -25,7 +25,6 @@
 @ConditionalOnEnabledInstrumentation(module = "spring-webmvc")
 @ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class})
 @Configuration
-@SuppressWarnings("OtelPrivateConstructorForUtilityClass")
 public class SpringWebMvc5InstrumentationAutoConfiguration {
 
   @Bean

instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java

@@ -25,7 +25,6 @@
 @ConditionalOnEnabledInstrumentation(module = "spring-webmvc")
 @ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class})
 @Configuration
-@SuppressWarnings("OtelPrivateConstructorForUtilityClass")
 public class SpringWebMvc6InstrumentationAutoConfiguration {
 
   @Bean

smoke-tests/build.gradle.kts

@@ -15,7 +15,7 @@ otelJava {
   maxJavaVersionForTests.set(JavaVersion.VERSION_11)
 }
 
-val dockerJavaVersion = "3.5.1"
+val dockerJavaVersion = "3.5.2"
 dependencies {
   testCompileOnly("com.google.auto.value:auto-value-annotations")
   testAnnotationProcessor("com.google.auto.value:auto-value")

smoke-tests/images/quarkus/build.gradle.kts

@@ -12,11 +12,11 @@ plugins {
   id("otel.java-conventions")
 
   id("com.google.cloud.tools.jib")
-  id("io.quarkus") version "3.23.4"
+  id("io.quarkus") version "3.24.1"
 }
 
 dependencies {
-  implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.24.0"))
+  implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.24.1"))
   implementation("io.quarkus:quarkus-rest")
 }
 

test-report/src/main/java/io/opentelemetry/instrumentation/testreport/FlakyTestReporter.java

@@ -277,7 +277,8 @@ private void report(String accessKey, String buildScanUrl, String jobUrl) throws
       row.add(flakyTest.testName);
       row.add(buildScanUrl);
       row.add(jobUrl);
-      row.add(flakyTest.message);
+      // there is a limit of 50000 characters in a single cell
+      row.add(abbreviate(flakyTest.message, 10000));
       data.add(row);
     }
 
@@ -291,6 +292,14 @@ private void report(String accessKey, String buildScanUrl, String jobUrl) throws
         .execute();
   }
 
+  private static String abbreviate(String text, int maxLength) {
+    if (text.length() > maxLength) {
+      return text.substring(0, maxLength - 3) + "...";
+    }
+
+    return text;
+  }
+
   public static void main(String... args) throws Exception {
     String path = System.getProperty("scanPath");
     if (path == null) {