app_monit_rails 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d5fafb91520a7cff4f077ca1e59529f9347b79
-  data.tar.gz: 0ab9267e9d1763eca83c2f9dae22a5826a45b3eb
+  metadata.gz: 2e16e8914f679acb64fd2832699c439c6878eb0d
+  data.tar.gz: e0ed46dbce520e13f945b24fb2426a71845a6580
 SHA512:
-  metadata.gz: 30a433805844c93c78e5ce0766c3268f75e3309ece3ade0be543919e6920eae2110c417127ef79324fc99796beecfc7ef30977278886d9a98aac9f694188c0db
-  data.tar.gz: 845d116ad99b534847cd50f8e0c7ed1fe0cea176bd78e80b337c32f4804e74ff3cee89752941e1d86ac97b626a8d2457c9f20a8b4026e52538b62f72fae41e08
+  metadata.gz: 4a7bfcdbed0582d77d103bb9de8ac428b12bca2f6e93b5d89a22916d294a894c566824d63d8a6f8149070c20795763b2d3ed7d23cc1daa9a814a5edd70a10edb
+  data.tar.gz: 6e48300dd255c950dc2bef186e86afa67ffbbbdd42c2cff751b42df6492e0b4ff037db7a81bebd1881689057225d1ad85b9178bcaf52bfee8962f72843e78417

data/lib/app_monit/rails/config.rb

@@ -7,6 +7,10 @@ module AppMonit
         def enabled?
           @enabled.nil? ? ::Rails.env != "test" : @enabled
         end
+
+        def name
+          @name.nil? ? ::Rails.application.class.parent_name : @name
+        end
       end
     end
   end

data/lib/app_monit/rails/version.rb

@@ -1,5 +1,5 @@
 module AppMonit
   module Rails
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/app_monit/rails/worker.rb

@@ -98,8 +98,8 @@ module AppMonit
       def convert_requests_to_events
         @requests.flat_map do |minute, endpoints|
           endpoints.collect do |endpoint, durations|
-            payload = { endpoint: endpoint }.merge(durations.delete(:total) || {}).merge(durations)
-            { created_at: Time.at(minute), name: 'page_load', payload: payload }
+            payload = durations.merge(application: Config.name, endpoint: endpoint)
+            { application: Config.name, created_at: Time.at(minute), name: 'page_load', payload: payload }
           end
         end
       end
@@ -107,17 +107,19 @@ module AppMonit
       def convert_errors_to_events
         @errors.flat_map do |minute, endpoints|
           endpoints.collect do |endpoint, duration|
-            payload = duration.merge(endpoint: endpoint)
+            payload = duration.merge(application: Config.name, endpoint: endpoint)
             { created_at: Time.at(minute), name: 'page_error', payload: payload }
           end
         end
       end
 
+      def events
+        convert_requests_to_events + convert_errors_to_events
+      end
+
       def send_to_collector
         AppMonit::Rails.logger.debug "Sending to collector"
 
-        events = convert_requests_to_events + convert_errors_to_events
-
         if events.any?
           AppMonit::Http.post('/v1/events', event: events)
 

data/spec/features/trigger_events_spec.rb

@@ -35,8 +35,9 @@ feature 'Triggered events' do
       }.to raise_error
 
       @worker = AppMonit::Rails::Worker.instance
+      @worker.push(:flush)
     end
 
-    puts AppMonit::Rails::Worker.instance.requests.inspect
+    puts AppMonit::Rails::Worker.instance.events.inspect
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_monit_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Redmar Kerkhoff