Merge pull request #18882 from gsmet/2.0.3-backports-4

gsmet · web-flow · commit 41ab2e526336 · 2021-07-21T12:54:35.000+02:00
2.0.3 backports 4
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -152,7 +152,7 @@
         <azure-functions-java-library.version>1.4.2</azure-functions-java-library.version>
         <kotlin.version>1.4.32</kotlin.version>
         <kotlin.coroutine.version>1.4.3</kotlin.coroutine.version>
-        <dekorate.version>2.2.2</dekorate.version>
+        <dekorate.version>2.3.0</dekorate.version>
         <maven-artifact-transfer.version>0.10.0</maven-artifact-transfer.version>
         <maven-invoker.version>3.0.1</maven-invoker.version>
         <awaitility.version>4.1.0</awaitility.version>
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
@@ -324,6 +324,23 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
                                 for (TestRunListener listener : listeners) {
                                     listener.testComplete(result);
                                 }
+                            } else if (testExecutionResult.getStatus() == TestExecutionResult.Status.FAILED) {
+                                //if a parent fails we fail the children
+                                Set<TestIdentifier> children = testPlan.getChildren(testIdentifier);
+                                for (TestIdentifier child : children) {
+                                    UniqueId childId = UniqueId.parse(child.getUniqueId());
+                                    result = new TestResult(child.getDisplayName(), testClass.getName(),
+                                            childId,
+                                            testExecutionResult,
+                                            logHandler.captureOutput(), child.isTest(), runId);
+                                    results.put(childId, result);
+                                    if (child.isTest()) {
+                                        for (TestRunListener listener : listeners) {
+                                            listener.testStarted(child, testClass.getName());
+                                            listener.testComplete(result);
+                                        }
+                                    }
+                                }
                             }
                         }
                         if (testExecutionResult.getStatus() == TestExecutionResult.Status.FAILED) {
diff --git a/extensions/opentelemetry/opentelemetry/deployment/pom.xml b/extensions/opentelemetry/opentelemetry/deployment/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -64,6 +69,12 @@
             <artifactId>quarkus-vertx-http-deployment</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-deployment</artifactId>
diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/OpenTelemetryProcessor.java b/extensions/opentelemetry/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/OpenTelemetryProcessor.java
@@ -62,7 +62,7 @@ void createOpenTelemetry(OpenTelemetryConfig openTelemetryConfig,
             OpenTelemetryRecorder recorder,
             Optional<TracerProviderBuildItem> tracerProviderBuildItem,
             LaunchModeBuildItem launchMode) {
-        if (launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT) {
+        if (launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT || launchMode.getLaunchMode() == LaunchMode.TEST) {
             recorder.resetGlobalOpenTelemetryForDevMode();
         }
 
diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.opentelemetry.deployment;
+
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
+import io.restassured.RestAssured;
+
+public class OpenTelemetryDevModeTest {
+    @RegisterExtension
+    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(TestSpanExporter.class)
+                    .addClass(TracerRouter.class)
+                    .add(new StringAsset(ContinuousTestingTestUtils.appProperties("")), "application.properties"));
+
+    @Test
+    void testDevMode() {
+        RestAssured.when().get("/tracer").then()
+                .statusCode(200)
+                .body(is("Hello Tracer!"));
+
+        TEST.modifySourceFile(TracerRouter.class, s -> s.replace("Hello", "Goodbye"));
+
+        RestAssured.when().get("/tracer").then()
+                .statusCode(200)
+                .body(is("Goodbye Tracer!"));
+    }
+}
diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TestSpanExporter.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TestSpanExporter.java
@@ -10,7 +10,9 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
+import io.quarkus.arc.Unremovable;
 
+@Unremovable
 @ApplicationScoped
 public class TestSpanExporter implements SpanExporter {
     private final List<SpanData> finishedSpanItems = new ArrayList<>();
diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerRouterUT.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerRouterUT.java
@@ -0,0 +1,22 @@
+package io.quarkus.opentelemetry.deployment;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+/**
+ * Test for continuos testing with OpenTelemetry
+ */
+@QuarkusTest
+public class TracerRouterUT {
+
+    @Test
+    public void testTracer() {
+        RestAssured.when().get("/tracer").then()
+                .statusCode(200)
+                .body(is("Hello Tracer!"));
+    }
+}
diff --git a/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java b/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java
@@ -19,6 +19,7 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ExecutorBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.util.ServiceUtil;
 import io.quarkus.smallrye.context.runtime.SmallRyeContextPropagationProvider;
 import io.quarkus.smallrye.context.runtime.SmallRyeContextPropagationRecorder;
@@ -67,11 +68,12 @@ void buildStatic(SmallRyeContextPropagationRecorder recorder)
     @Record(ExecutionTime.RUNTIME_INIT)
     void build(SmallRyeContextPropagationRecorder recorder,
             ExecutorBuildItem executorBuildItem,
+            ShutdownContextBuildItem shutdownContextBuildItem,
             BuildProducer<FeatureBuildItem> feature,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeans) {
         feature.produce(new FeatureBuildItem(Feature.SMALLRYE_CONTEXT_PROPAGATION));
 
-        recorder.configureRuntime(executorBuildItem.getExecutorProxy());
+        recorder.configureRuntime(executorBuildItem.getExecutorProxy(), shutdownContextBuildItem);
 
         // Synthetic bean for ManagedExecutor
         syntheticBeans.produce(
diff --git a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
@@ -10,6 +10,7 @@
 import org.eclipse.microprofile.context.spi.ThreadContextProvider;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import io.smallrye.context.SmallRyeContextManager;
 import io.smallrye.context.SmallRyeContextManagerProvider;
@@ -40,7 +41,7 @@ public void configureStaticInit(List<ThreadContextProvider> discoveredProviders,
         builder.withContextManagerExtensions(discoveredExtensions.toArray(new ContextManagerExtension[0]));
     }
 
-    public void configureRuntime(ExecutorService executorService) {
+    public void configureRuntime(ExecutorService executorService, ShutdownContext shutdownContext) {
         // associate the static init manager to the runtime CL
         ContextManagerProvider contextManagerProvider = ContextManagerProvider.instance();
         // finish building our manager
@@ -49,6 +50,12 @@ public void configureRuntime(ExecutorService executorService) {
         SmallRyeContextManager contextManager = builder.build();
 
         contextManagerProvider.registerContextManager(contextManager, Thread.currentThread().getContextClassLoader());
+        shutdownContext.addShutdownTask(new Runnable() {
+            @Override
+            public void run() {
+                contextManagerProvider.releaseContextManager(contextManager);
+            }
+        });
     }
 
     public Supplier<Object> initializeManagedExecutor(ExecutorService executorService) {
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java
@@ -1,6 +1,8 @@
 package org.jboss.resteasy.reactive.client.impl;
 
 import io.smallrye.mutiny.Uni;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Supplier;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -16,7 +18,12 @@ public UniInvoker(InvocationBuilderImpl invocationBuilder) {
     @Override
     public <R> Uni<R> method(String name, Entity<?> entity, GenericType<R> responseType) {
         AsyncInvokerImpl invoker = (AsyncInvokerImpl) invocationBuilder.rx();
-        return Uni.createFrom().completionStage(invoker.method(name, entity, responseType));
+        return Uni.createFrom().completionStage(new Supplier<CompletionStage<R>>() {
+            @Override
+            public CompletionStage<R> get() {
+                return invoker.method(name, entity, responseType);
+            }
+        });
     }
 
     @Override
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithPvcVolumesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithPvcVolumesTest.java
@@ -0,0 +1,65 @@
+
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithPvcVolumesTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("kubernetes-with-pvc-volumes")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("kubernetes-with-pvc-volumes.properties")
+            .setLogFileName("k8s.log")
+            .setForcedDependencies(
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-kubernetes", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil.deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("kubernetes-with-pvc-volumes");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getSpec()).satisfies(podSpec -> {
+                        assertThat(podSpec.getVolumes()).isNotEmpty();
+                        assertThat(podSpec.getVolumes()).singleElement().satisfies(volume -> {
+                            assertThat(volume.getName()).isEqualTo("db");
+                            assertThat(volume.getPersistentVolumeClaim()).isNotNull();
+                            assertThat(volume.getPersistentVolumeClaim().getClaimName()).isEqualTo("db-claim");
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-pvc-volumes.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-pvc-volumes.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.pvc-volumes.db.claim-name=db-claim
+quarkus.kubernetes.pvc-volumes.db.readonly=false
diff --git a/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/main/ClientCallingResource.java b/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/main/ClientCallingResource.java
@@ -17,6 +17,7 @@
 
 import io.quarkus.it.rest.client.main.MyResponseExceptionMapper.MyException;
 import io.smallrye.mutiny.Uni;
+import io.vertx.core.Future;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.BodyHandler;
@@ -78,6 +79,16 @@ void init(@Observes Router router) {
                     }, t -> fail(rc, t.getMessage()));
         });
 
+        router.route("/call-client-retry").blockingHandler(rc -> {
+            String url = rc.getBody().toString();
+            AppleClient client = RestClientBuilder.newBuilder().baseUri(URI.create(url + "/does-not-exist"))
+                    .build(AppleClient.class);
+            AtomicInteger count = new AtomicInteger(0);
+            client.uniSwapApple(new Apple("lobo")).onFailure().retry().until(t -> count.incrementAndGet() <= 3)
+                    .subscribe()
+                    .with(m -> success(rc, count.toString()), t -> success(rc, count.toString()));
+        });
+
         router.post("/hello").handler(rc -> rc.response().putHeader("content-type", MediaType.TEXT_PLAIN)
                 .end("Hello, " + (rc.getBodyAsString()).repeat(getCount(rc))));
 
@@ -90,6 +101,10 @@ void init(@Observes Router router) {
         });
     }
 
+    private Future<Void> success(RoutingContext rc, String body) {
+        return rc.response().putHeader("content-type", "text-plain").end(body);
+    }
+
     private int getCount(io.vertx.ext.web.RoutingContext rc) {
         List<String> countQueryParam = rc.queryParam("count");
         if (countQueryParam.isEmpty()) {
diff --git a/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTest.java b/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTest.java
@@ -3,6 +3,7 @@
 import static java.util.stream.Collectors.counting;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
+import static org.hamcrest.Matchers.equalTo;
 
 import java.util.List;
 import java.util.Map;
@@ -47,6 +48,14 @@ void shouldMakeJsonRequest() {
         assertThat(valueByCount).containsOnly(entry("cortland", 3L), entry("lobo", 3L), entry("golden delicious", 3L));
     }
 
+    @Test
+    void shouldRetryOnFailure() {
+        RestAssured.with().body(appleUrl).post("/call-client-retry")
+                .then()
+                .statusCode(200)
+                .body(equalTo("4"));
+    }
+
     @Test
     void shouldMapException() {
         RestAssured.with().body(baseUrl).post("/call-client-with-exception-mapper")

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ void createOpenTelemetry(OpenTelemetryConfig openTelemetryConfig,`
`62`	`62`	`OpenTelemetryRecorder recorder,`
`63`	`63`	`Optional<TracerProviderBuildItem> tracerProviderBuildItem,`
`64`	`64`	`LaunchModeBuildItem launchMode) {`
`65`		`- if (launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT) {`
	`65`	`+ if (launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT \|\| launchMode.getLaunchMode() == LaunchMode.TEST) {`
`66`	`66`	`recorder.resetGlobalOpenTelemetryForDevMode();`
`67`	`67`	`}`
`68`	`68`