Skip to content

Commit a70a47f

Browse files
hannahramadanhannahramadan
committed
update stable tests
1 parent 163d30a commit a70a47f

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎instrumentation/trilogy/test/opentelemetry/instrumentation/trilogy/stable/instrumentation_test.rb‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
end
106106

107107
describe '.attributes' do
108-
let(:attributes) { { 'db.statement' => 'foobar' } }
108+
let(:attributes) { { 'db.query.text' => 'foobar' } }
109109

110110
it 'returns an empty hash by default' do
111111
_(OpenTelemetry::Instrumentation::Trilogy.attributes).must_equal({})
@@ -139,7 +139,7 @@
139139

140140
_(span.name).must_equal 'select'
141141
_(span.attributes['db.namespace']).must_equal(database)
142-
_(span.attributes['db.system.name']).must_equal 'mysql'
142+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
143143
_(span.attributes['db.query.text']).must_equal 'SELECT ?'
144144
_(span.attributes['server.address']).must_equal(host)
145145
end
@@ -150,7 +150,7 @@
150150

151151
_(span.name).must_equal 'explain'
152152
_(span.attributes['db.namespace']).must_equal(database)
153-
_(span.attributes['db.system.name']).must_equal 'mysql'
153+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
154154
_(span.attributes['db.query.text']).must_equal 'EXPLAIN SELECT ?'
155155
end
156156

@@ -161,7 +161,7 @@
161161

162162
_(span.name).must_equal 'mysql'
163163
_(span.attributes['db.namespace']).must_equal(database)
164-
_(span.attributes['db.system.name']).must_equal 'mysql'
164+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
165165
_(span.attributes['db.query.text']).must_equal 'DESELECT ?'
166166
end
167167
end
@@ -174,7 +174,7 @@
174174

175175
_(span.name).must_equal 'connect'
176176
_(span.attributes['db.namespace']).must_equal(database)
177-
_(span.attributes['db.system.name']).must_equal 'mysql'
177+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
178178
_(span.attributes['server.address']).must_equal(host)
179179
end
180180
end
@@ -189,7 +189,7 @@
189189

190190
_(span.name).must_equal 'ping'
191191
_(span.attributes['db.namespace']).must_equal(database)
192-
_(span.attributes['db.system.name']).must_equal 'mysql'
192+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
193193
end
194194
end
195195

@@ -199,7 +199,7 @@
199199

200200
_(span.name).must_equal 'select'
201201
_(span.attributes['db.namespace']).must_equal(database)
202-
_(span.attributes['db.system.name']).must_equal 'mysql'
202+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
203203
_(span.attributes['db.query.text']).must_equal 'select @@hostname'
204204
_(span.attributes['server.address']).must_equal(host)
205205

@@ -209,7 +209,7 @@
209209

210210
_(last_span.name).must_equal 'select'
211211
_(span.attributes['db.namespace']).must_equal(database)
212-
_(last_span.attributes['db.system.name']).must_equal 'mysql'
212+
_(last_span.attributes['db.system.name.name']).must_equal 'mysql'
213213
_(last_span.attributes['db.query.text']).must_equal 'SELECT ?'
214214
_(last_span.attributes['server.address']).must_equal(host)
215215
end
@@ -230,7 +230,7 @@
230230

231231
_(span.name).must_equal 'select'
232232
_(span.attributes['db.namespace']).must_equal(database)
233-
_(span.attributes['db.system.name']).must_equal 'mysql'
233+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
234234
_(span.attributes['db.query.text']).must_equal 'select @@hostname'
235235
_(span.attributes['server.address']).must_match(/sock/)
236236

@@ -240,7 +240,7 @@
240240

241241
_(last_span.name).must_equal 'select'
242242
_(span.attributes['db.namespace']).must_equal(database)
243-
_(last_span.attributes['db.system.name']).must_equal 'mysql'
243+
_(last_span.attributes['db.system.name.name']).must_equal 'mysql'
244244
_(last_span.attributes['db.query.text']).must_equal 'SELECT ?'
245245
_(last_span.attributes['server.address']).wont_equal(/sock/)
246246
_(last_span.attributes['server.address']).must_equal client.connected_host
@@ -255,7 +255,7 @@
255255

256256
_(span.name).must_equal 'select'
257257
_(span.attributes['db.namespace']).must_equal(database)
258-
_(span.attributes['db.system.name']).must_equal 'mysql'
258+
_(span.attributes['db.system.name.name']).must_equal 'mysql'
259259
_(span.attributes['db.query.text']).must_equal 'SELECT INVALID'
260260

261261
_(span.status.code).must_equal(
@@ -285,7 +285,7 @@
285285
describe 'when db_statement is set to obfuscate' do
286286
let(:config) { { db_statement: :obfuscate } }
287287

288-
it 'obfuscates SQL parameters in db.statement' do
288+
it 'obfuscates SQL parameters in db.query.text' do
289289
sql = 'SELECT * from users where users.id = 1 and users.email = "[email protected]"'
290290
obfuscated_sql = 'SELECT * from users where users.id = ? and users.email = ?'
291291
expect do
@@ -296,7 +296,7 @@
296296
_(span.attributes['db.query.text']).must_equal obfuscated_sql
297297
end
298298

299-
it 'encodes invalid byte sequences for db.statement' do
299+
it 'encodes invalid byte sequences for db.query.text' do
300300
# \255 is off-limits https://en.wikipedia.org/wiki/UTF-8#Codepage_layout
301301
sql = "SELECT * from users where users.id = 1 and users.email = '[email protected]\255'"
302302
obfuscated_sql = 'SELECT * from users where users.id = ? and users.email = ?'
@@ -319,7 +319,7 @@
319319
client.query(sql)
320320
end.must_raise Trilogy::Error
321321

322-
_(span.attributes['db.statement']).must_equal obfuscated_sql
322+
_(span.attributes['db.query.text']).must_equal obfuscated_sql
323323
end
324324
end
325325
end
@@ -405,7 +405,7 @@
405405
describe 'when db_statement is set to omit' do
406406
let(:config) { { db_statement: :omit } }
407407

408-
it 'does not include SQL statement as db.statement attribute' do
408+
it 'does not include SQL statement as db.query.text attribute' do
409409
sql = 'SELECT * from users where users.id = 1 and users.email = "[email protected]"'
410410
expect do
411411
client.query(sql)
@@ -418,7 +418,7 @@
418418

419419
describe 'when db_statement is configured via environment variable' do
420420
describe 'when db_statement set as omit' do
421-
it 'omits db.statement attribute' do
421+
it 'omits db.query.text attribute' do
422422
OpenTelemetry::TestHelpers.with_env('OTEL_RUBY_INSTRUMENTATION_TRILOGY_CONFIG_OPTS' => 'db_statement=omit;') do
423423
instrumentation.instance_variable_set(:@installed, false)
424424
instrumentation.install
@@ -427,15 +427,15 @@
427427
client.query(sql)
428428
end.must_raise Trilogy::Error
429429

430-
_(span.attributes['db.system']).must_equal 'mysql'
430+
_(span.attributes['db.system.name']).must_equal 'mysql'
431431
_(span.name).must_equal 'select'
432432
_(span.attributes['db.query.text']).must_be_nil
433433
end
434434
end
435435
end
436436

437437
describe 'when db_statement set as obfuscate' do
438-
it 'obfuscates SQL parameters in db.statement' do
438+
it 'obfuscates SQL parameters in db.query.text' do
439439
OpenTelemetry::TestHelpers.with_env('OTEL_RUBY_INSTRUMENTATION_TRILOGY_CONFIG_OPTS' => 'db_statement=obfuscate;') do
440440
instrumentation.instance_variable_set(:@installed, false)
441441
instrumentation.install
@@ -446,17 +446,17 @@
446446
client.query(sql)
447447
end.must_raise Trilogy::Error
448448

449-
_(span.attributes['db.system']).must_equal 'mysql'
449+
_(span.attributes['db.system.name']).must_equal 'mysql'
450450
_(span.name).must_equal 'select'
451-
_(span.attributes['db.statement']).must_equal obfuscated_sql
451+
_(span.attributes['db.query.text']).must_equal obfuscated_sql
452452
end
453453
end
454454
end
455455

456456
describe 'when db_statement is set differently than local config' do
457457
let(:config) { { db_statement: :omit } }
458458

459-
it 'overrides local config and obfuscates SQL parameters in db.statement' do
459+
it 'overrides local config and obfuscates SQL parameters in db.query.text' do
460460
OpenTelemetry::TestHelpers.with_env('OTEL_RUBY_INSTRUMENTATION_TRILOGY_CONFIG_OPTS' => 'db_statement=obfuscate') do
461461
instrumentation.instance_variable_set(:@installed, false)
462462
instrumentation.install
@@ -467,9 +467,9 @@
467467
client.query(sql)
468468
end.must_raise Trilogy::Error
469469

470-
_(span.attributes['db.system']).must_equal 'mysql'
470+
_(span.attributes['db.system.name']).must_equal 'mysql'
471471
_(span.name).must_equal 'select'
472-
_(span.attributes['db.statement']).must_equal obfuscated_sql
472+
_(span.attributes['db.query.text']).must_equal obfuscated_sql
473473
end
474474
end
475475
end
@@ -546,7 +546,7 @@
546546
instrumentation.install
547547

548548
sql = "SELECT * from users where users.id = 1 and users.email = '[email protected]'"
549-
OpenTelemetry::Instrumentation::Trilogy.with_attributes('db.operation' => 'foo') do
549+
OpenTelemetry::Instrumentation::Trilogy.with_attributes('db.operation.name' => 'foo') do
550550
expect do
551551
client.query(sql)
552552
end.must_raise Trilogy::Error
@@ -556,7 +556,7 @@
556556
end
557557
end
558558

559-
it 'sets span name to db name when db.operation is not set' do
559+
it 'sets span name to db name when db.operation.name is not set' do
560560
OpenTelemetry::TestHelpers.with_env('OTEL_RUBY_INSTRUMENTATION_TRILOGY_CONFIG_OPTS' => 'span_name=db_operation_and_name') do
561561
instrumentation.instance_variable_set(:@installed, false)
562562
instrumentation.install
@@ -579,7 +579,7 @@
579579
instrumentation.install
580580

581581
sql = "SELECT * from users where users.id = 1 and users.email = '[email protected]'"
582-
OpenTelemetry::Instrumentation::Trilogy.with_attributes('db.operation' => 'foo') do
582+
OpenTelemetry::Instrumentation::Trilogy.with_attributes('db.operation.name' => 'foo') do
583583
expect do
584584
client.query(sql)
585585
end.must_raise Trilogy::Error
@@ -589,7 +589,7 @@
589589
end
590590
end
591591

592-
it 'sets span name to mysql when db.operation is not set' do
592+
it 'sets span name to mysql when db.operation.name is not set' do
593593
OpenTelemetry::TestHelpers.with_env('OTEL_RUBY_INSTRUMENTATION_TRILOGY_CONFIG_OPTS' => 'span_name=db_operation_and_name') do
594594
instrumentation.instance_variable_set(:@installed, false)
595595
instrumentation.install

0 commit comments

Comments
 (0)