alacrity-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 453dd5ed4a8173cab3ccca146a1fa7827cc81d2e
-  data.tar.gz: 6959b45a643e9a7e8814af00710eb61a188abd97
+  metadata.gz: d2ebad46ea6fbcdeb0f2ea4b6d9e75b4b1a2bb36
+  data.tar.gz: d9bc00ae09670c29a19334acf2621febe1b39a4b
 SHA512:
-  metadata.gz: a284cb2d4c66c43244e0689f5499fc81cc96cdda869951b9266dbc1f744d5225f8ad7e1bf3975f272dd87bc3c4b8bb837573fd1d592ba475af769bf299c389e7
-  data.tar.gz: 9da624496779a56b6dd4b1db105fc97b975fef39368b9e443acdea6a4877d3dff7713c643b9a5ddb4b2d3c166c5462e08056ae594d32885225761ea05718de3e
+  metadata.gz: 7e22d676984230594dc2b9c32975923baaba7acfa9b35fc298353005fd7711a9a5f1f93bef8f51155b3afb1bf3a35c80efa8b67d2638dd15c3284d0c4f086dbf
+  data.tar.gz: 09e4057d68e49dd70a1506ea1e3667fd2322766e914b980797ebde1074c3820840c395c3e3aa439e816cf2ab59353966db7445aaaefd712ceeb3aa9683fe9dea

data/lib/alacrity-rails/client.rb

@@ -13,9 +13,12 @@ module AlacrityRails
       transaction&.store_timeline_event(data)
     end
 
-    def self.close_transaction!
-      this_transaction = transaction
-      Thread.new { transmit(this_transaction) }
+    def self.close_transaction!(response)
+      if transaction
+        transaction.status = response.first
+        this_transaction = transaction
+        Thread.new { transmit(this_transaction) }
+      end
     ensure
       cleanup
     end

data/lib/alacrity-rails/middleware.rb

@@ -3,7 +3,7 @@ module AlacrityRails
     def call(env)
       Client.open_transaction(env)
       response = app.call(env)
-      Client.close_transaction!
+      Client.close_transaction!(response)
       response
     end
   end

data/lib/alacrity-rails/probe/action_controller.rb

@@ -4,12 +4,16 @@ module AlacrityRails
       def self.activate
         ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |name, started, finished, unique_id, data|
           AlacrityRails::Client.store_request(
-            started_at: started,
-            finished_at: finished,
             controller: data[:controller],
             action: data[:action],
-            format: data[:format],
-            status: data[:status]
+            format: data[:format]
+          )
+
+          AlacrityRails::Client.store_timeline_event(
+            event_type: 'framework',
+            engine: 'ActionController',
+            started_at: started,
+            finished_at: finished,
           )
         end
       end

data/lib/alacrity-rails/transaction/web_transaction.rb

@@ -1,21 +1,18 @@
 module AlacrityRails::Transaction
   class WebTransaction < Base
     attr_accessor :url, :middleware_started_at, :controller, :action, :format,
-      :method, :status, :framework_started_at, :framework_finished_at
+      :method, :status
 
     def initialize(env={})
       self.middleware_started_at = absolute_time(DateTime.now)
-      self.url = ["#{env['rack.url_scheme']}://", env['HTTP_HOST'], env['REQUEST_PATH']].compact.join
+      self.url = env['REQUEST_URI']
       self.method = env['REQUEST_METHOD']
     end
 
     def store_request(data)
-      self.framework_started_at = absolute_time(data[:started_at].to_datetime)
-      self.framework_finished_at = absolute_time(data[:finished_at].to_datetime)
       self.controller = data[:controller]
       self.action = data[:action]
       self.format = data[:format]
-      self.status = data[:status]
     end
 
     def store_timeline_event(data)
@@ -39,8 +36,6 @@ module AlacrityRails::Transaction
         middleware_elapsed: middleware_finished_at - middleware_started_at,
         middleware_started_at: middleware_started_at,
         middleware_finished_at: middleware_finished_at,
-        framework_started_at: framework_started_at,
-        framework_finished_at: framework_finished_at,
         format: format,
         method: method,
         status: status,

data/lib/alacrity-rails/version.rb

@@ -1,3 +1,3 @@
 module AlacrityRails
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alacrity-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alacrity, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails