Use build items to propagate host and port of search backend deverservice to dashboards devservice

Author: Javatar81

extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchDashboardsProcessor.java

@@ -75,6 +75,7 @@ public DevServicesResultBuildItem startElasticsearchDevService(
             Optional<ConsoleInstalledBuildItem> consoleInstalledBuildItem,
             CuratedApplicationShutdownBuildItem closeBuildItem,
             LoggingSetupBuildItem loggingSetupBuildItem,
+            List<DevservicesElasticsearchConnectionBuildItem> elasticsearchConnectionBuildItems,
             DevServicesConfig devServicesConfig,
             List<DevservicesElasticsearchBuildItem> devservicesElasticsearchBuildItems) throws BuildException {
 
@@ -104,7 +105,8 @@ public DevServicesResultBuildItem startElasticsearchDevService(
 
             devDashboardService = startDashboardDevServices(dockerStatusBuildItem, composeProjectBuildItem,
                     configuration.devservices(),
-                    buildItemsConfig, launchMode, useSharedNetwork, devServicesConfig.timeout());
+                    buildItemsConfig, elasticsearchConnectionBuildItems, launchMode, useSharedNetwork,
+                    devServicesConfig.timeout());
             if (devDashboardService == null) {
                 compressor.closeAndDumpCaptured();
             } else {
@@ -147,6 +149,7 @@ private RunningDevService startDashboardDevServices(
             DevServicesComposeProjectBuildItem composeProjectBuildItem,
             ElasticsearchDevServicesBuildTimeConfig config,
             DevservicesElasticsearchBuildItemsConfiguration buildItemConfig,
+            List<DevservicesElasticsearchConnectionBuildItem> elasticsearchConnectionBuildItems,
             LaunchModeBuildItem launchMode, boolean useSharedNetwork, Optional<Duration> timeout) throws BuildException {
         if (!config.enabled().orElse(true)) {
             // explicitly disabled
@@ -177,31 +180,13 @@ private RunningDevService startDashboardDevServices(
                     .collect(Collectors.toSet());
         } else {
             Optional<ContainerAddress> maybeContainerAddressSearchBackend = Optional.empty();
-            log.info("no elasticsearch hosts config property found, waiting for the elasticsearch container to be started");
-            for (int i = 0; i < LOCATE_BACKEND_MAX_RETRIES; i++) {
-                maybeContainerAddressSearchBackend = elasticsearchContainerLocator.locateContainer(
-                        config.serviceName(),
-                        config.shared(),
-                        launchMode.getLaunchMode())
-                        .or(() -> ComposeLocator.locateContainer(composeProjectBuildItem,
-                                List.of(resolvedImageName.getUnversionedPart(), "elasticsearch", "opensearch"),
-                                ELASTICSEARCH_PORT,
-                                launchMode.getLaunchMode(), useSharedNetwork));
-                if (maybeContainerAddressSearchBackend.isPresent()) {
-                    break;
-                }
-                try {
-                    Thread.sleep((long) (LOCATE_BACKEND_INITIAL_WAIT_MILLIS * Math.pow(2, i)));
-                    log.infof("waiting for the elasticsearch container to be started, attempt %d of %d", i + 1,
-                            LOCATE_BACKEND_MAX_RETRIES);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            opensearchHosts = maybeContainerAddressSearchBackend.map(containerAddress -> Set
-                    .of(("http://" + containerAddress.getHost() + ":" + containerAddress.getPort())
-                            .replace("localhost", "host.docker.internal")))
-                    .orElseGet(() -> Set.of());
+            log.info(
+                    "no elasticsearch hosts config property found, using the host of theelasticsearch dev services container to connect");
+
+            opensearchHosts = elasticsearchConnectionBuildItems.stream()
+                    .map(connection -> ("http://" + connection.getHost() + ":" + connection.getPort())
+                            .replace("localhost", "host.docker.internal"))
+                    .collect(Collectors.toSet());
         }
 
         final Optional<ContainerAddress> maybeContainerAddress = dashboardContainerLocator.locateContainer(

extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java

@@ -25,6 +25,7 @@
 import io.quarkus.builder.BuildException;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
 import io.quarkus.deployment.builditem.CuratedApplicationShutdownBuildItem;
@@ -74,6 +75,7 @@ public DevServicesResultBuildItem startElasticsearchDevService(
             CuratedApplicationShutdownBuildItem closeBuildItem,
             LoggingSetupBuildItem loggingSetupBuildItem,
             DevServicesConfig devServicesConfig,
+            BuildProducer<DevservicesElasticsearchConnectionBuildItem> connectionBuildItemProducer,
             List<DevservicesElasticsearchBuildItem> devservicesElasticsearchBuildItems) throws BuildException {
 
         if (devservicesElasticsearchBuildItems.isEmpty()) {
@@ -100,7 +102,8 @@ public DevServicesResultBuildItem startElasticsearchDevService(
             boolean useSharedNetwork = DevServicesSharedNetworkBuildItem.isSharedNetworkRequired(devServicesConfig,
                     devServicesSharedNetworkBuildItem);
             devService = startElasticsearchDevServices(dockerStatusBuildItem, composeProjectBuildItem,
-                    configuration.devservices(), buildItemsConfig, launchMode, useSharedNetwork, devServicesConfig.timeout());
+                    configuration.devservices(), buildItemsConfig, connectionBuildItemProducer, launchMode, useSharedNetwork,
+                    devServicesConfig.timeout());
 
             if (devService == null) {
                 compressor.closeAndDumpCaptured();
@@ -158,6 +161,7 @@ private RunningDevService startElasticsearchDevServices(
             DevServicesComposeProjectBuildItem composeProjectBuildItem,
             ElasticsearchDevServicesBuildTimeConfig config,
             DevservicesElasticsearchBuildItemsConfiguration buildItemConfig,
+            BuildProducer<DevservicesElasticsearchConnectionBuildItem> connectionBuildItemProducer,
             LaunchModeBuildItem launchMode, boolean useSharedNetwork, Optional<Duration> timeout) throws BuildException {
         if (!config.enabled().orElse(true)) {
             // explicitly disabled
@@ -214,6 +218,8 @@ private RunningDevService startElasticsearchDevServices(
 
             var httpHost = createdContainer.hostName + ":"
                     + (useSharedNetwork ? ELASTICSEARCH_PORT : container.getMappedPort(ELASTICSEARCH_PORT));
+            connectionBuildItemProducer.produce(new DevservicesElasticsearchConnectionBuildItem(createdContainer.hostName,
+                    container.getMappedPort(ELASTICSEARCH_PORT)));
             return new RunningDevService(Feature.ELASTICSEARCH_REST_CLIENT_COMMON.getName(),
                     container.getContainerId(),
                     new ContainerShutdownCloseable(container, "Elasticsearch"),

extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevservicesElasticsearchConnectionBuildItem.java

@@ -0,0 +1,21 @@
+package io.quarkus.elasticsearch.restclient.common.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class DevservicesElasticsearchConnectionBuildItem extends MultiBuildItem {
+    private final String host;
+    private final int port;
+
+    public DevservicesElasticsearchConnectionBuildItem(String host, int port) {
+        this.host = host;
+        this.port = port;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+}