skylight-core 4.2.0.beta → 4.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7836c1098f49c2f7b0f8581656367354e1ccec3c148f593a96df4deef011e9c9
-  data.tar.gz: 390b30be3374c7bcb827806c230d36772a96bef0f5692c83a2730d4face3f162
+  metadata.gz: 34c416285f52795281bbd430f70367601d861b0af6f1b159ea4815aafa612016
+  data.tar.gz: 9a2608e5e0285a90ba5531a0200e3621611cca52034e2ab717564205d4583839
 SHA512:
-  metadata.gz: ab419f49f172e95c075796d849ad643eb84032a98fe392b38101d93a3c6a7c2477d381f224752b0ae20ad607a7f883fdcbda4485f34f03e2ffaace66a8c1e18b
-  data.tar.gz: f1db03e7f479a3853036f6c7d3f94b7081cd5545cf4286d83393f8b19ff4e350f29cd91a869d93f0cb505d8a22dd4439165f477c27290aa5ce14b13649dc34f0
+  metadata.gz: 755507e9ef7779f9dc1062c1a0fe8d934510a41fd01813f5389fee8c2f0fb5803dccc5da73536dd65a5ac5c1b87fe25622e71faa25a76d952bc4d762dbfff67f
+  data.tar.gz: 43ad79dbd48363114759634112dcacfbe770cbaa00827cb0277a586d67154952efe47242304e4f68a6f053e59d6819189272c4c48f9c552c78b22e4d07b52954

data/lib/skylight/core/config.rb

@@ -36,6 +36,7 @@ module Skylight::Core
         # == Instrumenter ==
         "ENABLE_SEGMENTS" => :enable_segments,
         "ENABLE_SIDEKIQ" => :enable_sidekiq,
+        "SINATRA_ROUTE_PREFIXES" => :sinatra_route_prefixes,
 
         # == User config settings ==
         "USER_CONFIG_PATH" => :user_config_path,
@@ -54,6 +55,7 @@ module Skylight::Core
         log_sql_parse_errors:     true,
         enable_segments:          true,
         enable_sidekiq:           false,
+        sinatra_route_prefixes:   false,
         'heroku.dyno_info_path':  "/etc/heroku/dyno"
       }
     end
@@ -411,6 +413,10 @@ module Skylight::Core
       !!get(:enable_sidekiq)
     end
 
+    def sinatra_route_prefixes?
+      !!get(:sinatra_route_prefixes)
+    end
+
     def user_config
       @user_config ||= UserConfig.new(self)
     end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Skylight::Core
+  module Probes
+    module GraphQL
+      class Probe
+        def install
+          ::GraphQL::Schema.class_eval do
+            alias_method :multiplex_without_sk, :multiplex
+
+            # Schema#execute also delegates to multiplex, so this is the only method
+            # we need to override.
+            def multiplex(*args, &block)
+              sk_add_tracer
+              multiplex_without_sk(*args, &block)
+            end
+
+            def sk_add_tracer
+              Skylight::Core::Config::MUTEX.synchronize do
+                graphql_tracer = ::GraphQL::Tracing::ActiveSupportNotificationsTracing
+                unless tracers.include?(graphql_tracer)
+                  $stdout.puts "[SKYLIGHT::CORE] Adding tracer 'GraphQL::Tracing::ActiveSupportNotificationsTracing' to schema"
+                  tracers << graphql_tracer
+                end
+
+                class << self
+                  # Remove the probe and reset multiplex/execute to original version
+                  # after the tracer has been added
+                  alias_method :multiplex, :multiplex_without_sk
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register(:graphql, "GraphQL", "graphql", GraphQL::Probe.new)
+  end
+end

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

@@ -36,8 +36,18 @@ module Skylight::Core
               dispatch_without_sk!(*args, &block).tap do
                 Skylight::Core::Fanout.each_trace do |trace|
                   # Set the endpoint name to the route name
-                  route = env["sinatra.route"]
-                  trace.endpoint = route if route
+                  if (route = env["sinatra.route"])
+                    # Include the app's mount point (if available)
+                    script_name = trace.instrumenter.config.sinatra_route_prefixes? && env["SCRIPT_NAME"]
+
+                    trace.endpoint =
+                      if script_name && !script_name.empty?
+                        verb, path = route.split(" ", 2)
+                        "#{verb} [#{script_name}]#{path}"
+                      else
+                        route
+                      end
+                  end
                 end
               end
             end

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.2.0-beta".freeze
+    VERSION = "4.2.0-beta2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta
+  version: 4.2.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,6 +224,7 @@ files:
 - lib/skylight/core/probes/excon/middleware.rb
 - lib/skylight/core/probes/faraday.rb
 - lib/skylight/core/probes/grape.rb
+- lib/skylight/core/probes/graphql.rb
 - lib/skylight/core/probes/httpclient.rb
 - lib/skylight/core/probes/middleware.rb
 - lib/skylight/core/probes/mongo.rb