Format Slack messages only

Author: Oskar Kapusta

lib/appoptics-services/numbers.rb

@@ -1,28 +1,24 @@
-require 'active_support/all'
-
 module AppOptics
   module Services
     class Numbers
-      extend ActiveSupport::NumberHelper
-
       def self.format_for_threshold(threshold, number, tolerance=2)
         threshold_decimals = number_decimal_places(threshold)
         number_decimals = number_decimal_places(number)
 
         if !threshold_decimals || !number_decimals
-          return number_to_delimited(number)
+          return number
         end
 
         if (number_decimals - tolerance) <= threshold_decimals
-          return number_to_delimited(number)
+          return number
         end
 
         # here we have more decimals in the number than the threshold
         # number:    3.14159
         # threshold: 3.14
 
         factor = (10**(threshold_decimals+tolerance)).to_f
-        number_to_delimited((number * factor).truncate / factor)
+        (number * factor).truncate / factor
       end
 
       def self.number_decimal_places(number)

lib/appoptics-services/output.rb

@@ -1,5 +1,6 @@
 require 'redcarpet'
 require 'active_support/core_ext/string/filters.rb'
+require 'active_support/number_helper.rb'
 
 require_relative 'helpers/alert_helpers'
 require_relative 'numbers'
@@ -11,6 +12,7 @@ module AppOptics
   module Services
     class Output
       include Helpers::AlertHelpers
+      include ActiveSupport::NumberHelper
 
       attr_reader :violations, :conditions, :alert, :clear, :trigger_time, :alert_url
       def initialize(payload, add_test_notice=true)
@@ -102,24 +104,27 @@ def generate_alert_cleared
         lines.join("\n")
       end
 
-      def format_measurement(measurement, source = nil)
+      def format_measurement(measurement, source = nil, service = nil)
         condition = @conditions[measurement[:condition_violated]]
         if source
           metric = "`#{measurement[:metric]}` from `#{source}`"
         else
           metric = "`#{measurement[:metric]}`"
         end
         violation_time = measurement[:end] || measurement[:recorded_at]
-        "metric #{metric} was #{format_violation_type(condition, measurement)} recorded at #{format_time(violation_time)}"
+        "metric #{metric} was #{format_violation_type(condition, measurement, service)} recorded at #{format_time(violation_time)}"
       end
 
-      def format_violation_type(condition, measurement)
+      def format_violation_type(condition, measurement, service)
         if condition[:type] == "absent"
           "absent for #{condition[:duration]} seconds"
         else
           threshold_value = condition[:threshold]
           actual_value = measurement[:value]
           formatted_value = AppOptics::Services::Numbers.format_for_threshold(threshold_value, actual_value)
+          if service == AppOptics::Services::Service::Slack::SERVICE_NAME
+            formatted_value = number_to_delimited(formatted_value)
+          end
           "#{condition[:type]} threshold #{threshold(condition,measurement)} with value #{formatted_value}"
         end
       end

lib/appoptics-services/service.rb

@@ -179,5 +179,3 @@ class ConfigurationError < StandardError; end
 Dir[File.join(File.dirname(__FILE__), '../../services/*.rb')].each { |service|
   load service
 }
-
-

services/slack.rb

@@ -7,6 +7,7 @@
 module AppOptics::Services
   class Service::Slack < AppOptics::Services::Service
     VERTICAL_LINE_COLOR = "#0880ad"
+    SERVICE_NAME = "slack"
 
     def receive_validate(errors = {})
       if settings[:url].blank?
@@ -70,7 +71,7 @@ def v2_alert_result
             {
               :title => source,
               :value => measurements.inject([]) do |texts, measurement|
-                texts << data.format_measurement(measurement)
+                texts << data.format_measurement(measurement, nil, SERVICE_NAME)
               end.join("\n")
             }
           end,

test/numbers_test.rb

@@ -8,18 +8,16 @@ def format(threshold, number, tolerance=2)
   end
 
   def test_does_not_change
-    assert format(10, 10.53) == "10.53"
-    assert format(10.53, 10.53) == "10.53"
+    assert format(10, 10.53) == 10.53
+    assert format(10.53, 10.53) == 10.53
   end
 
   def test_changes
-    assert_equal "10.5312", format(10.53, 10.5312345)
-    assert_equal "10.53", format(10, 10.5312345)
-    assert_equal "0.53", format(0, 0.5312345)
-    assert_equal "0.5312", format(0.12, 0.5312345)
-    assert_equal "100", format(10, 100)
-    assert_equal "12,345,678", format(10, 12345678)
-    assert_equal "12,345,678.0", format(10, 12345678.0)
+    assert_equal 10.5312, format(10.53, 10.5312345)
+    assert_equal 10.53, format(10, 10.5312345)
+    assert_equal 0.53, format(0, 0.5312345)
+    assert_equal 0.5312, format(0.12, 0.5312345)
+    assert_equal 100, format(10, 100)
   end