Merge branch 'master' into bump-libddwaf-version

DataDog · Feb 21, 2025 · bd63fd4 · bd63fd4
2 parents 901143d + 29a6bd8
commit bd63fd4
Show file tree

Hide file tree

Showing 21 changed files with 1,027 additions and 3 deletions.
diff --git a/Matrixfile b/Matrixfile
@@ -14,9 +14,13 @@
     '' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
   },
   'profiling:main' => {
-    'opentelemetry'      => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby',
-    'opentelemetry_otlp' => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby',
-    ''                   => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
+    'opentelemetry'          => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby',
+    #  < 1.5 Context is kept in `Thread.current#[]`
+    'opentelemetry_otlp'     => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby',
+    # >= 1.5 Context is kept as instance variable in `Fiber.current`
+    # TODO: Disabled until profiler is fixed to work with 1.5+
+    'opentelemetry_otlp_1_5' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ❌ jruby',
+    ''                       => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
   },
   'profiling:ractors' => {
     '' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'

diff --git a/appraisal/ruby-3.1.rb b/appraisal/ruby-3.1.rb
@@ -168,6 +168,13 @@
 end
 
 appraise 'opentelemetry_otlp' do
+  gem 'opentelemetry-api', '< 1.5' # Context is kept in `Thread.current#[]`
+  gem 'opentelemetry-sdk', '~> 1.1'
+  gem 'opentelemetry-exporter-otlp'
+end
+
+appraise 'opentelemetry_otlp_1_5' do
+  gem 'opentelemetry-api', '>= 1.5' # Context is kept as instance variable in `Fiber.current`
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'opentelemetry-exporter-otlp'
 end

diff --git a/appraisal/ruby-3.2.rb b/appraisal/ruby-3.2.rb
@@ -168,6 +168,13 @@
 end
 
 appraise 'opentelemetry_otlp' do
+  gem 'opentelemetry-api', '< 1.5' # Context is kept in `Thread.current#[]`
+  gem 'opentelemetry-sdk', '~> 1.1'
+  gem 'opentelemetry-exporter-otlp'
+end
+
+appraise 'opentelemetry_otlp_1_5' do
+  gem 'opentelemetry-api', '>= 1.5' # Context is kept as instance variable in `Fiber.current`
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'opentelemetry-exporter-otlp'
 end

diff --git a/appraisal/ruby-3.3.rb b/appraisal/ruby-3.3.rb
@@ -168,6 +168,13 @@
 end
 
 appraise 'opentelemetry_otlp' do
+  gem 'opentelemetry-api', '< 1.5' # Context is kept in `Thread.current#[]`
+  gem 'opentelemetry-sdk', '~> 1.1'
+  gem 'opentelemetry-exporter-otlp'
+end
+
+appraise 'opentelemetry_otlp_1_5' do
+  gem 'opentelemetry-api', '>= 1.5' # Context is kept as instance variable in `Fiber.current`
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'opentelemetry-exporter-otlp'
 end

diff --git a/appraisal/ruby-3.4.rb b/appraisal/ruby-3.4.rb
@@ -180,6 +180,13 @@
 end
 
 appraise 'opentelemetry_otlp' do
+  gem 'opentelemetry-api', '< 1.5' # Context is kept in `Thread.current#[]`
+  gem 'opentelemetry-sdk', '~> 1.1'
+  gem 'opentelemetry-exporter-otlp'
+end
+
+appraise 'opentelemetry_otlp_1_5' do
+  gem 'opentelemetry-api', '>= 1.5' # Context is kept as instance variable in `Fiber.current`
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'opentelemetry-exporter-otlp'
 end

diff --git a/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile b/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile
diff --git a/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile.lock
diff --git a/gemfiles/ruby_3.1_opentelemetry_otlp_1_5.gemfile b/gemfiles/ruby_3.1_opentelemetry_otlp_1_5.gemfile
diff --git a/gemfiles/ruby_3.1_opentelemetry_otlp_1_5.gemfile.lock b/gemfiles/ruby_3.1_opentelemetry_otlp_1_5.gemfile.lock
diff --git a/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile b/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile
diff --git a/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile.lock