Bump to Quarkus 3.2.0.Final

docker/telemetry/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - jaeger
     environment:
       - nessie.version.store.type=IN_MEMORY
-      - quarkus.opentelemetry.tracer.exporter.otlp.endpoint=http://jaeger:4317
+      - quarkus.otel.exporter.otlp.endpoint=http://jaeger:4317
 
   # Jaeger
   jaeger:

events/quarkus/build.gradle.kts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import io.quarkus.gradle.tasks.QuarkusBuild
-
 plugins {
   alias(libs.plugins.quarkus)
   id("nessie-conventions-quarkus")
@@ -68,10 +66,3 @@ listOf("javadoc", "sourcesJar").forEach { name ->
 listOf("checkstyleTest", "compileTestJava").forEach { name ->
   tasks.named(name).configure { dependsOn(tasks.named("compileQuarkusTestGeneratedSourcesJava")) }
 }
-
-val quarkusBuild =
-  tasks.named<QuarkusBuild>("quarkusBuild") {
-    outputs.doNotCacheIf("Do not add huge cache artifacts to build cache") { true }
-    inputs.property("final.name", quarkus.finalName())
-    inputs.properties(quarkus.quarkusBuildProperties.get())
-  }

events/quarkus/src/main/java/org/projectnessie/events/quarkus/QuarkusEventFactory.java

@@ -15,8 +15,8 @@
  */
 package org.projectnessie.events.quarkus;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.projectnessie.events.service.EventConfig;
 import org.projectnessie.events.service.EventFactory;
 

events/quarkus/src/main/java/org/projectnessie/events/quarkus/QuarkusEventService.java

@@ -23,11 +23,11 @@
 import io.vertx.core.eventbus.EventBus;
 import io.vertx.core.eventbus.Message;
 import io.vertx.core.eventbus.MessageConsumer;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
 import org.projectnessie.events.api.Event;
 import org.projectnessie.events.api.EventType;
 import org.projectnessie.events.quarkus.config.EventBusConfigurer;

events/quarkus/src/main/java/org/projectnessie/events/quarkus/QuarkusEventSubscribers.java

@@ -15,8 +15,8 @@
  */
 package org.projectnessie.events.quarkus;
 
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
 import org.projectnessie.events.service.EventSubscribers;
 import org.projectnessie.events.spi.EventSubscriber;
 

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

@@ -20,14 +20,14 @@
 import io.quarkus.arc.lookup.LookupIfProperty;
 import io.vertx.core.eventbus.DeliveryOptions;
 import io.vertx.core.eventbus.EventBus;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 import java.security.Principal;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
 import org.projectnessie.events.quarkus.config.QuarkusEventConfig;
 import org.projectnessie.events.service.EventSubscribers;
 import org.projectnessie.versioned.Result;

events/quarkus/src/main/java/org/projectnessie/events/quarkus/config/EventBusConfigurer.java

@@ -20,10 +20,10 @@
 import io.vertx.core.eventbus.DeliveryOptions;
 import io.vertx.core.eventbus.EventBus;
 import io.vertx.core.tracing.TracingPolicy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 public class EventBusConfigurer {
 

events/quarkus/src/main/java/org/projectnessie/events/quarkus/delivery/EventDeliveryFactory.java

@@ -18,10 +18,10 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.opentelemetry.api.trace.Tracer;
 import io.vertx.core.Vertx;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import org.projectnessie.events.api.Event;
 import org.projectnessie.events.quarkus.config.QuarkusEventConfig;
 import org.projectnessie.events.spi.EventSubscriber;

events/quarkus/src/test/java/org/projectnessie/events/quarkus/TestQuarkusEvents.java

@@ -18,9 +18,9 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.projectnessie.events.quarkus.assertions.EventAssertions;
@@ -104,9 +104,8 @@ public Map<String, String> getConfigOverrides() {
       map.put("nessie.version.store.events.metrics.enable", "false");
       // Extensions all enabled by default
       map.put("quarkus.micrometer.enabled", "true");
-      map.put("quarkus.opentelemetry.enabled", "true");
       // Sample everything
-      map.put("quarkus.opentelemetry.tracer.sampler", "on");
+      map.put("quarkus.otel.traces.sampler", "always_on");
       // Enable retries + reduce backoff
       map.put("nessie.version.store.events.retry.max-attempts", "3");
       map.put("nessie.version.store.events.retry.initial-delay", "PT0.01S");

events/quarkus/src/test/java/org/projectnessie/events/quarkus/TestQuarkusEventsWithAuthDisabled.java

@@ -17,9 +17,9 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.projectnessie.events.quarkus.assertions.EventAssertions;

events/quarkus/src/test/java/org/projectnessie/events/quarkus/TestQuarkusEventsWithExtensionsDisabled.java

@@ -17,9 +17,9 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.projectnessie.events.quarkus.assertions.EventAssertions;

events/quarkus/src/test/java/org/projectnessie/events/quarkus/TestQuarkusEventsWithMetrics.java

@@ -17,9 +17,9 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.projectnessie.events.quarkus.assertions.EventAssertions;

events/quarkus/src/test/java/org/projectnessie/events/quarkus/TestQuarkusEventsWithTracing.java

@@ -17,9 +17,9 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.projectnessie.events.quarkus.assertions.EventAssertions;

events/quarkus/src/test/java/org/projectnessie/events/quarkus/TestQuarkusEventsWithTracingAndMetrics.java

@@ -17,9 +17,9 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.projectnessie.events.quarkus.assertions.EventAssertions;

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

@@ -23,9 +23,9 @@
 import static org.projectnessie.events.api.EventType.MERGE;
 import static org.projectnessie.events.api.EventType.TRANSPLANT;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.time.Duration;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.events.api.Event;
 import org.projectnessie.events.api.EventType;
 import org.projectnessie.events.quarkus.fixtures.MockEventSubscriber;

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

@@ -43,11 +43,11 @@
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.Collection;
 import java.util.List;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.events.api.EventType;
 import org.projectnessie.events.quarkus.delivery.MetricsEventDelivery.DeliveryStatus;
 

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

@@ -43,13 +43,13 @@
 import io.opentelemetry.sdk.trace.data.EventData;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.StatusData;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.assertj.core.api.AbstractListAssert;
 import org.assertj.core.api.ListAssert;
 import org.assertj.core.api.ObjectAssert;

events/quarkus/src/test/java/org/projectnessie/events/quarkus/fixtures/MockEventSubscribers.java

@@ -16,8 +16,8 @@
 package org.projectnessie.events.quarkus.fixtures;
 
 import io.quarkus.test.Mock;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 import org.projectnessie.events.quarkus.QuarkusEventSubscribers;
 
 @Mock

events/quarkus/src/test/java/org/projectnessie/events/quarkus/fixtures/MockPrincipalSupplier.java

@@ -16,9 +16,9 @@
 package org.projectnessie.events.quarkus.fixtures;
 
 import io.quarkus.test.Mock;
+import jakarta.inject.Singleton;
 import java.security.Principal;
 import java.util.function.Supplier;
-import javax.inject.Singleton;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 @Mock

events/quarkus/src/test/java/org/projectnessie/events/quarkus/fixtures/MockRepositoryIdProducer.java

@@ -16,9 +16,9 @@
 package org.projectnessie.events.quarkus.fixtures;
 
 import io.quarkus.test.Mock;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import org.projectnessie.events.quarkus.collector.QuarkusResultCollectorFactory;
 
 @Mock

events/quarkus/src/test/java/org/projectnessie/events/quarkus/fixtures/MockSpanExporter.java

@@ -20,15 +20,15 @@
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.quarkus.arc.properties.IfBuildProperty;
 import io.quarkus.test.Mock;
+import jakarta.annotation.Nullable;
+import jakarta.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.inject.Singleton;
 
 @Mock
 @Singleton
-@IfBuildProperty(name = "quarkus.opentelemetry.enabled", stringValue = "true")
+@IfBuildProperty(name = "quarkus.otel.traces.sampler", stringValue = "always_on")
 public class MockSpanExporter implements SpanExporter {
 
   private List<SpanData> spans = new ArrayList<>();

events/quarkus/src/test/java/org/projectnessie/events/quarkus/scenarios/EventScenarios.java

@@ -15,12 +15,12 @@
  */
 package org.projectnessie.events.quarkus.scenarios;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.model.ContentKey;
 import org.projectnessie.model.IcebergTable;
 import org.projectnessie.versioned.BranchName;

events/quarkus/src/test/resources/application.properties

@@ -15,7 +15,7 @@
 #
 
 # Useful when debugging
-#quarkus.opentelemetry.tracer.exporter.otlp.endpoint=http://localhost:4317
+#quarkus.otel.exporter.otlp.endpoint=http://localhost:4317
 #quarkus.vertx.max-event-loop-execute-time=PT1M
 #quarkus.log.category."org.projectnessie.events".level=DEBUG
 #quarkus.log.category."org.projectnessie.events".min-level=DEBUG

gradle/libs.versions.toml

@@ -25,7 +25,7 @@ opentelemetryAlpha = "1.25.0-alpha"
 opentracing = "0.33.0"
 picocli = "4.7.4"
 protobuf = "3.23.4"
-quarkus = "2.16.8.Final"
+quarkus = "3.2.0.Final"
 slf4j = "1.7.36"
 testcontainers = "1.18.3"
 undertow = "2.2.24.Final"

helm/nessie/templates/deployment.yaml

@@ -161,25 +161,23 @@ spec:
             {{- end }}
 
             {{- if .Values.tracing.enabled }}
-            - name: QUARKUS_OPENTELEMETRY_TRACER_ENABLED
-              value: "true"
-            - name: QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT
+            - name: QUARKUS_OTEL_EXPORTER_OTLP_ENDPOINT
               value: {{ .Values.tracing.endpoint | quote }}
             {{- if .Values.tracing.attributes }}
-            - name: QUARKUS_OPENTELEMETRY_TRACER_RESOURCE_ATTRIBUTES
+            - name: QUARKUS_OTEL_TRACER_RESOURCE_ATTRIBUTES
               value: "{{- include "nessie.dictToString" .Values.tracing.attributes }}"
             {{- end }}
             {{- if .Values.tracing.sample }}
             {{ if eq .Values.tracing.sample "all" }}
-            - name: QUARKUS_OPENTELEMETRY_TRACER_SAMPLER
-              value: "on"
+            - name: QUARKUS_OTEL_TRACER_SAMPLER
+              value: "parentbased_always_on"
             {{- else if eq .Values.tracing.sample "none" }}
-            - name: QUARKUS_OPENTELEMETRY_TRACER_SAMPLER
-              value: "off"
+            - name: QUARKUS_OTEL_TRACER_SAMPLER
+              value: "always_off"
             {{- else }}
-            - name: QUARKUS_OPENTELEMETRY_TRACER_SAMPLER
-              value: "ratio"
-            - name: QUARKUS_OPENTELEMETRY_TRACER_SAMPLER_RATIO
+            - name: QUARKUS_OTEL_TRACER_SAMPLER
+              value: "parentbased_traceidratio"
+            - name: QUARKUS_OTEL_TRACER_SAMPLER_ARG
               value: {{ .Values.tracing.sample | quote }}
             {{- end }}
             {{- end }}

helm/nessie/values.yaml

@@ -134,8 +134,8 @@ tracing:
   # See https://quarkus.io/guides/opentelemetry for more information.
   endpoint: "http://otlp-collector:4317"
   # -- Which requests should be sampled. Valid values are: "all", "none", or a ratio between 0.0 and
-  # 1.0 (inclusive). E.g. 0.5 means that 50% of the requests will be sampled.
-  sample: all
+  # "1.0d" (inclusive). E.g. "0.5d" means that 50% of the requests will be sampled.
+  sample: "1.0d"
   # -- Resource attributes to identify the nessie service among other tracing sources.
   # See https://opentelemetry.io/docs/reference/specification/resource/semantic_conventions/#service.
   # If left empty, traces will be attached to a service named "Nessie"; to change this, provide a service.name attribute here.

servers/quarkus-cli/build.gradle.kts

@@ -103,12 +103,6 @@ val packageType = quarkusPackageType()
 
 quarkus { quarkusBuildProperties.put("quarkus.package.type", packageType) }
 
-tasks.withType<QuarkusBuild>().configureEach {
-  outputs.doNotCacheIf("Do not add huge cache artifacts to build cache") { true }
-  inputs.property("final.name", quarkus.finalName())
-  inputs.properties(quarkus.quarkusBuildProperties.get())
-}
-
 if (quarkusFatJar()) {
   afterEvaluate {
     publishing {

servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/BaseCommand.java

@@ -18,10 +18,10 @@
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.INMEMORY;
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.IN_MEMORY;
 
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import java.util.concurrent.Callable;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
 import org.projectnessie.quarkus.config.VersionStoreConfig;
 import org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType;
 import org.projectnessie.services.config.ServerConfig;