Skip to content

Commit 7079523

Browse files
committed
Update test expectations for prometheus metric name changes
1 parent d2f1320 commit 7079523

2 files changed

Lines changed: 20 additions & 16 deletions

File tree

spec/unit/pool_manager_spec.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,8 @@
11071107
context 'with no errors during cloning' do
11081108
before(:each) do
11091109
allow(metrics).to receive(:timing)
1110-
expect(metrics).to receive(:timing).with(/clone\./,/0/)
1110+
allow(metrics).to receive(:gauge)
1111+
expect(metrics).to receive(:gauge).with(/vmpooler_clone\./,/0/)
11111112
expect(provider).to receive(:create_vm).with(pool, String)
11121113
allow(provider).to receive(:get_vm_ip_address).and_return(1)
11131114
allow(subject).to receive(:get_domain_for_pool).and_return('example.com')
@@ -1158,7 +1159,8 @@
11581159
context 'with a failure to get ip address after cloning' do
11591160
it 'should log a message that it completed being cloned' do
11601161
allow(metrics).to receive(:timing)
1161-
expect(metrics).to receive(:timing).with(/clone\./,/0/)
1162+
allow(metrics).to receive(:gauge)
1163+
expect(metrics).to receive(:gauge).with(/vmpooler_clone\./,/0/)
11621164
expect(provider).to receive(:create_vm).with(pool, String)
11631165
allow(provider).to receive(:get_vm_ip_address).and_return(nil)
11641166

@@ -1217,7 +1219,8 @@
12171219
context 'with request_id' do
12181220
before(:each) do
12191221
allow(metrics).to receive(:timing)
1220-
expect(metrics).to receive(:timing).with(/clone\./,/0/)
1222+
allow(metrics).to receive(:gauge)
1223+
expect(metrics).to receive(:gauge).with(/vmpooler_clone\./,/0/)
12211224
expect(provider).to receive(:create_vm).with(pool, String)
12221225
allow(provider).to receive(:get_vm_ip_address).with(vm,pool).and_return(1)
12231226
allow(subject).to receive(:get_dns_plugin_class_name_for_pool).and_return(dns_plugin)
@@ -1353,7 +1356,8 @@
13531356
it 'should emit a timing metric' do
13541357
allow(subject).to receive(:get_vm_usage_labels)
13551358
allow(metrics).to receive(:timing)
1356-
expect(metrics).to receive(:timing).with("vmpooler_destroy.#{pool}", String)
1359+
allow(metrics).to receive(:gauge)
1360+
expect(metrics).to receive(:gauge).with("vmpooler_destroy.#{pool}", String)
13571361

13581362
subject._destroy_vm(vm,pool,provider,dns_plugin)
13591363
end

spec/unit/queue_reliability_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223

224224
it 'increments purge metrics' do
225225
redis_connection_pool.with do |redis_connection|
226-
expect(metrics).to receive(:increment).with("purge.pending.#{pool}.count")
226+
expect(metrics).to receive(:increment).with("vmpooler_purge.pending.#{pool}.count")
227227

228228
subject.purge_pending_queue(pool, redis_connection)
229229
end
@@ -460,35 +460,35 @@
460460

461461
it 'pushes status metric' do
462462
allow(metrics).to receive(:gauge)
463-
expect(metrics).to receive(:gauge).with('health.status', 0)
463+
expect(metrics).to receive(:gauge).with('vmpooler_health.status', 0)
464464

465465
subject.push_health_metrics(metrics_data, 'healthy')
466466
end
467467

468468
it 'pushes error metrics' do
469469
allow(metrics).to receive(:gauge)
470-
expect(metrics).to receive(:gauge).with('health.dlq.total_size', 25)
471-
expect(metrics).to receive(:gauge).with('health.stuck_vms.count', 2)
472-
expect(metrics).to receive(:gauge).with('health.orphaned_metadata.count', 3)
470+
expect(metrics).to receive(:gauge).with('vmpooler_health.dlq.total_size', 25)
471+
expect(metrics).to receive(:gauge).with('vmpooler_health.stuck_vms.count', 2)
472+
expect(metrics).to receive(:gauge).with('vmpooler_health.orphaned_metadata.count', 3)
473473

474474
subject.push_health_metrics(metrics_data, 'healthy')
475475
end
476476

477477
it 'pushes per-pool queue metrics' do
478478
allow(metrics).to receive(:gauge)
479-
expect(metrics).to receive(:gauge).with('health.queue.test-pool.pending.size', 10)
480-
expect(metrics).to receive(:gauge).with('health.queue.test-pool.pending.oldest_age', 3600)
481-
expect(metrics).to receive(:gauge).with('health.queue.test-pool.pending.stuck_count', 2)
482-
expect(metrics).to receive(:gauge).with('health.queue.test-pool.ready.size', 50)
479+
expect(metrics).to receive(:gauge).with('vmpooler_health.queue.test-pool.pending.size', 10)
480+
expect(metrics).to receive(:gauge).with('vmpooler_health.queue.test-pool.pending.oldest_age', 3600)
481+
expect(metrics).to receive(:gauge).with('vmpooler_health.queue.test-pool.pending.stuck_count', 2)
482+
expect(metrics).to receive(:gauge).with('vmpooler_health.queue.test-pool.ready.size', 50)
483483

484484
subject.push_health_metrics(metrics_data, 'healthy')
485485
end
486486

487487
it 'pushes task metrics' do
488488
allow(metrics).to receive(:gauge)
489-
expect(metrics).to receive(:gauge).with('health.tasks.clone.active', 3)
490-
expect(metrics).to receive(:gauge).with('health.tasks.ondemand.active', 2)
491-
expect(metrics).to receive(:gauge).with('health.tasks.ondemand.pending', 5)
489+
expect(metrics).to receive(:gauge).with('vmpooler_health.tasks.clone.active', 3)
490+
expect(metrics).to receive(:gauge).with('vmpooler_health.tasks.ondemand.active', 2)
491+
expect(metrics).to receive(:gauge).with('vmpooler_health.tasks.ondemand.pending', 5)
492492

493493
subject.push_health_metrics(metrics_data, 'healthy')
494494
end

0 commit comments

Comments
 (0)