diff --git a/Gemfile.lock b/Gemfile.lock index f875a33a875b9dafd5a917ee3afb9dc46457d50c..bb7827c86cbffbbe9f9ae299cae3d39c3df032a4 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 84a781a35d5c392f2601ee3317036cb92f7e497b..2d17e5722ea2fe50b0e16364f3701007de79dbca 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 5a9ec1d0ee7c6853a1e57dea59bfae92b85e8bbf..aa92b658d19f7150cbd61926e29570ed53e2c7ca 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 f4724b01b8cfcd4d60f4fce4db3a272ad934c613..38b4352aaccb9ae2958f6e22d49881155856e2b9 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 fafa32ff18f053e09a8ccf50bd918a41f3f15a8f..5dadfb17982fc0b48b732cd8464a80136d799313 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 843a4c5c06a758890dd500d6cf43d2893342bf6b..48568501ebcb1cdca94db420563d84993ce78aff 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