diff --git a/lib/skylight/normalizers/graphql/base.rb b/lib/skylight/normalizers/graphql/base.rb index bc132b4f..79ffcd2b 100644 --- a/lib/skylight/normalizers/graphql/base.rb +++ b/lib/skylight/normalizers/graphql/base.rb @@ -66,17 +66,11 @@ class Execute < Base # to be used for graphql >= 2.5 # def normalize(trace, name, payload) - if payload[:query] - _execute_query_normalize(trace, name, payload) - else - [CAT, "graphql.#{key}", nil] - end + payload[:query] ? _execute_query_normalize(trace, name, payload) : [CAT, "graphql.#{key}", nil] end def normalize_after(trace, span, name, payload) - if payload[:multiplex] - _execute_multiplex_normalize_after(trace, span, name, payload) - end + _execute_multiplex_normalize_after(trace, span, name, payload) if payload[:multiplex] end private diff --git a/lib/skylight/probes/graphql.rb b/lib/skylight/probes/graphql.rb index 129e660e..9e6e19f3 100644 --- a/lib/skylight/probes/graphql.rb +++ b/lib/skylight/probes/graphql.rb @@ -64,7 +64,7 @@ def execute_query_lazy(**metadata, &blk) end # GraphQL versions >= 2.5 are missing this notification - module AnalyzeQueryNotification + module AnalyzeQueryNotification def analyze_query(**metadata, &blk) if @notifications_engine @notifications_engine.instrument("analyze_query.graphql", metadata, &blk) @@ -76,7 +76,7 @@ def analyze_query(**metadata, &blk) end end end - + module ClassMethods def new_trace(*, **) unless @__sk_instrumentation_installed diff --git a/spec/integration/graphql_spec.rb b/spec/integration/graphql_spec.rb index 2ef505c3..4e689389 100644 --- a/spec/integration/graphql_spec.rb +++ b/spec/integration/graphql_spec.rb @@ -12,7 +12,7 @@ if enable def graphql_2_5? - GraphQL::VERSION >= Gem::Version.new("2.5.0") + Gem::Version.new("2.5.0") <= GraphQL::VERSION end def multiplex_event