Skip to content

fix: Format gat commands #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 14, 2025
Merged

fix: Format gat commands #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e84858
fix: Format gat commands
robertlaurin Dec 19, 2024
236cfc1
fix: skip test unless it implements gat
robertlaurin Jan 7, 2025
8002aef
Merge branch 'main' into fix-dalli-gat
robertlaurin Jan 7, 2025
516c844
Merge branch 'main' into fix-dalli-gat
robertlaurin Jan 9, 2025
5533e4d
Merge branch 'main' into fix-dalli-gat
robertlaurin Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ module Utils
'multi_add' => 'addq',
'multi_replace' => 'replaceq',
'multi_delete' => 'deleteq',
'touch' => 'touch'
'touch' => 'touch',
'gat' => 'gat'
# 'sasl_authentication' => 'auth_negotiation',
# 'sasl_authentication' => 'auth_request',
}.freeze
Expand Down
10 changes: 10 additions & 0 deletions instrumentation/dalli/test/opentelemetry/instrumentation/dalli/instrumentation_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,16 @@
_(span.name).must_equal 'set'
_(span.attributes['db.statement']).must_equal 'set ?'
end

it 'supports gat' do
skip unless dalli.respond_to?(:gat)

dalli.gat('foo')
Copy link
Contributor

@fbogsany fbogsany Dec 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gat was added to dalli in 3.0.0. We could skip if the dalli version is < 3.0.0 or set 3.0.0 as the min supported version.

Copy link
Contributor

@fbogsany fbogsany Dec 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My preference is to skip, since we only need it in this test, and the test matrix should cover 3.0.0.

Copy link
Contributor

@fbogsany fbogsany Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dalli.gat('foo')
skip unless dalli.respond_to?(:gat)
dalli.gat('foo')


_(exporter.finished_spans.size).must_equal 1
_(span.name).must_equal 'gat'
_(span.attributes['db.statement']).must_equal 'gat foo 0'
end
end

# Dalli 3.x has different behavior than 2.x versions and attempts to retry on network errors
Expand Down
Loading