alacrity-rails 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de4111ca3d48f3ed4cb9e30221c107f226d2bfb
-  data.tar.gz: 10afa26f0dd1242da44dc4fd1233ecfa061b41f7
+  metadata.gz: 4e71baac37d033be722f516ca9e2517f37acb4a1
+  data.tar.gz: f56b3bc0f27d22f9790d6fd2effd77bb4ef8174d
 SHA512:
-  metadata.gz: 37e057d9025ae6cf31ce3424788c3c5b55b0b540cc38c51246caa6ae6b055a0e5e94b8a4b4369632520b744d75d7977167068e28a59a865f1509719d1ca2a424
-  data.tar.gz: 29235ae28954ee446ce111a8cde6831a94b62a76583f97ea10fba6738b4f486d667ac9a547fb9e207293c6a63b447fbada98df0665884e82412a0da43bc13a92
+  metadata.gz: a94cc4f73f7f24f4a148aedff5494fa993cf30c14e012a0b516b53a5fdad4f7cdfcbe54c502b9b68a5337caf2ddd083c23d3ab01470a02b9f213ebe82c9112f7
+  data.tar.gz: 86f3312d6b307c6b7f30262ee32836d3c3026a0cb8145c9af848de9eaa7057a7cd3d383a66cd64d5dd58657f683e6e11667299890be437cd11e476e7d0e37b05

data/lib/alacrity-rails.rb

@@ -13,14 +13,16 @@ module AlacrityRails
   autoload :VERSION,          'alacrity-rails/version'
 
   module Probe
-    autoload :ActionController,       'alacrity-rails/probe/action_controller'
-    autoload :ActionMailer,           'alacrity-rails/probe/action_mailer'
-    autoload :ActionView,             'alacrity-rails/probe/action_view'
-    autoload :ActiveModelSerializers, 'alacrity-rails/probe/active_model_serializers'
-    autoload :ActiveJob,              'alacrity-rails/probe/active_job'
-    autoload :ActiveRecord,           'alacrity-rails/probe/active_record'
-    autoload :Excon,                  'alacrity-rails/probe/excon'
-    autoload :MongoDriver,            'alacrity-rails/probe/mongo_driver'
+    autoload :ActionController,        'alacrity-rails/probe/action_controller'
+    autoload :ActionMailer,            'alacrity-rails/probe/action_mailer'
+    autoload :ActionView,              'alacrity-rails/probe/action_view'
+    autoload :ActiveModelSerializers,  'alacrity-rails/probe/active_model_serializers'
+    autoload :ActiveJob,               'alacrity-rails/probe/active_job'
+    autoload :ActiveRecord,            'alacrity-rails/probe/active_record'
+    autoload :Excon,                   'alacrity-rails/probe/excon'
+    autoload :MongoDriver,             'alacrity-rails/probe/mongo_driver'
+    autoload :Sidekiq,                 'alacrity-rails/probe/sidekiq'
+    autoload :SidekiqServerMiddleware, 'alacrity-rails/probe/sidekiq'
   end
 
   module Transaction
@@ -29,6 +31,7 @@ module AlacrityRails
     autoload :ConnectionTest,     'alacrity-rails/transaction/connection_test'
     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'
   end
 end

data/lib/alacrity-rails/client.rb

@@ -39,8 +39,11 @@ module AlacrityRails
 
     def self.transmit(transactable)
       Thread.new do
-        Net::HTTP.start(*transactable.net_http_start_arguments) do |http|
-          http.request(transactable.post_request)
+        begin
+          Net::HTTP.start(*transactable.net_http_start_arguments) do |http|
+            http.request(transactable.post_request)
+          end
+        rescue
         end
       end
     end

data/lib/alacrity-rails/config.rb

@@ -17,4 +17,14 @@ module AlacrityRails::Config
   def self.transmission_interval
     @transmission_interval ||= (ENV['ALACRITY_TRANSMISSION_INTERVAL'] || 0.5).to_f
   end
+
+  def self.yaml_options
+    @yaml_options ||= YAML.load_file(".alacrity.yml")
+  rescue
+    @yaml_options = {}
+  end
+
+  def self.sidekiq_enabled?
+    yaml_options['sidekiq'] != false
+  end
 end

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

@@ -0,0 +1,31 @@
+module AlacrityRails
+  module Probe
+    class SidekiqServerMiddleware
+      def call(worker_instance, msg, queue)
+        AlacrityRails::Instrumentor.instrument(
+          type: AlacrityRails::Transaction::Job,
+          data: {
+            worker_class: msg['class'],
+            args: msg['args'],
+            error_class: msg['error_class'],
+            error_message: msg['error_message']
+          }
+        ) do
+          yield
+        end
+      end
+    end
+
+    class Sidekiq
+      def self.activate
+        if defined?(::Sidekiq) && AlacrityRails::Config.sidekiq_enabled?
+          ::Sidekiq.configure_server do |config|
+            config.server_middleware do |chain|
+              chain.add SidekiqServerMiddleware
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alacrity-rails/railtie.rb

@@ -14,7 +14,8 @@ module AlacrityRails
           Probe::ActiveModelSerializers,
           Probe::ActiveRecord,
           Probe::MongoDriver,
-          Probe::Excon
+          Probe::Excon,
+          Probe::Sidekiq
         ].each(&:activate)
       end
     end

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

@@ -0,0 +1,29 @@
+module AlacrityRails::Transaction
+  class Job < Base
+    attr_accessor :data, :start_time, :end_time
+
+    def initialize(data={})
+      self.data = data
+      self.start_time = DateTime.now
+    end
+
+    def finalize(response)
+      self.end_time = DateTime.now
+    end
+
+    def as_json(*args)
+      {
+        environment: AlacrityRails::ServerConfig.environment,
+        event_type: 'job',
+        started_at: absolute_time(start_time),
+        finished_at: absolute_time(end_time),
+        timeline_events: prepared_timeline_events,
+        data: data
+      }
+    end
+
+    def self.endpoint
+      @endpoint ||= URI("#{AlacrityRails::Config.collector_host}/v2/events")
+    end
+  end
+end

data/lib/alacrity-rails/version.rb

@@ -1,3 +1,3 @@
 module AlacrityRails
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alacrity-rails
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Alacrity, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,11 +48,13 @@ files:
 - lib/alacrity-rails/probe/active_record.rb
 - lib/alacrity-rails/probe/excon.rb
 - lib/alacrity-rails/probe/mongo_driver.rb
+- lib/alacrity-rails/probe/sidekiq.rb
 - lib/alacrity-rails/railtie.rb
 - lib/alacrity-rails/server_config.rb
 - lib/alacrity-rails/transaction/base.rb
 - lib/alacrity-rails/transaction/connection_test.rb
 - lib/alacrity-rails/transaction/custom.rb
+- lib/alacrity-rails/transaction/job.rb
 - lib/alacrity-rails/transaction/server_startup.rb
 - lib/alacrity-rails/transaction/web_transaction.rb
 - lib/alacrity-rails/version.rb