Merge pull request #258 from SolaceProducts/moodiRealist/DATAGO-100834-proxymetric

DATAGO-100834: webProxyEnabled tag for EMA metrics

Author: moodiRealist

service/application/src/main/java/com/solace/maas/ep/event/management/agent/config/MetricsConfig.java

@@ -0,0 +1,31 @@
+package com.solace.maas.ep.event.management.agent.config;
+
+import com.solace.maas.ep.event.management.agent.plugin.jacoco.ExcludeFromJacocoGeneratedReport;
+import io.micrometer.core.instrument.MeterRegistry;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Slf4j
+@ExcludeFromJacocoGeneratedReport
+@Configuration
+@Profile("!TEST")
+@ConditionalOnProperty(name = "event-portal.gateway.messaging.standalone", havingValue = "false")
+public class MetricsConfig {
+
+    private final SolaceConfiguration solaceConfiguration;
+
+    @Autowired
+    public MetricsConfig(SolaceConfiguration solaceConfiguration) {
+        this.solaceConfiguration = solaceConfiguration;
+    }
+
+    @Bean
+    public MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("ema_web_proxy_enabled", String.valueOf(solaceConfiguration.isProxyEnabled()));
+    }
+}

service/application/src/main/java/com/solace/maas/ep/event/management/agent/config/SolaceConfiguration.java

@@ -73,7 +73,7 @@ public MessagingService messagingService() {
         String clientName = vmrConfiguration.getProperty(SolaceProperties.ClientProperties.NAME);
         String message = isProxyEnabled() ?
                 "Connecting to event portal using EMA client {} via web proxy." :
-                "Connecting to event portal using EMA client {} without proxy.";
+                "Connecting to event portal using EMA client {} without web proxy.";
         log.info(message, clientName);
         return MessagingService.builder(ConfigurationProfile.V1)
                 .fromProperties(vmrConfiguration)
@@ -123,13 +123,12 @@ public SolacePublisher solacePublisher() {
                 directMessagePublisher());
     }
 
-    private boolean isProxyEnabled() {
+    public boolean isProxyEnabled() {
         MessagingServiceConnectionProperties gatewayConnection = eventPortalProperties.getGateway().getMessaging().getConnections().stream()
                 .filter(c -> "eventPortalGateway".equals(c.getName()))
                 .findFirst()
                 .orElseThrow(() -> new NoSuchElementException("Event Portal gateway connection properties not found."));
 
         return (Boolean.TRUE.equals(gatewayConnection.getProxyEnabled()));
     }
-
 }

service/application/src/main/java/com/solace/maas/ep/event/management/agent/publisher/HeartbeatGenerator.java

@@ -7,6 +7,7 @@
 import com.solace.maas.ep.event.management.agent.plugin.publisher.SolacePublisher;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.info.BuildProperties;
@@ -17,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import static com.solace.maas.ep.common.metrics.ObservabilityConstants.MAAS_EMA_HEARTBEAT_EVENT_SENT;
 import static com.solace.maas.ep.common.metrics.ObservabilityConstants.ORG_ID_TAG;
@@ -59,6 +61,11 @@ private void logHealthMetric(HeartbeatMessage message, boolean isHealthy) {
         List<Tag> tags = new ArrayList<>();
         if (Objects.nonNull(message.getOrgId())) {
             tags.add(Tag.of(ORG_ID_TAG, message.getOrgId()));
+            tags.add(Tag.of("datacenter_id", Optional.ofNullable(meterRegistry.find("jvm.threads.live").meter())
+                    .map(meter -> meter.getId().getTag("maas_datacenter_id"))
+                    .orElse("Unknown")));
+            tags.add(Tag.of("public_cema",  StringUtils.equals(eventPortalProperties.getOrganizationId(), "*") ? "true" : "false"));
+            tags.add(Tag.of("cema_id",  eventPortalProperties.getRuntimeAgentId()));
         }
         meterRegistry.gauge(MAAS_EMA_HEARTBEAT_EVENT_SENT, tags, isHealthy ? 1 : 0);
     }