Skip to content

Commit 6288ac7

Browse files
authored
Merge pull request quarkusio#47272 from ozangunalp/devservices_labels
Modify dev service labels for keycloak and observability lgtm
2 parents e324c58 + ab3caa1 commit 6288ac7

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

extensions/devservices/keycloak/src/main/java/io/quarkus/devservices/keycloak/KeycloakDevServicesConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public interface KeycloakDevServicesConfig {
7575
*
7676
* Applicable only in dev mode.
7777
*/
78-
@WithDefault("quarkus")
78+
@WithDefault("keycloak")
7979
String serviceName();
8080

8181
/**

extensions/observability-devservices/common/src/main/java/io/quarkus/observability/common/config/LgtmConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ public interface LgtmConfig extends GrafanaConfig {
2929
@WithDefault("quarkus-dev-service-lgtm")
3030
String label();
3131

32+
/**
33+
* The value of the {@code quarkus-dev-service} label attached to the started container.
34+
* This property is used when {@code shared} is set to {@code true}.
35+
*/
36+
@WithDefault("lgtm")
37+
String serviceName();
38+
3239
// this is duplicated for a reason - not all collectors speak grpc,
3340
// which is the default in OTEL exporter,
3441
// where we want http as a default with LGTM

extensions/observability-devservices/deployment/src/main/java/io/quarkus/observability/deployment/ObservabilityDevServiceProcessor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ public DevServicesResultBuildItem.RunningDevService get() {
263263
null, config);
264264
})
265265
.or(() -> ComposeLocator.locateContainer(composeProjectBuildItem,
266-
List.of(capturedDevServicesConfiguration.imageName()), LaunchMode.current())
266+
List.of(capturedDevServicesConfiguration.imageName(), capturedDevServicesConfiguration.serviceName()),
267+
LaunchMode.current())
267268
.stream().findFirst()
268269
.map(r -> {
269270
Map<String, String> cfg = new LinkedHashMap<>();
@@ -272,6 +273,7 @@ public DevServicesResultBuildItem.RunningDevService get() {
272273
DockerClientFactory.instance().dockerHostIpAddress(),
273274
port.publicPort()));
274275
}
276+
log.infof("Compose Dev Service %s started, config: %s", devId, cfg);
275277
return new DevServicesResultBuildItem.RunningDevService(Feature.OBSERVABILITY.getName(),
276278
r.containerInfo().id(), null, cfg);
277279
}))

extensions/observability-devservices/testcontainers/src/main/java/io/quarkus/observability/testcontainers/ObservabilityContainer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.quarkus.observability.testcontainers;
22

3+
import static io.quarkus.devservices.common.Labels.QUARKUS_DEV_SERVICE;
4+
35
import java.io.IOException;
46
import java.io.InputStream;
57
import java.io.UncheckedIOException;
@@ -29,6 +31,7 @@ public ObservabilityContainer(C config) {
2931
super(DockerImageName.parse(config.imageName()));
3032
withLogConsumer(frameConsumer());
3133
withLabel(config.label(), config.serviceName());
34+
withLabel(QUARKUS_DEV_SERVICE, config.serviceName());
3235
Optional<Set<String>> aliases = config.networkAliases();
3336
aliases.map(s -> s.toArray(new String[0])).ifPresent(this::withNetworkAliases);
3437
if (config.shared()) {

0 commit comments

Comments
 (0)