From c8afda2ced87d3e8e4c12230150088a7f27840b4 Mon Sep 17 00:00:00 2001
From: Jorn van de Beek <jorn@roqua.nl>
Date: Mon, 17 Jun 2019 14:29:57 +0000
Subject: [PATCH] Use tags to specify task/probe names
---
Gemfile.lock | 2 +-
lib/roqua/probes/base_probe.rb | 2 +-
lib/roqua/scheduling/scheduler.rb | 2 +-
spec/roqua/probes/delayed_job_probe_spec.rb | 2 +-
spec/roqua/probes/monitoring_probe_spec.rb | 2 +-
spec/roqua/scheduling/scheduler_spec.rb | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index f875a33..bb7827c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
PATH
remote: .
specs:
- roqua-support (0.3.0)
+ roqua-support (0.3.1)
active_interaction (~> 3.0)
activesupport (>= 3.2, < 6)
naught (~> 1.0)
diff --git a/lib/roqua/probes/base_probe.rb b/lib/roqua/probes/base_probe.rb
index 84a781a..2d17e57 100644
--- a/lib/roqua/probes/base_probe.rb
+++ b/lib/roqua/probes/base_probe.rb
@@ -17,7 +17,7 @@ module Roqua
# do not override me, implement probes by implementing the #run method
def call
run
- Appsignal.increment_counter("probe.call.completed.#{self.class.name.demodulize.underscore}", 1)
+ Appsignal.increment_counter("probe.call.completed", 1, probe_name: self.class.name.demodulize.underscore)
end
end
end
diff --git a/lib/roqua/scheduling/scheduler.rb b/lib/roqua/scheduling/scheduler.rb
index 5a9ec1d..aa92b65 100644
--- a/lib/roqua/scheduling/scheduler.rb
+++ b/lib/roqua/scheduling/scheduler.rb
@@ -42,7 +42,7 @@ class Roqua::Scheduling::Scheduler
task = schedule.tasks[cron_job.name]
task.run
- Appsignal.increment_counter("scheduler.run_task.completed.#{task.name}", 1)
+ Appsignal.increment_counter("scheduler.run_task.completed", 1, task_name: task.name)
cron_job.update completed_at: Time.now, next_run_at: task.next_run_at
end
end
diff --git a/spec/roqua/probes/delayed_job_probe_spec.rb b/spec/roqua/probes/delayed_job_probe_spec.rb
index f4724b0..38b4352 100644
--- a/spec/roqua/probes/delayed_job_probe_spec.rb
+++ b/spec/roqua/probes/delayed_job_probe_spec.rb
@@ -32,7 +32,7 @@ describe Roqua::Probes::DelayedJobProbe do
end
it 'increments the probe call counter' do
- expect(Appsignal).to receive(:increment_counter).with('probe.call.completed.delayed_job_probe', 1)
+ expect(Appsignal).to receive(:increment_counter).with('probe.call.completed', 1, probe_name: "delayed_job_probe")
probe.call
end
end
diff --git a/spec/roqua/probes/monitoring_probe_spec.rb b/spec/roqua/probes/monitoring_probe_spec.rb
index fafa32f..5dadfb1 100644
--- a/spec/roqua/probes/monitoring_probe_spec.rb
+++ b/spec/roqua/probes/monitoring_probe_spec.rb
@@ -21,7 +21,7 @@ describe Roqua::Probes::MonitoringProbe do
end
it 'increments the probe call counter' do
- expect(Appsignal).to receive(:increment_counter).with('probe.call.completed.monitoring_probe', 1)
+ expect(Appsignal).to receive(:increment_counter).with('probe.call.completed', 1, probe_name: "monitoring_probe")
probe.call
end
end
diff --git a/spec/roqua/scheduling/scheduler_spec.rb b/spec/roqua/scheduling/scheduler_spec.rb
index 843a4c5..4856850 100644
--- a/spec/roqua/scheduling/scheduler_spec.rb
+++ b/spec/roqua/scheduling/scheduler_spec.rb
@@ -86,7 +86,7 @@ describe Roqua::Scheduling::Scheduler do
end
it 'counts task calls' do
- expect(Appsignal).to receive(:increment_counter).with('scheduler.run_task.completed.hourly', 1)
+ expect(Appsignal).to receive(:increment_counter).with('scheduler.run_task.completed', 1, task_name: 'hourly')
subject.ping
end
end
--
GitLab