opentelemetry-instrumentation-trilogy 0.61.0 → 0.61.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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/lib/opentelemetry/instrumentation/trilogy/version.rb +1 -1
  4. data/lib/opentelemetry/instrumentation/trilogy.rb +2 -39
  5. metadata +15 -197
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6414c052924b2888a7c4bb16cae1ad367bb24559dc3fd5743ff3001329714565
4
- data.tar.gz: a09745e9e18a84c380ba7405f2fd5bb18b82b8511231f8607c253ccf03b773e7
3
+ metadata.gz: 5471effd351bcb3bb34832e63e26f708a60096a2c97100a68d58fff3e7a364e5
4
+ data.tar.gz: e09280ef3b38110fe75b493d24d4fde3c55ff25ff675822eec736582ac75d5b1
5
5
  SHA512:
6
- metadata.gz: 2b00d65352342af93bce3d5660457b435a2fc47541fe7ddebf11fa02ffb52693a5ebe140aba4bb92b8239881763e55e10151bd65cda330ee3f553a289694f75d
7
- data.tar.gz: 805264e8cd63863a4ead505f3b26b46a294e9e97b07d524cc1d99497c796f43683935a4f0c98db6c566f2d7ce47406713b679c57e192b0707169dbb3af2cdd38
6
+ metadata.gz: 1c159684b412cbe5d6388f33c9477b9d886b11b062f5ed3f7531bfd9830361d0839c6fb5a653e6511b7b0c02ea98fc98773a273e4acd6fd3743c5fa0a7005279
7
+ data.tar.gz: 12a45d9f109518d1e2f3865da2efcf959f616e6717de2723715cd8d64dd673155939b7ece668045d0cc6837470fe5ee5660b29dd666c8df4b3742cc78e9cbc83
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Release History: opentelemetry-instrumentation-trilogy
2
2
 
3
+ ### v0.61.1 / 2025-04-16
4
+
5
+ * refactor: Use SQL helpers for context attributes #1271
6
+
3
7
  ### v0.61.0 / 2025-01-16
4
8
 
5
9
  * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
data/lib/opentelemetry/instrumentation/trilogy/version.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  module OpenTelemetry
8
8
  module Instrumentation
9
9
  module Trilogy
10
- VERSION = '0.61.0'
10
+ VERSION = '0.61.1'
11
11
  end
12
12
  end
13
13
  end
data/lib/opentelemetry/instrumentation/trilogy.rb CHANGED
@@ -6,50 +6,13 @@
6
6
 
7
7
  require 'opentelemetry'
8
8
  require 'opentelemetry-instrumentation-base'
9
+ require 'opentelemetry-helpers-sql'
9
10
 
10
11
  module OpenTelemetry
11
12
  module Instrumentation
12
13
  # Contains the OpenTelemetry instrumentation for the Trilogy gem
13
14
  module Trilogy
14
- extend self
15
-
16
- CURRENT_ATTRIBUTES_KEY = Context.create_key('trilogy-attributes-hash')
17
-
18
- private_constant :CURRENT_ATTRIBUTES_KEY
19
-
20
- # Returns the attributes hash representing the Trilogy context found
21
- # in the optional context or the current context if none is provided.
22
- #
23
- # @param [optional Context] context The context to lookup the current
24
- # attributes hash. Defaults to Context.current
25
- def attributes(context = nil)
26
- context ||= Context.current
27
- context.value(CURRENT_ATTRIBUTES_KEY) || {}
28
- end
29
-
30
- # Returns a context containing the merged attributes hash, derived from the
31
- # optional parent context, or the current context if one was not provided.
32
- #
33
- # @param [optional Context] context The context to use as the parent for
34
- # the returned context
35
- def context_with_attributes(attributes_hash, parent_context: Context.current)
36
- attributes_hash = attributes(parent_context).merge(attributes_hash)
37
- parent_context.set_value(CURRENT_ATTRIBUTES_KEY, attributes_hash)
38
- end
39
-
40
- # Activates/deactivates the merged attributes hash within the current Context,
41
- # which makes the "current attributes hash" available implicitly.
42
- #
43
- # On exit, the attributes hash that was active before calling this method
44
- # will be reactivated.
45
- #
46
- # @param [Span] span the span to activate
47
- # @yield [Hash, Context] yields attributes hash and a context containing the
48
- # attributes hash to the block.
49
- def with_attributes(attributes_hash)
50
- attributes_hash = attributes.merge(attributes_hash)
51
- Context.with_value(CURRENT_ATTRIBUTES_KEY, attributes_hash) { |c, h| yield h, c }
52
- end
15
+ extend ::OpenTelemetry::Helpers::Sql
53
16
  end
54
17
  end
55
18
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opentelemetry-instrumentation-trilogy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.61.0
4
+ version: 0.61.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: 2025-01-16 00:00:00.000000000 Z
11
+ date: 2025-04-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opentelemetry-api
@@ -39,7 +39,7 @@ dependencies:
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: opentelemetry-helpers-sql-obfuscation
42
+ name: opentelemetry-helpers-sql
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
@@ -53,139 +53,13 @@ dependencies:
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
- name: opentelemetry-instrumentation-base
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: 0.23.0
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: 0.23.0
69
- - !ruby/object:Gem::Dependency
70
- name: opentelemetry-semantic_conventions
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- version: 1.8.0
76
- type: :runtime
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- version: 1.8.0
83
- - !ruby/object:Gem::Dependency
84
- name: appraisal
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - "~>"
88
- - !ruby/object:Gem::Version
89
- version: '2.5'
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - "~>"
95
- - !ruby/object:Gem::Version
96
- version: '2.5'
97
- - !ruby/object:Gem::Dependency
98
- name: bundler
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - "~>"
102
- - !ruby/object:Gem::Version
103
- version: '2.4'
104
- type: :development
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - "~>"
109
- - !ruby/object:Gem::Version
110
- version: '2.4'
111
- - !ruby/object:Gem::Dependency
112
- name: minitest
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - "~>"
116
- - !ruby/object:Gem::Version
117
- version: '5.0'
118
- type: :development
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - "~>"
123
- - !ruby/object:Gem::Version
124
- version: '5.0'
125
- - !ruby/object:Gem::Dependency
126
- name: opentelemetry-propagator-vitess
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - "~>"
130
- - !ruby/object:Gem::Version
131
- version: '0.1'
132
- type: :development
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - "~>"
137
- - !ruby/object:Gem::Version
138
- version: '0.1'
139
- - !ruby/object:Gem::Dependency
140
- name: opentelemetry-sdk
141
- requirement: !ruby/object:Gem::Requirement
142
- requirements:
143
- - - "~>"
144
- - !ruby/object:Gem::Version
145
- version: '1.1'
146
- type: :development
147
- prerelease: false
148
- version_requirements: !ruby/object:Gem::Requirement
149
- requirements:
150
- - - "~>"
151
- - !ruby/object:Gem::Version
152
- version: '1.1'
153
- - !ruby/object:Gem::Dependency
154
- name: opentelemetry-test-helpers
155
- requirement: !ruby/object:Gem::Requirement
156
- requirements:
157
- - - "~>"
158
- - !ruby/object:Gem::Version
159
- version: '0.3'
160
- type: :development
161
- prerelease: false
162
- version_requirements: !ruby/object:Gem::Requirement
163
- requirements:
164
- - - "~>"
165
- - !ruby/object:Gem::Version
166
- version: '0.3'
167
- - !ruby/object:Gem::Dependency
168
- name: pry
169
- requirement: !ruby/object:Gem::Requirement
170
- requirements:
171
- - - ">="
172
- - !ruby/object:Gem::Version
173
- version: '0'
174
- type: :development
175
- prerelease: false
176
- version_requirements: !ruby/object:Gem::Requirement
177
- requirements:
178
- - - ">="
179
- - !ruby/object:Gem::Version
180
- version: '0'
181
- - !ruby/object:Gem::Dependency
182
- name: pry-byebug
56
+ name: opentelemetry-helpers-sql-obfuscation
183
57
  requirement: !ruby/object:Gem::Requirement
184
58
  requirements:
185
59
  - - ">="
186
60
  - !ruby/object:Gem::Version
187
61
  version: '0'
188
- type: :development
62
+ type: :runtime
189
63
  prerelease: false
190
64
  version_requirements: !ruby/object:Gem::Requirement
191
65
  requirements:
@@ -193,89 +67,33 @@ dependencies:
193
67
  - !ruby/object:Gem::Version
194
68
  version: '0'
195
69
  - !ruby/object:Gem::Dependency
196
- name: rake
70
+ name: opentelemetry-instrumentation-base
197
71
  requirement: !ruby/object:Gem::Requirement
198
72
  requirements:
199
73
  - - "~>"
200
74
  - !ruby/object:Gem::Version
201
- version: '13.0'
202
- type: :development
75
+ version: 0.23.0
76
+ type: :runtime
203
77
  prerelease: false
204
78
  version_requirements: !ruby/object:Gem::Requirement
205
79
  requirements:
206
80
  - - "~>"
207
81
  - !ruby/object:Gem::Version
208
- version: '13.0'
82
+ version: 0.23.0
209
83
  - !ruby/object:Gem::Dependency
210
- name: rspec-mocks
84
+ name: opentelemetry-semantic_conventions
211
85
  requirement: !ruby/object:Gem::Requirement
212
86
  requirements:
213
87
  - - ">="
214
88
  - !ruby/object:Gem::Version
215
- version: '0'
216
- type: :development
89
+ version: 1.8.0
90
+ type: :runtime
217
91
  prerelease: false
218
92
  version_requirements: !ruby/object:Gem::Requirement
219
93
  requirements:
220
94
  - - ">="
221
95
  - !ruby/object:Gem::Version
222
- version: '0'
223
- - !ruby/object:Gem::Dependency
224
- name: rubocop
225
- requirement: !ruby/object:Gem::Requirement
226
- requirements:
227
- - - "~>"
228
- - !ruby/object:Gem::Version
229
- version: 1.69.1
230
- type: :development
231
- prerelease: false
232
- version_requirements: !ruby/object:Gem::Requirement
233
- requirements:
234
- - - "~>"
235
- - !ruby/object:Gem::Version
236
- version: 1.69.1
237
- - !ruby/object:Gem::Dependency
238
- name: rubocop-performance
239
- requirement: !ruby/object:Gem::Requirement
240
- requirements:
241
- - - "~>"
242
- - !ruby/object:Gem::Version
243
- version: 1.23.0
244
- type: :development
245
- prerelease: false
246
- version_requirements: !ruby/object:Gem::Requirement
247
- requirements:
248
- - - "~>"
249
- - !ruby/object:Gem::Version
250
- version: 1.23.0
251
- - !ruby/object:Gem::Dependency
252
- name: simplecov
253
- requirement: !ruby/object:Gem::Requirement
254
- requirements:
255
- - - "~>"
256
- - !ruby/object:Gem::Version
257
- version: 0.17.1
258
- type: :development
259
- prerelease: false
260
- version_requirements: !ruby/object:Gem::Requirement
261
- requirements:
262
- - - "~>"
263
- - !ruby/object:Gem::Version
264
- version: 0.17.1
265
- - !ruby/object:Gem::Dependency
266
- name: yard
267
- requirement: !ruby/object:Gem::Requirement
268
- requirements:
269
- - - "~>"
270
- - !ruby/object:Gem::Version
271
- version: '0.9'
272
- type: :development
273
- prerelease: false
274
- version_requirements: !ruby/object:Gem::Requirement
275
- requirements:
276
- - - "~>"
277
- - !ruby/object:Gem::Version
278
- version: '0.9'
96
+ version: 1.8.0
279
97
  description: Adds auto instrumentation that includes SQL metadata
280
98
  email:
281
99
  - cncf-opentelemetry-contributors@lists.cncf.io
@@ -297,10 +115,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
297
115
  licenses:
298
116
  - Apache-2.0
299
117
  metadata:
300
- changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.61.0/file/CHANGELOG.md
118
+ changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.61.1/file/CHANGELOG.md
301
119
  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/trilogy
302
120
  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
303
- documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.61.0
121
+ documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.61.1
304
122
  post_install_message:
305
123
  rdoc_options: []
306
124
  require_paths: