skylight-core 2.0.2 → 3.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79714ab11cc38211455b04d384e7d41e65c294976c21b8469d86a666765cd61a
-  data.tar.gz: 90ef2cee993866ca7dfb5d650595fad69349c031de162d189d09d293909e90f1
+  metadata.gz: 3e088df33cbf4e24299e7348f5590927aa46719f7863d732e2b64bef05e24176
+  data.tar.gz: 1795504557109dcf4f2a0fde7650c3028a19927c52fabbd760107a4f27e7053d
 SHA512:
-  metadata.gz: ffd86457e94bfcb27ccebf6589d2826465e7bc018602b2a9886a5354967b331dd43ba7c33702d6cdce003dfb3178a5b8ea6a06d628a049f50ee0f715bc8ee4d4
-  data.tar.gz: 59a104a65e135391ee76f18fc62b4bb2bb82354ad6833f548f4db8949b793859c3e86194a471a5e9d5047390ca37f8b849298681a5059136b9e45867e479acad
+  metadata.gz: 98b4721f8a54536ba50e631eee00f472c3ac06246cc04e958f257a61758d6e52d4fba3710b0b39be5332c35f283a70b8364996d63c92d22c558bc9bc3175f1d4
+  data.tar.gz: b0e322c10dc487abbbaef0088c38728d5c8d1b16756b4ba5f5ce48e847a32b308bdea3c63cdac94880813f4913012e4f3621869f25b4ef597a5753e359a8511e

data/lib/skylight/core/normalizers.rb

@@ -99,7 +99,6 @@ module Skylight::Core
         action_view/render_collection
         action_view/render_partial
         action_view/render_template
-        active_job/enqueue_at
         active_model_serializers/render
         active_record/instantiation
         active_record/sql

data/lib/skylight/core/probes/active_job_enqueue.rb

@@ -0,0 +1,41 @@
+module Skylight::Core
+  module Probes
+    module ActiveJob
+      class EnqueueProbe
+        CAT = "other.active_job.enqueue".freeze
+
+        def install
+          ::ActiveJob::Base.around_enqueue do |job, block|
+            begin
+              job_class = job.class
+              adapter_name = EnqueueProbe.normalize_adapter_name(job_class)
+              desc = "{ adapter: #{adapter_name}, queue: '#{job.queue_name}' }"
+              name = job_class.name
+            rescue
+              block.call
+            else
+              Skylight::Core::Fanout.instrument(
+                title: "Enqueue #{name}", category: CAT, description: desc, &block
+              )
+            end
+          end
+
+          self.class.instance_eval do
+            if ::ActiveJob.gem_version >= Gem::Version.new('5.2')
+              def normalize_adapter_name(job_class)
+                job_class.queue_adapter_name
+              end
+            else
+              def normalize_adapter_name(job_class)
+                adapter_class = job_class.queue_adapter.is_a?(Class) ? job_class.queue_adapter : job_class.queue_adapter.class
+                adapter_class.name.demodulize.remove('Adapter').underscore
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register(:active_job_enqueue, "ActiveJob::Base", "active_job/base", ActiveJob::EnqueueProbe.new)
+  end
+end

data/lib/skylight/core/version.rb

@@ -1,6 +1,6 @@
 module Skylight
   module Core
-    VERSION = '2.0.2'
+    VERSION = '3.0.0-beta'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0.beta
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +173,6 @@ files:
 - lib/skylight/core/normalizers/action_view/render_collection.rb
 - lib/skylight/core/normalizers/action_view/render_partial.rb
 - lib/skylight/core/normalizers/action_view/render_template.rb
-- lib/skylight/core/normalizers/active_job/enqueue_at.rb
 - lib/skylight/core/normalizers/active_model_serializers/render.rb
 - lib/skylight/core/normalizers/active_record/instantiation.rb
 - lib/skylight/core/normalizers/active_record/sql.rb
@@ -194,6 +207,7 @@ files:
 - lib/skylight/core/probes/action_dispatch.rb
 - lib/skylight/core/probes/action_dispatch/request_id.rb
 - lib/skylight/core/probes/action_view.rb
+- lib/skylight/core/probes/active_job_enqueue.rb
 - lib/skylight/core/probes/active_model_serializers.rb
 - lib/skylight/core/probes/elasticsearch.rb
 - lib/skylight/core/probes/excon.rb
@@ -231,7 +245,7 @@ files:
 - lib/skylight/core/vendor/thread_safe/synchronized_cache_backend.rb
 - lib/skylight/core/version.rb
 - lib/skylight/core/vm/gc.rb
-homepage: http://www.skylight.io
+homepage: https://www.skylight.io
 licenses:
 - Nonstandard
 metadata: {}
@@ -246,9 +260,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/lib/skylight/core/normalizers/active_job/enqueue_at.rb

@@ -1,21 +0,0 @@
-module Skylight::Core
-  module Normalizers
-    module ActiveJob
-      class EnqueueAt < Normalizer
-        register "enqueue_at.active_job"
-
-        CAT = "other.job.enqueue_at".freeze
-
-        def normalize(_trace, _name, payload)
-					title = "Enqueue #{payload[:job].class}"
-
-					adapter_class_name = payload[:adapter].class.name
-					adapter_name = adapter_class_name.match(/^ActiveJob::QueueAdapters::(\w+)Adapter$/)[1].underscore
-					desc = "{ adapter: '#{adapter_name}', queue: '#{payload[:job].queue_name}' }"
-
-					[ CAT, title, desc ]
-        end
-      end
-    end
-  end
-end