From 7336a90d875e69546ae9bed4413ce8ffd4ec7247 Mon Sep 17 00:00:00 2001
From: Sebastian Herrera <sebastian@rainforestapp.com>
Date: Tue, 1 Jul 2025 16:28:05 -0300
Subject: [PATCH] Support newest datadog gem

---
 .circleci/config.yml              |  4 ++--
 .gitignore                        |  1 +
 Gemfile                           | 10 +++++++++-
 lib/queue_classic_plus/datadog.rb | 10 ++--------
 lib/queue_classic_plus/version.rb |  2 +-
 spec/spec_helper.rb               |  2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bfdcc6a..f74f432 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: cimg/ruby:3.2.0
+      - image: cimg/ruby:3.4.2
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -27,7 +27,7 @@ jobs:
 
   push_to_rubygems:
     docker:
-      - image: cimg/ruby:3.2.0
+      - image: cimg/ruby:3.4.2
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
diff --git a/.gitignore b/.gitignore
index 01f5fa6..97dc8f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ tmp
 mkmf.log
 tags
 .project
+.tool-versions
diff --git a/Gemfile b/Gemfile
index 22fa825..2515e1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,14 @@ group :test do
   gem 'rspec'
   gem 'timecop'
   gem 'newrelic_rpm'
-  gem 'ddtrace'
+  gem 'datadog'
   gem 'simplecov', require: false
+
+  # Ruby 3.3+ extracted these from stdlib
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3.0')
+    gem 'mutex_m'
+    gem 'base64'
+    gem 'bigdecimal'
+    gem 'drb'
+  end
 end
diff --git a/lib/queue_classic_plus/datadog.rb b/lib/queue_classic_plus/datadog.rb
index 5ca88d3..1df9f56 100644
--- a/lib/queue_classic_plus/datadog.rb
+++ b/lib/queue_classic_plus/datadog.rb
@@ -10,14 +10,8 @@ module QueueClassicDatadog
   def _perform(*args)
     service_name = QueueClassicDatadog.config.dd_service || 'qc.job'
 
-    if Gem.loaded_specs['ddtrace'].version >= Gem::Version.new('1')
-      Datadog::Tracing.trace('qc.job', service: service_name, resource: "#{name}#perform") do |_|
-        super
-      end
-    else
-      Datadog.tracer.trace('qc.job', service_name: 'qc.job', resource: "#{name}#perform") do |_|
-        super
-      end
+    Datadog::Tracing.trace('qc.job', service: service_name, resource: "#{name}#perform") do |_|
+      super
     end
   end
 
diff --git a/lib/queue_classic_plus/version.rb b/lib/queue_classic_plus/version.rb
index 4cc456b..a3d01c1 100644
--- a/lib/queue_classic_plus/version.rb
+++ b/lib/queue_classic_plus/version.rb
@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha21'.freeze
+  VERSION = '4.1.0.alpha1'.freeze
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cba9e2c..cba73d0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,7 +13,7 @@
 require_relative './helpers'
 require 'byebug'
 require 'pry'
-require 'ddtrace'
+require 'datadog'
 
 ENV["QC_RAILS_DATABASE"] ||= "false" # test on QC::ConnAdapter by default
 ENV["DATABASE_URL"] ||= "postgres:///queue_classic_plus_test"