Skip to content

Commit d00dbbd

Browse files
Merge pull request #416 from Garaio-REM/datadog-ruby-improvements
Migrate to datadog gem and add Ruby 3.4/4.0 support
2 parents 73e8a16 + 7cf2c3a commit d00dbbd

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
- '3.1'
2929
- '3.2'
3030
- '3.3'
31+
- '3.4'
32+
- '4.0'
3133

3234
steps:
3335
- uses: actions/checkout@v4

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ group :development, :test do
2323
gem "sentry-ruby"
2424
gem "honeybadger"
2525
gem "newrelic_rpm"
26-
gem "ddtrace", "~> 1.8"
26+
gem "datadog"
2727
gem "airbrake", "~> 13.0"
2828
gem "rollbar"
2929
gem "bugsnag"

spec/hutch/broker_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595

9696
context 'when configured with a URI' do
9797
context 'which specifies the port' do
98-
before { config[:uri] = 'amqp://guest:guest@127.0.0.1:5672/' }
98+
before { config[:uri] = "amqp://#{config[:mq_username]}:#{config[:mq_password]}@#{config[:mq_host]}:#{config[:mq_port]}/" }
9999

100100
it 'successfully connects' do
101101
c = broker.open_connection
@@ -105,7 +105,7 @@
105105
end
106106

107107
context 'which does not specify port and uses the amqp scheme' do
108-
before { config[:uri] = 'amqp://guest:guest@127.0.0.1/' }
108+
before { config[:uri] = "amqp://#{config[:mq_username]}:#{config[:mq_password]}@#{config[:mq_host]}/" }
109109

110110
it 'successfully connects' do
111111
c = broker.open_connection
@@ -115,7 +115,7 @@
115115
end
116116

117117
context 'which specifies the amqps scheme' do
118-
before { config[:uri] = 'amqps://guest:guest@127.0.0.1/' }
118+
before { config[:uri] = "amqps://#{config[:mq_username]}:#{config[:mq_password]}@#{config[:mq_host]}/" }
119119

120120
it 'utilises TLS' do
121121
expect(Hutch::Adapter).to receive(:new).with(

0 commit comments

Comments
 (0)