skylight 6.0.0.beta → 6.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff8e9cf759364d5b113994e6b12046ff5664fbf5d35bcaf54171b82d813c2458
-  data.tar.gz: cd673dab2a53c62e1103cdc5bba16ccecc7b2fe185247bd9593b774738de2341
+  metadata.gz: db7c1b9e7e3c11a49107722bc5493279ecd54ad5b82d01bc9458c15b8f94628d
+  data.tar.gz: 8d830a0cb96c6e9437d4433a380677bad41dae15d8e7a01b238c37ac85d31d2f
 SHA512:
-  metadata.gz: 841c15efa8d3a99bc248058a01f6c644d5a16302fb964317576bc6fb2e71ad0aa47fc907961821144b5d168ba4dfdfd85d30701a8650532d04fbfdf917e6cf4b
-  data.tar.gz: 2471c1d1c366136312aac9c3b83a1e669400157da6a3e11437966e151f53d0ae5b449b5f4a1e4b513cd802da07d6ab2a92417cc544e9ab93a798e67f59f7e73a
+  metadata.gz: 8644d21c6ade08e05538ef1d237945b44fe87a58ea9301f3150423769c1dde523c8a9e1cae19f3f218df27349db1e5551ca95300ef32bc920473b70ad859d905
+  data.tar.gz: 9a27ba15d8ec9a51922628bc4851016f41fa7efd24f998e129fa3e36b09791b03fc23a05fa9ee0fbe8a3a30b0b8abbd9717927fd378d931342c29f6c058a6107

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.0.0-beta2 (prerelease)
+- [IMPROVEMENT] Better support for GraphQL versions >= 2.0.18.
+
 ## 6.0.0-beta (prerelease)
 - [BREAKING] End support for Ruby 2.6
 - The following libraries are no longer tested and are not guaranteed to work with Skylight 6:
@@ -11,6 +14,8 @@
   responder (like a Rails router), Skylight will not set the endpoint name after exception processing has started.
   This means that error traces will now be aggregated under the original endpoint that generated the error (but with
   the 'error' segment), rather than under the exception handler's controller and action name.
+- [IMPROVEMENT] (Once again) Provide native support for FreeBSD.
+- [BUGFIX] Fix an issue in which the daemon could time out if the processes file descriptor count was set very high (e.g. on Heroku's Performance dynos)
 
 ## 5.3.4 (October 17, 2022)
 

data/lib/skylight/probes/graphql.rb

@@ -11,20 +11,67 @@ module Skylight
 
           return unless defined?(@tracers)
 
+          # This is the legacy tracing used in graphql =< 2.0.17
           unless @tracers.include?(::GraphQL::Tracing::ActiveSupportNotificationsTracing)
             @tracers << ::GraphQL::Tracing::ActiveSupportNotificationsTracing
           end
         end
       end
 
+      module InstrumentationV2
+        def self.included(base)
+          base.singleton_class.prepend ClassMethods
+        end
+
+        # GraphQL versions 2.0.18 - 2.0.21 (or higher?) were missing this notification
+        module ExecuteMultiplexNotification
+          def execute_multiplex(**metadata, &blk)
+            if @notifications_engine
+              @notifications_engine.instrument("execute_multiplex.graphql", metadata, &blk)
+            else
+              # safety fallback in case graphql's authors unexpectedly rename @notifications_engine
+              super
+            end
+          end
+        end
+
+        module ClassMethods
+          def new_trace(*, **)
+            unless @__sk_instrumentation_installed
+              trace_with(::GraphQL::Tracing::ActiveSupportNotificationsTrace)
+
+              unless ::GraphQL::Tracing::ActiveSupportNotificationsTrace.instance_methods.include?(:execute_multiplex)
+                trace_with(ExecuteMultiplexNotification)
+              end
+
+              @__sk_instrumentation_installed = true
+            end
+
+            super
+          end
+        end
+      end
+
       class Probe
         def install
-          tracing_klass_name = "::GraphQL::Tracing::ActiveSupportNotificationsTracing"
-          klasses_to_probe = %w[::GraphQL::Execution::Multiplex ::GraphQL::Query]
+          new_tracing = false
+          begin
+            require "graphql/tracing/active_support_notifications_trace"
+            new_tracing = true
+          rescue LoadError # rubocop:disable Lint/SuppressedException
+          end
+
+          if new_tracing
+            # GraphQL >= 2.0.18
+            ::GraphQL::Schema.include(InstrumentationV2)
+          else
+            tracing_klass_name = "::GraphQL::Tracing::ActiveSupportNotificationsTracing"
+            klasses_to_probe = %w[::GraphQL::Execution::Multiplex ::GraphQL::Query]
 
-          return unless ([tracing_klass_name] + klasses_to_probe).all?(&method(:safe_constantize))
+            return unless ([tracing_klass_name] + klasses_to_probe).all?(&method(:safe_constantize))
 
-          klasses_to_probe.each { |klass_name| safe_constantize(klass_name).prepend(Instrumentation) }
+            klasses_to_probe.each { |klass_name| safe_constantize(klass_name).prepend(Instrumentation) }
+          end
         end
 
         def safe_constantize(klass_name)

data/lib/skylight/version.rb

@@ -3,5 +3,5 @@ module Skylight
   # for compatibility with semver when it is parsed by the rust agent.
   # This string will be transformed in the gemspec to "5.0.0.alpha"
   # to conform with rubygems.
-  VERSION = "6.0.0-beta".freeze
+  VERSION = "6.0.0-beta2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta
+  version: 6.0.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport