Skip to content

Bugfix: send instance label as part of group #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Bugfix: send instance label as part of group #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/ProgressTracker.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 13 additions & 3 deletions t/progress_tracker.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading