Skip to content

Commit 7336a90

Browse files
committed
Support newest datadog gem
1 parent acc4055 commit 7336a90

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
jobs:
44
test:
55
docker:
6-
- image: cimg/ruby:3.2.0
6+
- image: cimg/ruby:3.4.2
77
auth:
88
username: $DOCKERHUB_USERNAME
99
password: $DOCKERHUB_TOKEN
@@ -27,7 +27,7 @@ jobs:
2727
2828
push_to_rubygems:
2929
docker:
30-
- image: cimg/ruby:3.2.0
30+
- image: cimg/ruby:3.4.2
3131
auth:
3232
username: $DOCKERHUB_USERNAME
3333
password: $DOCKERHUB_TOKEN

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ tmp
2424
mkmf.log
2525
tags
2626
.project
27+
.tool-versions

Gemfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ group :test do
1616
gem 'rspec'
1717
gem 'timecop'
1818
gem 'newrelic_rpm'
19-
gem 'ddtrace'
19+
gem 'datadog'
2020
gem 'simplecov', require: false
21+
22+
# Ruby 3.3+ extracted these from stdlib
23+
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3.0')
24+
gem 'mutex_m'
25+
gem 'base64'
26+
gem 'bigdecimal'
27+
gem 'drb'
28+
end
2129
end

lib/queue_classic_plus/datadog.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@ module QueueClassicDatadog
1010
def _perform(*args)
1111
service_name = QueueClassicDatadog.config.dd_service || 'qc.job'
1212

13-
if Gem.loaded_specs['ddtrace'].version >= Gem::Version.new('1')
14-
Datadog::Tracing.trace('qc.job', service: service_name, resource: "#{name}#perform") do |_|
15-
super
16-
end
17-
else
18-
Datadog.tracer.trace('qc.job', service_name: 'qc.job', resource: "#{name}#perform") do |_|
19-
super
20-
end
13+
Datadog::Tracing.trace('qc.job', service: service_name, resource: "#{name}#perform") do |_|
14+
super
2115
end
2216
end
2317

lib/queue_classic_plus/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module QueueClassicPlus
2-
VERSION = '4.0.0.alpha21'.freeze
2+
VERSION = '4.1.0.alpha1'.freeze
33
end

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
require_relative './helpers'
1414
require 'byebug'
1515
require 'pry'
16-
require 'ddtrace'
16+
require 'datadog'
1717

1818
ENV["QC_RAILS_DATABASE"] ||= "false" # test on QC::ConnAdapter by default
1919
ENV["DATABASE_URL"] ||= "postgres:///queue_classic_plus_test"

0 commit comments

Comments
 (0)