Merge pull request #53 from buildkite/add-high-resolution-storage-support

Add high resolution storage support

Author: sj26

lib/sidekiq/cloudwatchmetrics.rb

@@ -60,7 +60,7 @@ def initialize(config: default_config, client: Aws::CloudWatch::Client.new, name
       @config = config
 
       @client = client
-      @interval = interval
+      @interval_s = interval
       @namespace = namespace
       @process_metrics = process_metrics
       @additional_dimensions = additional_dimensions.map { |k, v| {name: k.to_s, value: v.to_s} }
@@ -80,7 +80,7 @@ def running?
     def run
       logger.info { "Started Sidekiq CloudWatch Metrics Publisher" }
 
-      # Publish stats every @interval seconds, sleeping as required between runs
+      # Publish stats every @interval_s seconds, sleeping as required between runs
       now = Time.now.to_f
       tick = now
       until @stop
@@ -93,7 +93,7 @@ def run
         end
 
         now = Time.now.to_f
-        tick = [tick + @interval, now].max
+        tick = [tick + @interval_s, now].max
         sleep(tick - now) if tick > now
       end
 
@@ -258,6 +258,9 @@ def publish
 
       # We can only put 20 metrics at a time
       metrics.each_slice(20) do |some_metrics|
+        if @interval_s < 60
+          metrics.each { |metric| metric.merge!(storage_resolution: 1) }
+        end
         @client.put_metric_data(
           namespace: @namespace,
           metric_data: some_metrics,

spec/sidekiq/cloudwatchmetrics_spec.rb

@@ -262,6 +262,94 @@
         end
       end
 
+      context "with a custom interval of less than 60" do
+        subject(:publisher) { Sidekiq::CloudWatchMetrics::Publisher.new(client: client, interval: 30) }
+
+        it "passes sets a storage resolution of 1" do
+          Timecop.freeze(now = Time.now) do
+            publisher.publish
+
+            expect(client).to have_received(:put_metric_data).with(
+              namespace: "Sidekiq",
+              metric_data: including(
+                {
+                  metric_name: "ProcessedJobs",
+                  timestamp: now,
+                  value: 123,
+                  unit: "Count",
+                  storage_resolution: 1,
+                },
+                {
+                  metric_name: "FailedJobs",
+                  timestamp: now,
+                  value: 456,
+                  unit: "Count",
+                  storage_resolution: 1,
+                },
+                {
+                  metric_name: "QueueSize",
+                  dimensions: [{name: "QueueName", value: "bar"}],
+                  timestamp: now,
+                  value: 2,
+                  unit: "Count",
+                  storage_resolution: 1,
+                },
+                {
+                  metric_name: "QueueLatency",
+                  dimensions: [{name: "QueueName", value: "bar"}],
+                  timestamp: now,
+                  value: 1.23,
+                  unit: "Seconds",
+                  storage_resolution: 1,
+                },
+              )
+            )
+          end
+        end
+      end
+
+      context "with a custom interval of more than 60" do
+        subject(:publisher) { Sidekiq::CloudWatchMetrics::Publisher.new(client: client, interval: 120) }
+
+        it "doesn't pass a storage resolution" do
+          Timecop.freeze(now = Time.now) do
+            publisher.publish
+
+            expect(client).to have_received(:put_metric_data).with(
+              namespace: "Sidekiq",
+              metric_data: including(
+                {
+                  metric_name: "ProcessedJobs",
+                  timestamp: now,
+                  value: 123,
+                  unit: "Count",
+                },
+                {
+                  metric_name: "FailedJobs",
+                  timestamp: now,
+                  value: 456,
+                  unit: "Count",
+                },
+                {
+                  metric_name: "QueueSize",
+                  dimensions: [{name: "QueueName", value: "bar"}],
+                  timestamp: now,
+                  value: 2,
+                  unit: "Count",
+                },
+                {
+                  metric_name: "QueueLatency",
+                  dimensions: [{name: "QueueName", value: "bar"}],
+                  timestamp: now,
+                  value: 1.23,
+                  unit: "Seconds",
+                },
+              )
+            )
+          end
+        end
+      end
+
       context "with lots of queues" do
         let(:queues) { 10.times.each_with_object({}) { |i, hash| hash["queue#{i}"] = double(size: 1, latency: 1.23) } }