opentelemetry-instrumentation-graphql 0.20.0 → 0.21.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +9 -0
  3. data/README.md +2 -2
  4. data/lib/opentelemetry/instrumentation/graphql/instrumentation.rb +8 -0
  5. data/lib/opentelemetry/instrumentation/graphql/tracers/graphql_tracer.rb +5 -5
  6. data/lib/opentelemetry/instrumentation/graphql/version.rb +1 -1
  7. metadata +25 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 73e66f5c3fb1f9820bd1f24648e9de53152ba79255a7c3d3c92089e5de3e46e8
4
- data.tar.gz: 75a2d7da79f38c155e134a2daed0a901f59bc5da30d1e135f7d35c2a3984cafa
3
+ metadata.gz: 6933e85196eaf2f0f93f7c8d86e7713c0d56fecb2035eded886357c7c2d9579b
4
+ data.tar.gz: f6d5f32f7c34453c7effc96a97451c75ccefe259b3d1ff2ea89616fd09353902
5
5
  SHA512:
6
- metadata.gz: b780153de8b5d7848b07fc9b85cb318c12b2f8f6070736828e9af72f553b384ce7fefc4f09a412ed51b88e73555d4fa8cf8608e71404d0264525b064f7db1396
7
- data.tar.gz: d6ca0979af86131a8adbd00db0f5a4767e8375d87dff12ce8e8e124af62acf8bc180ffafa11ec92c800189bfa87756e25b4f9173f4ca44b2c26e6e1f3ccd8384
6
+ metadata.gz: 6e680d4a2f2e8d8b5c0dc9b011dd38fbb289b4c5c82af79b19ed5a4a415367fd8df8be013cfee0e69cca4d5b53a7066c2aeaa9063ef8b29798d58bb43792cf05
7
+ data.tar.gz: 925f99580cdf0eeaa21a5f9613df6d7a6722ae774a6284b7b31e93915829da959857741a8104d1573a649691af839e80bc8276bd3352e631830ce7a03007f810
data/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # Release History: opentelemetry-instrumentation-graphql
2
2
 
3
+ ### v0.21.1 / 2023-01-14
4
+
5
+ * DOCS: Fix gem homepage
6
+ * DOCS: More gem documentation fixes
7
+
8
+ ### v0.21.0 / 2022-07-12
9
+
10
+ * FIXED: Use semantic graphql attribute names
11
+
3
12
  ### v0.20.0 / 2022-06-09
4
13
 
5
14
  * Upgrading Base dependency version
data/README.md CHANGED
@@ -55,7 +55,7 @@ end
55
55
 
56
56
  ## Examples
57
57
 
58
- An example of usage can be seen in [`example/graphql.rb`](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/graphql/example/graphql.rb).
58
+ An example of usage can be seen in [`example/graphql.rb`](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/graphql/example/graphql.rb).
59
59
 
60
60
  ## How can I get involved?
61
61
 
@@ -70,7 +70,7 @@ The `opentelemetry-instrumentation-graphql` gem is distributed under the Apache
70
70
  [graphql-home]: https://github.com/rmosolgo/graphql-ruby
71
71
  [bundler-home]: https://bundler.io
72
72
  [repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
73
- [license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
73
+ [license-github]: https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/LICENSE
74
74
  [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
75
75
  [community-meetings]: https://github.com/open-telemetry/community#community-meetings
76
76
  [discussions-url]: https://github.com/open-telemetry/opentelemetry-ruby/discussions
data/lib/opentelemetry/instrumentation/graphql/instrumentation.rb CHANGED
@@ -11,6 +11,10 @@ module OpenTelemetry
11
11
  module GraphQL
12
12
  # The Instrumentation class contains logic to detect and install the GraphQL instrumentation
13
13
  class Instrumentation < OpenTelemetry::Instrumentation::Base
14
+ compatible do
15
+ gem_version < Gem::Version.new('3.0.0')
16
+ end
17
+
14
18
  install do |config|
15
19
  require_dependencies
16
20
  install_tracer(config)
@@ -41,6 +45,10 @@ module OpenTelemetry
41
45
 
42
46
  private
43
47
 
48
+ def gem_version
49
+ Gem::Version.new(::GraphQL::VERSION)
50
+ end
51
+
44
52
  def require_dependencies
45
53
  require_relative 'tracers/graphql_tracer'
46
54
  end
data/lib/opentelemetry/instrumentation/graphql/tracers/graphql_tracer.rb CHANGED
@@ -24,12 +24,12 @@ module OpenTelemetry
24
24
  'execute_multiplex' => 'graphql.execute_multiplex'
25
25
  }
26
26
 
27
- def platform_trace(platform_key, key, data)
27
+ def platform_trace(platform_key, key, data) # rubocop:disable Metrics/CyclomaticComplexity
28
28
  return yield if platform_key.nil?
29
29
 
30
30
  tracer.in_span(platform_key, attributes: attributes_for(key, data)) do |span|
31
31
  yield.tap do |response|
32
- errors = response[:errors]&.compact&.map { |e| e.to_h }&.to_json if key == 'validate'
32
+ errors = response[:errors]&.compact&.map(&:to_h)&.to_json if key == 'validate'
33
33
  unless errors.nil?
34
34
  span.add_event(
35
35
  'graphql.validation.error',
@@ -74,9 +74,9 @@ module OpenTelemetry
74
74
  attributes = {}
75
75
  case key
76
76
  when 'execute_query'
77
- attributes['selected_operation_name'] = data[:query].selected_operation_name if data[:query].selected_operation_name
78
- attributes['selected_operation_type'] = data[:query].selected_operation.operation_type
79
- attributes['query_string'] = data[:query].query_string
77
+ attributes['graphql.operation.name'] = data[:query].selected_operation_name if data[:query].selected_operation_name
78
+ attributes['graphql.operation.type'] = data[:query].selected_operation.operation_type
79
+ attributes['graphql.document'] = data[:query].query_string
80
80
  end
81
81
  attributes
82
82
  end
data/lib/opentelemetry/instrumentation/graphql/version.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  module OpenTelemetry
8
8
  module Instrumentation
9
9
  module GraphQL
10
- VERSION = '0.20.0'
10
+ VERSION = '0.21.1'
11
11
  end
12
12
  end
13
13
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opentelemetry-instrumentation-graphql
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.20.0
4
+ version: 0.21.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenTelemetry Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-09 00:00:00.000000000 Z
11
+ date: 2023-01-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opentelemetry-api
@@ -56,30 +56,36 @@ dependencies:
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '1.17'
61
+ version: '2.4'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '1.17'
68
+ version: '2.4'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: graphql
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
+ - !ruby/object:Gem::Version
75
+ version: 1.9.0
76
+ - - "<"
74
77
  - !ruby/object:Gem::Version
75
- version: '1.11'
78
+ version: 3.0.0
76
79
  type: :development
77
80
  prerelease: false
78
81
  version_requirements: !ruby/object:Gem::Requirement
79
82
  requirements:
80
- - - "~>"
83
+ - - ">="
84
+ - !ruby/object:Gem::Version
85
+ version: 1.9.0
86
+ - - "<"
81
87
  - !ruby/object:Gem::Version
82
- version: '1.11'
88
+ version: 3.0.0
83
89
  - !ruby/object:Gem::Dependency
84
90
  name: minitest
85
91
  requirement: !ruby/object:Gem::Requirement
@@ -128,28 +134,28 @@ dependencies:
128
134
  requirements:
129
135
  - - "~>"
130
136
  - !ruby/object:Gem::Version
131
- version: 12.3.3
137
+ version: '13.0'
132
138
  type: :development
133
139
  prerelease: false
134
140
  version_requirements: !ruby/object:Gem::Requirement
135
141
  requirements:
136
142
  - - "~>"
137
143
  - !ruby/object:Gem::Version
138
- version: 12.3.3
144
+ version: '13.0'
139
145
  - !ruby/object:Gem::Dependency
140
146
  name: rubocop
141
147
  requirement: !ruby/object:Gem::Requirement
142
148
  requirements:
143
149
  - - "~>"
144
150
  - !ruby/object:Gem::Version
145
- version: 0.73.0
151
+ version: 1.41.1
146
152
  type: :development
147
153
  prerelease: false
148
154
  version_requirements: !ruby/object:Gem::Requirement
149
155
  requirements:
150
156
  - - "~>"
151
157
  - !ruby/object:Gem::Version
152
- version: 0.73.0
158
+ version: 1.41.1
153
159
  - !ruby/object:Gem::Dependency
154
160
  name: simplecov
155
161
  requirement: !ruby/object:Gem::Requirement
@@ -223,14 +229,14 @@ files:
223
229
  - lib/opentelemetry/instrumentation/graphql/instrumentation.rb
224
230
  - lib/opentelemetry/instrumentation/graphql/tracers/graphql_tracer.rb
225
231
  - lib/opentelemetry/instrumentation/graphql/version.rb
226
- homepage: https://github.com/open-telemetry/opentelemetry-ruby
232
+ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
227
233
  licenses:
228
234
  - Apache-2.0
229
235
  metadata:
230
- changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-graphql/v0.20.0/file.CHANGELOG.html
231
- source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/graphql
232
- bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
233
- documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-graphql/v0.20.0
236
+ changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.21.1/file/CHANGELOG.md
237
+ source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/graphql
238
+ bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
239
+ documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.21.1
234
240
  post_install_message:
235
241
  rdoc_options: []
236
242
  require_paths: