Merge pull request #6 from blackopseng3/master

Bugfixing

Author: eric-martin

lib/stackify/logger_proxy.rb

@@ -4,11 +4,16 @@ class LoggerProxy < Object
     def initialize logger
       @logger = logger
       @logger.level = Logger.const_get(Stackify.configuration.log_level.to_s.upcase)
-      %w( debug info warn error fatal unknown).each do |level|
+      %w(debug info warn error fatal unknown).each do |level|
+        stackify_logger = if level == 'debug'
+          -> (msg, caller) { Stackify.logger_client.log(level.downcase, msg, caller) unless msg.empty? }
+        else
+          -> (msg, caller) { Stackify.logger_client.log(level.downcase, msg, caller) }
+        end
         LoggerProxy.class_eval do
           define_method level.to_sym do |*args , &block|
             msg = message(*args, &block)
-            Stackify.logger_client.log(level.downcase, msg, caller)
+            stackify_logger.call(msg, caller)
             @logger.send(level.to_sym, msg, &block)
           end
         end

lib/stackify/metrics/metrics.rb

@@ -62,14 +62,15 @@ def sum category, metric_name, value, advanced_settings = nil
         Stackify::Metrics.metrics_client.queue_metric m
       end
 
-      def time category, metric_name, start_time
+      def time category, metric_name, start_time, advanced_settings = nil
         time_taken = Time.now.utc - start_time.utc
-        avarage_time category, metric_name, time_taken
+        avarage_time category, metric_name, time_taken, advanced_settings
       end
 
-      def avarage_time category, metric_name, elapsed_time
+      def avarage_time category, metric_name, elapsed_time, advanced_settings = nil
         m = Metric.new category, metric_name, Stackify::Metrics::METRIC_TYPES[:counter_time]
         m.value = elapsed_time.round #seconds
+        m.settings = advanced_settings
         Stackify::Metrics.metrics_client.queue_metric m
       end
 

lib/stackify/metrics/metrics_client.rb

@@ -70,6 +70,7 @@ def start_upload_metrics
         #only getting metrics less than 10 minutes old to drop old data in case we get backed up
         #they are removed from the @aggregated_metrics in the upload function upon success
         all_success = upload_aggregates(first_50_metrics.select { |_key, aggr| aggr.occurred_utc > current_time - 10.minutes })
+        all_success.map {|key, _aggr| @aggregate_metrics[key].occurred_utc = current_time }
       end
       @aggregate_metrics.delete_if { |_key, aggr| aggr.occurred_utc < purge_older_than }
     end
@@ -172,6 +173,7 @@ def handle_zero_reports current_time
           end
           agg_key = agg.aggregate_key
           unless @aggregate_metrics.has_key? agg_key
+            agg.occurred_utc = current_time - 60
             agg.name_key = aggregate.name_key
             Stackify.internal_log :debug, 'Creating 0 default value for ' + agg_key
             @aggregate_metrics[agg_key] = agg