Clean up metrics

Author: kjetilh33

Diff for: 01-k8-demo/src/main/java/com/cognite/examples/Demo.java

@@ -41,8 +41,6 @@ Configuration section. The configuration values are read from the following loca
     static final CollectorRegistry collectorRegistry = new CollectorRegistry();
     static final Gauge jobDurationSeconds = Gauge.build()
             .name("job_duration_seconds").help("Job duration in seconds").register(collectorRegistry);
-    static final Gauge jobStartTimeStamp = Gauge.build()
-            .name("job_start_timestamp").help("Job start time stamp").register(collectorRegistry);
     static final Gauge errorGauge = Gauge.build()
             .name("job_errors").help("Total job errors").register(collectorRegistry);
 
@@ -75,7 +73,6 @@ public static void main(String[] args) {
     private static void run() throws Exception {
         LOG.info("Starting container...");
         Gauge.Timer jobDurationTimer = jobDurationSeconds.startTimer();
-        jobStartTimeStamp.setToCurrentTime();
 
         LOG.info("Starting some work...");
         Thread.sleep(3000);

Diff for: 02-raw-to-clean-batch-job/src/main/java/com/cognite/examples/RawToClean.java

@@ -77,8 +77,6 @@ public class RawToClean {
     private static final CollectorRegistry collectorRegistry = new CollectorRegistry();
     private static final Gauge jobDurationSeconds = Gauge.build()
             .name("job_duration_seconds").help("Job duration in seconds").register(collectorRegistry);
-    private static final Gauge jobStartTimeStamp = Gauge.build()
-            .name("job_start_timestamp").help("Job start timestamp").register(collectorRegistry);
     private static final Gauge errorGauge = Gauge.build()
             .name("job_errors").help("Total job errors").register(collectorRegistry);
     private static final Gauge noElementsGauge = Gauge.build()
@@ -128,12 +126,10 @@ public static void main(String[] args) {
     The main logic to execute.
      */
     private static void run() throws Exception {
-        Instant startInstant = Instant.now();
         LOG.info("Starting raw to clean pipeline...");
 
-        // Prepare the job start metrics
+        // Prepare the job duration metrics
         Gauge.Timer jobDurationTimer = jobDurationSeconds.startTimer();
-        jobStartTimeStamp.setToCurrentTime();
 
         // Set up the reader for the raw table
         LOG.info("Starting to read the raw table {}.{}.",
@@ -158,10 +154,11 @@ private static void run() throws Exception {
             noElementsGauge.inc(events.size());
         }
 
+        jobDurationTimer.setDuration();
         LOG.info("Finished processing {} rows from raw. Duration {}",
                 noElementsGauge.get(),
-                Duration.between(startInstant, Instant.now()));
-        jobDurationTimer.setDuration();
+                Duration.ofSeconds((long) jobDurationSeconds.get()));
+
 
         // The job completion metric is only added to the registry after job success,
         // so that a previous success in the Pushgateway isn't overwritten on failure.

Diff for: 21-met-metalerts-rss-extractor/src/main/java/com/cognite/met/AlertsRssExtractor.java

@@ -70,8 +70,6 @@ public class AlertsRssExtractor {
     private static final CollectorRegistry collectorRegistry = new CollectorRegistry();
     private static final Gauge jobDurationSeconds = Gauge.build()
             .name("job_duration_seconds").help("Job duration in seconds").register(collectorRegistry);
-    private static final Gauge jobStartTimeStamp = Gauge.build()
-            .name("job_start_timestamp").help("Job start timestamp").register(collectorRegistry);
     private static final Gauge errorGauge = Gauge.build()
             .name("job_errors").help("Total job errors").register(collectorRegistry);
     private static final Gauge noElementsGauge = Gauge.build()
@@ -116,12 +114,10 @@ public static void main(String[] args) {
     The main logic to execute.
      */
     private static void run() throws Exception {
-        Instant startInstant = Instant.now();
         LOG.info("Starting Met Alerts RSS extractor...");
 
-        // Prepare the job start metrics
+        // Prepare the job duration metrics
         Gauge.Timer jobDurationTimer = jobDurationSeconds.startTimer();
-        jobStartTimeStamp.setToCurrentTime();
 
         LOG.info("Sending request to source uri: {}", sourceUri);
 
@@ -143,10 +139,11 @@ private static void run() throws Exception {
         getCogniteClient().raw().rows().upsert(rawRows);
         noElementsGauge.inc(rawRows.size());
 
+        // All done
+        jobDurationTimer.setDuration();
         LOG.info("Finished processing {} rss items. Duration {}",
                 noElementsGauge.get(),
-                Duration.between(startInstant, Instant.now()));
-        jobDurationTimer.setDuration();
+                Duration.ofSeconds((long) jobDurationSeconds.get()));
 
         // The job completion metric is only added to the registry after job success,
         // so that a previous success in the Pushgateway isn't overwritten on failure.
@@ -158,7 +155,7 @@ private static void run() throws Exception {
     /*
     Parse the RSS item to a raw row.
      */
-    private static RawRow parseRawRow(Item rssItem) throws Exception {
+    private static RawRow parseRawRow(Item rssItem) {
         final String loggingPrefix = "parseRawRow() - ";
 
         final String titleKey = "title";

Diff for: 22-met-alerts-cap-extractor/src/main/java/com/cognite/met/AlertsCapExtractor.java

@@ -150,10 +150,9 @@ public static void main(String[] args) {
     The main logic to execute.
      */
     private static void run() throws Exception {
-        Instant startInstant = Instant.now();
         LOG.info("Starting Met Alerts CAP extractor...");
 
-        // Prepare the job start metrics
+        // Prepare the job duration metrics
         Gauge.Timer jobDurationTimer = jobDurationSeconds.startTimer();
         jobStartTimeStamp.setToCurrentTime();
 
@@ -223,10 +222,11 @@ private static void run() throws Exception {
         // Stop the state store. This will also store the final state
         getStateStore().ifPresent(stateStore -> stateStore.stop());
 
+        // All done
+        jobDurationTimer.setDuration();
         LOG.info("Finished processing {} cap items. Duration {}",
                 noElementsGauge.get(),
-                Duration.between(startInstant, Instant.now()));
-        jobDurationTimer.setDuration();
+                Duration.ofSeconds((long) jobDurationSeconds.get()));
 
         // The job completion metric is only added to the registry after job success,
         // so that a previous success in the Pushgateway isn't overwritten on failure.