skylight-core 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98240d4732a290ffb184fdc3b682f74fd167eb6061558febaef8139ac6aa4fd3
-  data.tar.gz: 81099a9f8a59907ebf44024645f537fca06b2e758ec65ca68253046b1d4a90e5
+  metadata.gz: b967f11a876f41f4337a88fce73301993cf3160f862186b64a7d03a931b5ccb6
+  data.tar.gz: b33c7c1ecbfab7545ea7efdbb691371bc35a0f90ef786c8fb8a60e3db9f7a8a8
 SHA512:
-  metadata.gz: 82b46e299d48abd8d2cb5ff4a543d324145cd55a8c2b9d9fd8413a0738aedc111bb0979f1b989aabbae2b9b894cf0b98c1f1b701390146519674165bedbe7736
-  data.tar.gz: 7ff7cc95fef0289039a7b2df226d0bfafcb0c9cbca53d2cbd89099c19b9a735806e2701747f002252ad387e666029718639d9001c8be3cf13abd8816ab1450cd
+  metadata.gz: '0285603cf5bdd82f8cfa8c9e0f3c54569b8e46051ccd16926e14498e024e5b92c9432b150422285625eee6b359aa46c036e483bda9a0cd7cf1dfd94edcc0d530'
+  data.tar.gz: 27fdc7636b44ddaece0b205e425a6546b5ef39ad0671a1719983b8133825940bded7c711abf5631eab83326c79fbd20adb0925c41aa934155670487cc5c4bb7a

data/lib/skylight/core/normalizers/grape/endpoint.rb

@@ -25,7 +25,8 @@ module Skylight::Core
           end
 
           def get_namespace(endpoint)
-            ::Grape::Namespace.joined_space(endpoint.namespace_stackable(:namespace))
+            # slice off preceding slash for data continuity
+            ::Grape::Namespace.joined_space_path(endpoint.namespace_stackable(:namespace)).to_s[1..-1]
           end
       end
     end

data/lib/skylight/core/normalizers/graphql/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/inflector"
+
 module Skylight::Core::Normalizers::GraphQL
   # Some AS::N events in GraphQL are not super useful.
   # We are purposefully ignoring the following keys (and you probably shouldn't add them):
@@ -22,7 +24,12 @@ module Skylight::Core::Normalizers::GraphQL
     end
 
     def self.inherited(klass)
-      klass.const_set(:KEY, klass.name.demodulize.underscore.freeze)
+      klass.const_set(
+        :KEY,
+        ActiveSupport::Inflector.underscore(
+          ActiveSupport::Inflector.demodulize(klass.name)
+        ).freeze
+      )
     end
 
     def self.key
@@ -38,6 +45,12 @@ module Skylight::Core::Normalizers::GraphQL
       def key
         self.class.key
       end
+
+      def extract_query_name(query)
+        query&.context&.[](:skylight_endpoint) ||
+          query&.operation_name ||
+          ANONYMOUS
+      end
   end
 
   class Lex < Base
@@ -69,7 +82,7 @@ module Skylight::Core::Normalizers::GraphQL
       # has not been done yet at the point where execute_multiplex starts.
       # [1] https://graphql.org/learn/serving-over-http/#post-request
       queries, has_errors = payload[:multiplex].queries.each_with_object([Set.new, Set.new]) do |query, (names, errors)|
-        names << (query.operation_name || ANONYMOUS)
+        names << extract_query_name(query)
         errors << query.static_errors.any?
       end
 
@@ -90,7 +103,7 @@ module Skylight::Core::Normalizers::GraphQL
     register_graphql
 
     def normalize(trace, _name, payload)
-      query_name = payload[:query]&.operation_name || ANONYMOUS
+      query_name = extract_query_name(payload[:query])
 
       if query_name == ANONYMOUS
         meta = { mute_children: true }

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.2.3".freeze
+    VERSION = "4.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport