Merge pull request #1 from OndroMih/ondromih-mp-health-app-context

MP Health: Add context name to response

Author: Thihup

appserver/microprofile/health/src/main/java/org/glassfish/microprofile/health/GlassFishHealthCheckResponse.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+package org.glassfish.microprofile.health;
+
+
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.eclipse.microprofile.health.HealthCheckResponse;
+
+/**
+ *
+ * @author Ondro Mihalyi
+ */
+public class GlassFishHealthCheckResponse extends HealthCheckResponse {
+
+    private Map<String, Object> data;
+
+    public GlassFishHealthCheckResponse(String name, Status status, Optional<Map<String, Object>> data) {
+        super(name, status, null);
+        this.data = data.orElse(null);
+    }
+
+    public GlassFishHealthCheckResponse() {
+        this(null, null, null);
+    }
+
+    public GlassFishHealthCheckResponse addData(String key, Object value) {
+        if (data == null) {
+            data = new HashMap<>();
+        }
+        data.put(key, value);
+        return this;
+    }
+
+    @Override
+    public Optional<Map<String, Object>> getData() {
+        return Optional.ofNullable(data);
+    }
+
+
+
+}

appserver/microprofile/health/src/main/java/org/glassfish/microprofile/health/GlassFishHealthCheckResponseBuilder.java

@@ -70,6 +70,6 @@ public HealthCheckResponseBuilder status(boolean up) {
 
     @Override
     public HealthCheckResponse build() {
-        return new HealthCheckResponse(name, status, data.isEmpty() ? null : Optional.of(data));
+        return new GlassFishHealthCheckResponse(name, status, data.isEmpty() ? Optional.empty() : Optional.of(data));
     }
 }

appserver/microprofile/health/src/main/java/org/glassfish/microprofile/health/HealthReporter.java

@@ -17,7 +17,6 @@
 
 import jakarta.inject.Singleton;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -35,6 +34,8 @@ public class HealthReporter {
 
     private static final String MP_DEFAULT_STARTUP_EMPTY_RESPONSE = "mp.health.default.startup.empty.response";
     private static final String MP_DEFAULT_READINESS_EMPTY_RESPONSE = "mp.health.default.readiness.empty.response";
+    private static final String CONTEXT_KEY = "context";
+
     private static final Logger LOGGER = Logger.getLogger(HealthReporter.class.getName());
 
     private final Map<String, List<HealthCheckInfo>> applicationHealthChecks = new ConcurrentHashMap<>();
@@ -52,6 +53,13 @@ private static HealthCheckResponse callHealthCheck(HealthCheck healthCheck) {
         }
     }
 
+    private static HealthCheckResponse addContextToResponse(HealthCheckResponse response, String contextName) {
+        if (response instanceof GlassFishHealthCheckResponse gfResponse) {
+            return gfResponse.addData(CONTEXT_KEY, contextName);
+        } else {
+            return response;
+        }
+    }
     private static HealthCheckResponse buildHealthCheckResponse(String name, Exception e) {
         return HealthCheckResponse.builder()
                 .down()
@@ -62,15 +70,18 @@ private static HealthCheckResponse buildHealthCheckResponse(String name, Excepti
 
     public enum ReportKind {
         /**
-         * Return only health checks of kind {@link org.eclipse.microprofile.health.Liveness}
+         * Return only health checks of kind
+         * {@link org.eclipse.microprofile.health.Liveness}
          */
         LIVE,
         /**
-         * Return only health checks of kind {@link org.eclipse.microprofile.health.Readiness}
+         * Return only health checks of kind
+         * {@link org.eclipse.microprofile.health.Readiness}
          */
         READY,
         /**
-         * Return only health checks of kind {@link org.eclipse.microprofile.health.Startup}
+         * Return only health checks of kind
+         * {@link org.eclipse.microprofile.health.Startup}
          */
         STARTED,
         /**
@@ -80,34 +91,45 @@ public enum ReportKind {
 
         private HealthCheckResponse.Status getEmptyResponse() {
             return switch (this) {
-                case LIVE -> getValue(MP_DEFAULT_STARTUP_EMPTY_RESPONSE)
-                        .orElse(HealthCheckResponse.Status.UP);
-                case READY -> getValue(MP_DEFAULT_READINESS_EMPTY_RESPONSE)
-                        .orElse(HealthCheckResponse.Status.UP);
-                case STARTED, ALL -> HealthCheckResponse.Status.UP;
+                case LIVE ->
+                    getValue(MP_DEFAULT_STARTUP_EMPTY_RESPONSE)
+                    .orElse(HealthCheckResponse.Status.UP);
+                case READY ->
+                    getValue(MP_DEFAULT_READINESS_EMPTY_RESPONSE)
+                    .orElse(HealthCheckResponse.Status.UP);
+                case STARTED, ALL ->
+                    HealthCheckResponse.Status.UP;
             };
         }
 
         public boolean filter(HealthCheckInfo healthCheck) {
             return switch (this) {
-                case LIVE -> healthCheck.kind().contains(HealthCheckInfo.Kind.LIVE);
-                case READY -> healthCheck.kind().contains(HealthCheckInfo.Kind.READY);
-                case STARTED -> healthCheck.kind().contains(HealthCheckInfo.Kind.STARTUP);
-                case ALL -> true;
+                case LIVE ->
+                    healthCheck.kind().contains(HealthCheckInfo.Kind.LIVE);
+                case READY ->
+                    healthCheck.kind().contains(HealthCheckInfo.Kind.READY);
+                case STARTED ->
+                    healthCheck.kind().contains(HealthCheckInfo.Kind.STARTUP);
+                case ALL ->
+                    true;
             };
         }
     }
 
     public HealthReport getReport(ReportKind reportKind) {
         HealthCheckResponse.Status emptyResponse = reportKind.getEmptyResponse();
 
-        List<HealthCheckResponse> healthCheckResults = applicationHealthChecks.values()
+        List<HealthCheckResponse> healthCheckResults = applicationHealthChecks.entrySet()
                 .stream()
-                .flatMap(Collection::stream)
-                .filter(reportKind::filter)
-                .map(HealthCheckInfo::healthCheck)
-                .map(HealthReporter::callHealthCheck)
-                .toList();
+                .flatMap(entry -> {
+                    String contextName = entry.getKey();
+                    return entry.getValue()
+                            .stream()
+                            .filter(reportKind::filter)
+                            .map(HealthCheckInfo::healthCheck)
+                            .map(HealthReporter::callHealthCheck)
+                            .map(response -> addContextToResponse(response, entry.getKey()));
+                }).toList();
 
         HealthCheckResponse.Status overallStatus;
         if (healthCheckResults.isEmpty()) {