add cloudwatch metrics (#34)

Co-authored-by: Szymon Lisiecki <[email protected]>

Author: szlisiecki

pom.xml

@@ -63,6 +63,10 @@
 		      <artifactId>azure-spring-boot-metrics-starter</artifactId>
 		      <version>2.3.5</version>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-cloudwatch2</artifactId>
+		</dependency>
 		<dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-jmx</artifactId>

src/main/java/com/orange/lo/sample/lo2iothub/ConnectorApplication.java

@@ -7,77 +7,58 @@
 
 package com.orange.lo.sample.lo2iothub;
 
-import java.lang.invoke.MethodHandles;
-import java.time.Duration;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
+import com.orange.lo.sample.lo2iothub.utils.MetricsProperties;
+import io.micrometer.cloudwatch2.CloudWatchConfig;
+import io.micrometer.cloudwatch2.CloudWatchMeterRegistry;
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.config.MeterFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
 
-import io.micrometer.core.instrument.Clock;
-import io.micrometer.core.instrument.Counter;
-import io.micrometer.core.instrument.step.StepMeterRegistry;
-import io.micrometer.core.instrument.step.StepRegistryConfig;
+import java.lang.invoke.MethodHandles;
 
 @SpringBootApplication
 public class ConnectorApplication {
 
     private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private final MetricsProperties metricsProperties;
+
+    ConnectorApplication(MetricsProperties metricsProperties) {
+        this.metricsProperties = metricsProperties;
+    }
 
     public static void main(String[] args) {
         SpringApplication.run(ConnectorApplication.class, args);
     }
 
     @Bean
-    public StepRegistryConfig stepRegistryConfig() {
-        return new StepRegistryConfig() {
-
-            @Override
-            public Duration step() {
-                return Duration.ofMinutes(1);
-            }
+    @Qualifier("counters")
+    public MeterRegistry meterRegistry() {
+        CloudWatchMeterRegistry cloudWatchMeterRegistry = new CloudWatchMeterRegistry(cloudWatchConfig(), Clock.SYSTEM, CloudWatchAsyncClient.create());
+        cloudWatchMeterRegistry.config()
+                .meterFilter(MeterFilter.deny(id -> !id.getName().startsWith("message")))
+                .commonTags(metricsProperties.getDimensionName(), metricsProperties.getDimensionValue());
+        return cloudWatchMeterRegistry;
+    }
 
-            @Override
-            public String prefix() {
-                return "";
-            }
+    private CloudWatchConfig cloudWatchConfig() {
+        return new CloudWatchConfig() {
 
             @Override
             public String get(String key) {
                 return null;
             }
-        };
-    }
-
-    @Bean
-    @Qualifier("counters")
-    public StepMeterRegistry stepMeterRegistry() {
-        return new StepMeterRegistry(stepRegistryConfig(), Clock.SYSTEM) {
 
             @Override
-            protected TimeUnit getBaseTimeUnit() {
-                return TimeUnit.MILLISECONDS;
-            }
-
-            @Override
-            protected void publish() {
-                getMeters().stream().filter(m -> m.getId().getName().startsWith("message")).map(m -> get(m.getId().getName()).counter()).forEach(c -> LOG.info(c.getId().getName() + " = " + val(c)));
-            }
-
-            @Override
-            public void start(ThreadFactory threadFactory) {
-                super.start(Executors.defaultThreadFactory());
+            public String namespace() {
+                return metricsProperties.getNamespace();
             }
         };
     }
-
-    private long val(Counter cnt) {
-        return Math.round(cnt.count());
-    }
 }

src/main/java/com/orange/lo/sample/lo2iothub/utils/Counters.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.concurrent.Executors;
 
+import io.micrometer.core.instrument.MeterRegistry;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
@@ -26,13 +27,12 @@ public class Counters {
     private final Counter mesasageSentCounter;
     private final Counter mesasageSentFailedCounter;
 
-    public Counters(@Qualifier("counters") StepMeterRegistry registry) {
-        mesasageReadCounter = registry.counter("message.read");
-        mesasageSentAttemptCounter = registry.counter("message.sent.attempt");
-        mesasageSentAttemptFailedCounter = registry.counter("message.sent.attempt.failed");
-        mesasageSentCounter = registry.counter("message.sent");
-        mesasageSentFailedCounter = registry.counter("message.sent.failed");
-        registry.start(Executors.defaultThreadFactory());
+    public Counters(@Qualifier("counters") MeterRegistry meterRegistry) {
+        mesasageReadCounter = meterRegistry.counter("message.read");
+        mesasageSentAttemptCounter = meterRegistry.counter("message.sent.attempt");
+        mesasageSentAttemptFailedCounter = meterRegistry.counter("message.sent.attempt.failed");
+        mesasageSentCounter = meterRegistry.counter("message.sent");
+        mesasageSentFailedCounter = meterRegistry.counter("message.sent.failed");
     }
 
     public Counter getMesasageReadCounter() {

src/main/java/com/orange/lo/sample/lo2iothub/utils/MetricsProperties.java

@@ -0,0 +1,36 @@
+package com.orange.lo.sample.lo2iothub.utils;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "metrics")
+@Component
+public class MetricsProperties {
+    private String namespace;
+    private String dimensionName;
+    private String dimensionValue;
+
+    public String getNamespace() {
+        return namespace;
+    }
+
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
+
+    public String getDimensionName() {
+        return dimensionName;
+    }
+
+    public void setDimensionName(String dimensionName) {
+        this.dimensionName = dimensionName;
+    }
+
+    public String getDimensionValue() {
+        return dimensionValue;
+    }
+
+    public void setDimensionValue(String dimensionValue) {
+        this.dimensionValue = dimensionValue;
+    }
+}

src/main/resources/application.yml

@@ -47,6 +47,11 @@ tenant-list:
         lo-devices-topic: DEVICES_TOPIC
         lo-devices-group: DEVICES_GROUP
 
+metrics:
+  namespace: CCS
+  dimension-name: connector-id
+  dimension-value:
+
 azure:
   application-insights:
     enabled: true