Skip to content

Commit bf5f773

Browse files
committed
Support newest datadog gem
1 parent acc4055 commit bf5f773

4 files changed

Lines changed: 5 additions & 11 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ group :test do
1616
gem 'rspec'
1717
gem 'timecop'
1818
gem 'newrelic_rpm'
19-
gem 'ddtrace'
19+
gem 'datadog'
2020
gem 'simplecov', require: false
2121
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)