Skip to content

Commit b277ad3

Browse files
authored
Merge pull request #493 from skylightio/fix-lint
Fix linting issues
2 parents 9795587 + 34461b7 commit b277ad3

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

lib/skylight/normalizers/graphql/base.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,11 @@ class Execute < Base
6666
# to be used for graphql >= 2.5
6767
#
6868
def normalize(trace, name, payload)
69-
if payload[:query]
70-
_execute_query_normalize(trace, name, payload)
71-
else
72-
[CAT, "graphql.#{key}", nil]
73-
end
69+
payload[:query] ? _execute_query_normalize(trace, name, payload) : [CAT, "graphql.#{key}", nil]
7470
end
7571

7672
def normalize_after(trace, span, name, payload)
77-
if payload[:multiplex]
78-
_execute_multiplex_normalize_after(trace, span, name, payload)
79-
end
73+
_execute_multiplex_normalize_after(trace, span, name, payload) if payload[:multiplex]
8074
end
8175

8276
private

lib/skylight/probes/graphql.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def execute_query_lazy(**metadata, &blk)
6464
end
6565

6666
# GraphQL versions >= 2.5 are missing this notification
67-
module AnalyzeQueryNotification
67+
module AnalyzeQueryNotification
6868
def analyze_query(**metadata, &blk)
6969
if @notifications_engine
7070
@notifications_engine.instrument("analyze_query.graphql", metadata, &blk)
@@ -76,7 +76,7 @@ def analyze_query(**metadata, &blk)
7676
end
7777
end
7878
end
79-
79+
8080
module ClassMethods
8181
def new_trace(*, **)
8282
unless @__sk_instrumentation_installed

spec/integration/graphql_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
if enable
1414
def graphql_2_5?
15-
GraphQL::VERSION >= Gem::Version.new("2.5.0")
15+
Gem::Version.new("2.5.0") <= GraphQL::VERSION
1616
end
1717

1818
def multiplex_event

0 commit comments

Comments
 (0)