fix: metrics no longer fails after 10 minutes in a loop

lib/unleash/metrics_reporter.rb

@@ -15,7 +15,12 @@ def initialize
 
     def generate_report
       metrics = Unleash&.engine&.get_metrics()
+      return nil if metrics.nil?
 
+      generate_report_from_bucket metrics
+    end
+
+    def generate_report_from_bucket(bucket)
       {
         'platformName': RUBY_ENGINE,
         'platformVersion': RUBY_VERSION,
@@ -24,7 +29,7 @@ def generate_report
         'appName': Unleash.configuration.app_name,
         'instanceId': Unleash.configuration.instance_id,
         'connectionId': Unleash.configuration.connection_id,
-        'bucket': metrics || {}
+        'bucket': bucket
       }
     end
 
@@ -33,11 +38,19 @@ def post
 
       report = self.generate_report
 
-      if report[:bucket].empty? && (Time.now - self.last_time < LONGEST_WITHOUT_A_REPORT) # and last time is less then 10 minutes...
-        Unleash.logger.debug "Report not posted to server, as it would have been empty. (and has been empty for up to 10 min)"
-        return
+      if report.nil?
+        return if Time.now - self.last_time < LONGEST_WITHOUT_A_REPORT
+
+        Unleash.logger.debug "Sending empty report to server as 10 minutes have passed since last report"
+        report = self.generate_report_from_bucket({
+          'start': self.last_time.utc.iso8601,
+          'stop': Time.now.utc.iso8601,
+          'toggles': {}
+        })
       end
 
+      self.last_time = Time.now
+
       headers = (Unleash.configuration.http_headers || {}).dup
       headers.merge!({ 'UNLEASH-INTERVAL' => Unleash.configuration.metrics_interval.to_s })
       response = Unleash::Util::Http.post(Unleash.configuration.client_metrics_uri, report.to_json, headers)

spec/unleash/metrics_reporter_spec.rb

@@ -128,20 +128,27 @@
 
     metrics_reporter.last_time = Time.now - 601
     report = metrics_reporter.generate_report
-    expect(report[:bucket]).to be_empty
 
     metrics_reporter.post
 
     expect(WebMock).to have_requested(:post, 'http://test-url/client/metrics')
-      .with(
-        body: hash_including(
-          yggdrasilVersion: anything,
-          specVersion: anything,
-          platformName: anything,
-          platformVersion: anything,
-          bucket: {}
+    .with { |req|
+      body = JSON.parse(req.body, symbolize_names: true)
+
+      expect(body).to include(
+        platformName: anything,
+        platformVersion: anything,
+        yggdrasilVersion: anything,
+        specVersion: anything,
+        bucket: include(
+          start: anything,
+          stop: anything,
+          toggles: {}
         )
       )
+
+      true # tell WebMock we're done matching
+    }
   end
 
   it "includes metadata in the report" do