alacrity-rails 1.0.0.beta.2 → 1.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94474c4b1a90f662c8a32c6ae917e88a29f9fa5e
-  data.tar.gz: dca2edc08be12cab09b0c12450e9ae71b6352bef
+  metadata.gz: 2e121b9fe1d5ce57c83deef77b9a35807577212d
+  data.tar.gz: e5c038896cdfb5195b4268092baf8d4b93d65272
 SHA512:
-  metadata.gz: 0bf363bf352dbb2f70ec69c8573b99d9ef621cd5d3579248d950850067ba480975b7a8099f9041653c505cbfc07f8274f5238b79e827b781298e33eb9e0782dc
-  data.tar.gz: 210c72464ef13e5ca5e3f300f12e90355ea72685ddcf398abb5a3e28a293110f4c295ed95c6622f7b33a710c372f840b5b5c7488902b3854cc27329eb5e1cb9e
+  metadata.gz: aa602f7ad4da6288b98be8d3693df9991a978cc71cb19f1814ae1c87412299f62c74caab0843f1c36af61fbc73f9bb8ddc743e9461a1cd9fdd164d1f911831ed
+  data.tar.gz: 5883490ba920c9ae1d9fc4d05a380deb99c33191ca1c9a3607d135d5b9294d37759286dea5430c55f65541bf5818e26dde145d32f8696e42c8dfc77a85aa7151

data/lib/alacrity-rails.rb

@@ -39,12 +39,11 @@ module AlacrityRails
 
   module Transaction
     autoload :Base,               'alacrity-rails/transaction/base'
-    autoload :BulkWebTransaction, 'alacrity-rails/transaction/bulk_web_transaction'
     autoload :Diagnostic,         'alacrity-rails/transaction/diagnostic'
     autoload :Custom,             'alacrity-rails/transaction/custom'
     autoload :ServerStartup,      'alacrity-rails/transaction/server_startup'
     autoload :Job,                'alacrity-rails/transaction/job'
-    autoload :WebTransaction,     'alacrity-rails/transaction/web_transaction'
+    autoload :WebRequest,         'alacrity-rails/transaction/web_request'
   end
 end
 

data/lib/alacrity-rails/middleware.rb

@@ -2,7 +2,7 @@ module AlacrityRails
   class Middleware < Struct.new(:app)
     def call(env)
       AlacrityRails::Instrumentor.instrument(
-        type: AlacrityRails::Transaction::WebTransaction,
+        type: AlacrityRails::Transaction::WebRequest,
         data: { url: env['REQUEST_URI'], method: env['REQUEST_METHOD'] },
         reset: true
       ) do

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

@@ -62,9 +62,5 @@ module AlacrityRails::Transaction
     def absolute_time(datetime)
       datetime.strftime('%Q').to_i
     end
-
-    def to_json
-      @to_json ||= super.to_json
-    end
   end
 end

data/lib/alacrity-rails/transaction/{web_transaction.rb → web_request.rb}

@@ -1,6 +1,6 @@
 module AlacrityRails::Transaction
-  class WebTransaction < Base
-    attr_accessor :url, :controller, :action, :format, :method, :status
+  class WebRequest < Base
+    attr_accessor :url, :name, :format, :method, :status
 
     def initialize(data={})
       @middleware_started_at = DateTime.now
@@ -9,8 +9,7 @@ module AlacrityRails::Transaction
     end
 
     def store_metadata(data)
-      self.controller = data[:controller]
-      self.action = data[:action]
+      self.name = [data[:controller], data[:action]].reject(&:blank?).join('#')
       self.format = data[:format]
     end
 
@@ -25,13 +24,12 @@ module AlacrityRails::Transaction
       {
         environment: AlacrityRails::ServerConfig.environment,
         event_type: 'web-request',
+        name: name,
         started_at: middleware_started_at,
         finished_at: middleware_finished_at,
         timeline_events: prepared_timeline_events,
         data: {
           url: url,
-          controller: controller,
-          action: action,
           format: format,
           method: method,
           status: status,
@@ -40,7 +38,7 @@ module AlacrityRails::Transaction
     end
 
     def self.endpoint
-      @endpoint ||= URI("#{AlacrityRails::Config.collector_host}/v2/events")
+      @endpoint ||= URI("#{AlacrityRails::Config.collector_host}/v3/events")
     end
   end
 end

data/lib/alacrity-rails/version.rb

@@ -1,3 +1,3 @@
 module AlacrityRails
-  VERSION = '1.0.0.beta.2'
+  VERSION = '1.0.0.beta.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alacrity-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Alacrity, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,7 +56,7 @@ files:
 - lib/alacrity-rails/transaction/diagnostic.rb
 - lib/alacrity-rails/transaction/job.rb
 - lib/alacrity-rails/transaction/server_startup.rb
-- lib/alacrity-rails/transaction/web_transaction.rb
+- lib/alacrity-rails/transaction/web_request.rb
 - lib/alacrity-rails/version.rb
 - lib/tasks/diagnostic.rake
 homepage: https://www.alacrityapp.com