Merge pull request #5 from hathitrust/instance-part-of-group

aelkiss · web-flow · commit 342400afef98 · 2025-01-17T12:53:39.000-05:00
Bugfix: send instance label as part of group
diff --git a/lib/ProgressTracker.pm b/lib/ProgressTracker.pm
@@ -24,7 +24,7 @@ sub new {
   $self->warn_not_reporting if !$self->{pushgateway};
 
   my $instance =  $params{instance} || $ENV{'JOB_NAMESPACE'};
-  $self->{labels}{instance} = $instance if $instance;
+  $self->{instance} = $instance if $instance;
 
   my $app =  $params{app} || $ENV{'JOB_APP'};
   $self->{labels}{app} = $app if $app;
@@ -118,7 +118,10 @@ sub push_metrics {
   }
 
   my $job = $self->{job};
+  my $instance = $self->{instance};
   my $url = $self->{pushgateway} . "/metrics/job/$job";
+  $url .= "/instance/$instance" if $instance;
+
   my $data = $self->{prom}->render;
 
   $self->{ua}->post($url, Content => $data);
diff --git a/t/progress_tracker.t b/t/progress_tracker.t
@@ -81,24 +81,34 @@ describe "ProgressTracker" => sub {
       my $tracker = ProgressTracker->new();
       $tracker->update_metrics;
 
-      ok(metrics =~ /^job_duration_seconds.*instance=""/m);
+      ok(metrics =~ /^job_duration_seconds\{instance="",job="progress_tracker.t"\}/m);
     };
 
     it "uses instance param if given" => sub {
       $ENV{JOB_NAMESPACE} = 'some-namespace';
       my $tracker = ProgressTracker->new(instance=>'override-instance');
       $tracker->update_metrics;
 
-      ok(metrics =~ /^job_duration_seconds\S*instance="override-instance"/m);
+      ok(metrics =~ /^job_duration_seconds\{instance="override-instance",job="progress_tracker.t"\}/m);
     };
 
     it "uses JOB_NAMESPACE env var as instance if given" => sub {
       $ENV{JOB_NAMESPACE} = 'some-namespace';
       my $tracker = ProgressTracker->new();
       $tracker->update_metrics;
 
-      ok(metrics =~ /^job_duration_seconds\S*instance="some-namespace"/m);
+      ok(metrics =~ /^job_duration_seconds\{instance="some-namespace",job="progress_tracker.t"\}/m);
     };
+
+    it "pushes in such a way that doesn't wipe other instances" => sub {
+      my $tracker1 = ProgressTracker->new(instance => "instance1");
+      $tracker1->update_metrics;
+      my $tracker2 = ProgressTracker->new(instance => "instance2");
+      $tracker2->update_metrics;
+
+      ok(metrics =~ /^job_duration_seconds\{instance="instance1",job="progress_tracker.t"\}/m);
+      ok(metrics =~ /^job_duration_seconds\{instance="instance2",job="progress_tracker.t"\}/m);
+    }
   };
 
   describe "app label" => sub {
