Quarkus 3.13.1 (#9236)

* Update quarkusPlatform to v3.13.1

* Replace deprecated `@QuarkusTestResource` with `@WithTestResource`

* Handle opentelemetry deprecations (for removal)

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

events/quarkus/src/main/java/org/projectnessie/events/quarkus/collector/QuarkusTracingResultCollector.java

@@ -29,6 +29,7 @@ public class QuarkusTracingResultCollector implements Consumer<Result> {
       AttributeKey.stringKey("nessie.results.type");
   public static final AttributeKey<String> ENDUSER_ID = AttributeKey.stringKey("enduser.id");
   public static final AttributeKey<String> PEER_SERVICE = AttributeKey.stringKey("peer.service");
+  public static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
 
   private final Consumer<Result> delegate;
   private final String userName;
@@ -47,6 +48,7 @@ public void accept(Result result) {
             .spanBuilder(NESSIE_RESULTS_SPAN_NAME)
             .setAttribute(NESSIE_RESULT_TYPE_ATTRIBUTE_KEY, result.getResultType().name())
             .setAttribute(ENDUSER_ID, userName)
+            .setAttribute(SERVICE_NAME, "Nessie")
             .setAttribute(PEER_SERVICE, "Nessie")
             .startSpan();
     try (Scope ignored = span.makeCurrent()) {

events/quarkus/src/test/java/org/projectnessie/events/quarkus/assertions/TracingAssertions.java

@@ -18,9 +18,8 @@
 import static io.opentelemetry.sdk.trace.data.StatusData.error;
 import static io.opentelemetry.sdk.trace.data.StatusData.ok;
 import static io.opentelemetry.sdk.trace.data.StatusData.unset;
-import static io.opentelemetry.semconv.SemanticAttributes.ENDUSER_ID;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE;
-import static io.opentelemetry.semconv.SemanticAttributes.PEER_SERVICE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
+import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.projectnessie.events.api.EventType.COMMIT;
@@ -59,6 +58,7 @@
 
 @Singleton
 public class TracingAssertions {
+  public static final AttributeKey<String> ENDUSER_ID = AttributeKey.stringKey("enduser.id");
 
   @Inject Instance<MockSpanExporter> exporter;
   @Inject Instance<Tracer> tracer;
@@ -410,7 +410,7 @@ private void assertEndUserId(boolean authEnabled) {
   }
 
   private void assertPeerService() {
-    assertSpanAttributeEquals("nessie", PEER_SERVICE, "Nessie");
+    assertSpanAttributeEquals("nessie", SERVICE_NAME, "Nessie");
   }
 
   private void assertResultTypeAttribute(ResultType resultType) {

events/quarkus/src/test/java/org/projectnessie/events/quarkus/collector/TestQuarkusTracingResultCollector.java

@@ -15,9 +15,7 @@
  */
 package org.projectnessie.events.quarkus.collector;
 
-import static io.opentelemetry.semconv.SemanticAttributes.ENDUSER_ID;
-import static io.opentelemetry.semconv.SemanticAttributes.PEER_SERVICE;
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -26,28 +24,37 @@
 import static org.projectnessie.events.quarkus.collector.QuarkusTracingResultCollector.NESSIE_RESULT_TYPE_ATTRIBUTE_KEY;
 import static org.projectnessie.versioned.ResultType.MERGE;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.sdk.trace.ReadableSpan;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SpanProcessor;
 import java.util.function.Consumer;
+import org.assertj.core.api.SoftAssertions;
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.projectnessie.versioned.Result;
 
-@ExtendWith(MockitoExtension.class)
+@ExtendWith({SoftAssertionsExtension.class, MockitoExtension.class})
 class TestQuarkusTracingResultCollector {
+  @InjectSoftAssertions SoftAssertions soft;
   @Mock Consumer<Result> delegate;
   @Mock Result result;
   @Mock SpanProcessor processor;
 
+  public static final AttributeKey<String> ENDUSER_ID = AttributeKey.stringKey("enduser.id");
+
   @Test
   void accept() {
     when(result.getResultType()).thenReturn(MERGE);
+    when(processor.isStartRequired()).thenReturn(true);
+    when(processor.isEndRequired()).thenReturn(true);
     @SuppressWarnings("resource")
     TracerProvider tracerProvider = SdkTracerProvider.builder().addSpanProcessor(processor).build();
     Tracer tracer = tracerProvider.get("test");
@@ -59,11 +66,11 @@ void accept() {
     ArgumentCaptor<ReadableSpan> spanEndCaptor = ArgumentCaptor.forClass(ReadableSpan.class);
     verify(processor).onEnd(spanEndCaptor.capture());
     ReadableSpan end = spanEndCaptor.getValue();
-    assertThat(end.getName()).isEqualTo(NESSIE_RESULTS_SPAN_NAME);
-    assertThat(end.getAttribute(NESSIE_RESULT_TYPE_ATTRIBUTE_KEY)).isEqualTo(MERGE.name());
-    assertThat(end.getAttribute(ENDUSER_ID)).isEqualTo("alice");
-    assertThat(end.getAttribute(PEER_SERVICE)).isEqualTo("Nessie");
-    assertThat(end.getSpanContext().isValid()).isTrue();
+    soft.assertThat(end.getName()).isEqualTo(NESSIE_RESULTS_SPAN_NAME);
+    soft.assertThat(end.getAttribute(NESSIE_RESULT_TYPE_ATTRIBUTE_KEY)).isEqualTo(MERGE.name());
+    soft.assertThat(end.getAttribute(ENDUSER_ID)).isEqualTo("alice");
+    soft.assertThat(end.getAttribute(SERVICE_NAME)).isEqualTo("Nessie");
+    soft.assertThat(end.getSpanContext().isValid()).isTrue();
     verifyNoMoreInteractions(delegate, processor);
   }
 }

events/quarkus/src/test/java/org/projectnessie/events/quarkus/delivery/TestTracingEventDelivery.java

@@ -108,6 +108,8 @@ TracingEventDelivery newDelivery() {
   @Override
   @Test
   void testDeliverySuccessNoRetry() {
+    when(processor.isStartRequired()).thenReturn(true);
+    when(processor.isEndRequired()).thenReturn(true);
     super.testDeliverySuccessNoRetry();
     verify(delegate).deliverySuccessful(1);
     verify(processor).onStart(any(), argThat(deliverySpanMatcherNoRetry));
@@ -120,6 +122,8 @@ void testDeliverySuccessNoRetry() {
   @Override
   @Test
   void testDeliverySuccessWithRetry() {
+    when(processor.isStartRequired()).thenReturn(true);
+    when(processor.isEndRequired()).thenReturn(true);
     super.testDeliverySuccessWithRetry();
     verify(delegate).deliverySuccessful(3);
     verify(processor).onStart(any(), argThat(deliverySpanMatcherWithRetries));
@@ -136,6 +140,8 @@ void testDeliverySuccessWithRetry() {
   @Override
   @Test
   void testDeliveryFailureWithRetry() {
+    when(processor.isStartRequired()).thenReturn(true);
+    when(processor.isEndRequired()).thenReturn(true);
     super.testDeliveryFailureWithRetry();
     verify(delegate).deliveryFailed(eq(3), any());
     verify(processor).onStart(any(), argThat(deliverySpanMatcherWithRetries));
@@ -152,6 +158,8 @@ void testDeliveryFailureWithRetry() {
   @Override
   @Test
   void testDeliveryRejected() {
+    when(processor.isStartRequired()).thenReturn(true);
+    when(processor.isEndRequired()).thenReturn(true);
     super.testDeliveryRejected();
     verify(delegate).deliveryRejected();
     verify(processor).onStart(any(), argThat(deliverySpanMatcherNoRetry));

gradle/libs.versions.toml

@@ -25,8 +25,8 @@ opentelemetryAlpha = "1.31.0-alpha"
 opentracing = "0.33.0"
 picocli = "4.7.6"
 protobuf = "4.27.3"
-quarkusPlatform = "3.12.3"
-quarkusPlugin = "3.13.0"
+quarkusPlatform = "3.13.1"
+quarkusPlugin = "3.13.1"
 slf4j = "2.0.14"
 smallryeConfig = "3.9.1"
 undertow = "2.2.33.Final"

servers/quarkus-server/src/intTest/java/org/projectnessie/server/ITBearerAuthentication.java

@@ -16,7 +16,7 @@
 package org.projectnessie.server;
 
 import com.google.common.collect.ImmutableMap;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
@@ -26,9 +26,7 @@
 import org.projectnessie.server.authn.AuthenticationEnabledProfile;
 
 @QuarkusIntegrationTest
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = KeycloakTestResourceLifecycleManager.class)
+@WithTestResource(KeycloakTestResourceLifecycleManager.class)
 @TestProfile(value = ITBearerAuthentication.Profile.class)
 public class ITBearerAuthentication extends AbstractBearerAuthentication {
 

servers/quarkus-server/src/intTest/java/org/projectnessie/server/ITOAuth2Authentication.java

@@ -16,8 +16,8 @@
 package org.projectnessie.server;
 
 import com.google.common.collect.ImmutableMap;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.ResourceArg;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
@@ -34,8 +34,7 @@
 import org.projectnessie.server.authn.AuthenticationEnabledProfile;
 
 @QuarkusIntegrationTest
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
+@WithTestResource(
     value = KeycloakTestResourceLifecycleManager.class,
     initArgs =
         @ResourceArg(

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/adls/ITAdlsIcebergCatalog.java

@@ -18,7 +18,7 @@
 import static java.util.UUID.randomUUID;
 
 import com.google.common.collect.ImmutableMap;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import java.net.URI;
 import java.util.Map;
@@ -29,9 +29,7 @@
 import org.projectnessie.server.catalog.WarehouseAccountSecret;
 import org.projectnessie.server.catalog.WarehouseLocation;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = AzuriteTestResourceLifecycleManager.class)
+@WithTestResource(AzuriteTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest
 public class ITAdlsIcebergCatalog extends AbstractIcebergCatalogIntTests {
 

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/auth/AbstractAuthEnabledTests.java

@@ -19,7 +19,7 @@
 import static org.projectnessie.server.catalog.ObjectStorageMockTestResourceLifecycleManager.bucketWarehouseLocation;
 
 import com.google.common.collect.ImmutableMap;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -44,10 +44,7 @@
 import org.projectnessie.server.catalog.AbstractIcebergCatalogTests;
 import org.projectnessie.server.catalog.ObjectStorageMockTestResourceLifecycleManager;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    parallel = true,
-    value = KeycloakTestResourceLifecycleManager.class)
+@WithTestResource(parallel = true, value = KeycloakTestResourceLifecycleManager.class)
 public abstract class AbstractAuthEnabledTests extends AbstractIcebergCatalogTests {
 
   @KeycloakTokenEndpointUri protected URI tokenEndpoint;

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/auth/ITOAuthTrinoS3.java

@@ -15,7 +15,7 @@
  */
 package org.projectnessie.server.catalog.auth;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import java.net.URI;
@@ -31,12 +31,8 @@
 import org.projectnessie.testing.keycloak.OAuthUtils;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = MinioTestResourceLifecycleManager.class)
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = KeycloakTestResourceLifecycleManager.class)
+@WithTestResource(MinioTestResourceLifecycleManager.class)
+@WithTestResource(KeycloakTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest
 @TestProfile(ITOAuthTrinoS3.Profile.class)
 public class ITOAuthTrinoS3 extends AbstractTrino {

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/gcs/ITGcsIcebergCatalog.java

@@ -17,7 +17,7 @@
 
 import static java.util.UUID.randomUUID;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import java.net.URI;
 import java.util.Map;
@@ -27,9 +27,7 @@
 import org.projectnessie.server.catalog.GcsToken;
 import org.projectnessie.server.catalog.WarehouseLocation;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = GcsEmulatorTestResourceLifecycleManager.class)
+@WithTestResource(GcsEmulatorTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest
 public class ITGcsIcebergCatalog extends AbstractIcebergCatalogIntTests {
 

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/s3/ITS3AssumeRoleIceberg.java

@@ -15,14 +15,12 @@
  */
 package org.projectnessie.server.catalog.s3;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.projectnessie.server.catalog.MinioTestResourceLifecycleManager;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = MinioTestResourceLifecycleManager.class)
+@WithTestResource(MinioTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest
 @TestProfile(ITS3AssumeRoleIceberg.Profile.class)
 public class ITS3AssumeRoleIceberg extends AbstractAssumeRoleIceberg {

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/s3/ITS3AssumeRoleIcebergCatalog.java

@@ -17,7 +17,7 @@
 
 import static java.util.Collections.singletonMap;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
@@ -32,9 +32,7 @@
 import org.projectnessie.server.catalog.MinioTestResourceLifecycleManager;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = MinioTestResourceLifecycleManager.class)
+@WithTestResource(MinioTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest
 @TestProfile(ITS3AssumeRoleIcebergCatalog.Profile.class)
 public class ITS3AssumeRoleIcebergCatalog extends AbstractIcebergCatalogIntTests {

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/s3/ITS3IcebergCatalog.java

@@ -17,7 +17,7 @@
 
 import static java.util.Collections.singletonMap;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import java.util.HashMap;
 import java.util.Map;
@@ -32,9 +32,7 @@
 import org.projectnessie.server.catalog.AbstractIcebergCatalogIntTests;
 import org.projectnessie.server.catalog.MinioTestResourceLifecycleManager;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = MinioTestResourceLifecycleManager.class)
+@WithTestResource(MinioTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest
 public class ITS3IcebergCatalog extends AbstractIcebergCatalogIntTests {
 

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/s3/ITS3NAssumeRoleIceberg.java

@@ -15,14 +15,13 @@
  */
 package org.projectnessie.server.catalog.s3;
 
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.ResourceArg;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.projectnessie.server.catalog.MinioTestResourceLifecycleManager;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
+@WithTestResource(
     initArgs = {@ResourceArg(name = "scheme", value = "s3n")},
     value = MinioTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest

servers/quarkus-server/src/intTest/java/org/projectnessie/server/catalog/s3/ITTrinoS3.java

@@ -15,15 +15,13 @@
  */
 package org.projectnessie.server.catalog.s3;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.projectnessie.server.catalog.AbstractTrino;
 import org.projectnessie.server.catalog.MinioTestResourceLifecycleManager;
 
-@QuarkusTestResource(
-    restrictToAnnotatedClass = true,
-    value = MinioTestResourceLifecycleManager.class)
+@WithTestResource(MinioTestResourceLifecycleManager.class)
 @QuarkusIntegrationTest
 @TestProfile(ITTrinoS3.Profile.class)
 public class ITTrinoS3 extends AbstractTrino {

servers/quarkus-server/src/test/java/org/projectnessie/server/TestBearerAuthentication.java

@@ -17,7 +17,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
@@ -27,7 +27,7 @@
 import org.projectnessie.server.authn.AuthenticationEnabledProfile;
 
 @QuarkusTest
-@QuarkusTestResource(OidcWiremockTestResource.class)
+@WithTestResource(OidcWiremockTestResource.class)
 @TestProfile(value = TestBearerAuthentication.Profile.class)
 public class TestBearerAuthentication extends AbstractBearerAuthentication {