From c2e090675d9034662acb00572f5b6dab9c020278 Mon Sep 17 00:00:00 2001
From: Neel Shah <neel.shah@sentry.io>
Date: Tue, 25 Aug 2026 13:54:30 +0200
Subject: [PATCH] feat!(otlp): setup_otlp_traces_exporter and setup_propagator
 now default to false

---
 .../lib/sentry/opentelemetry/configuration.rb  |  4 ++--
 .../lib/sentry/opentelemetry/otlp_setup.rb     |  1 -
 .../sentry/opentelemetry/configuration_spec.rb |  8 ++++----
 .../sentry/opentelemetry/otlp_setup_spec.rb    | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/sentry-opentelemetry/lib/sentry/opentelemetry/configuration.rb b/sentry-opentelemetry/lib/sentry/opentelemetry/configuration.rb
index 4ee68a529..9942631ed 100644
--- a/sentry-opentelemetry/lib/sentry/opentelemetry/configuration.rb
+++ b/sentry-opentelemetry/lib/sentry/opentelemetry/configuration.rb
@@ -26,9 +26,9 @@ class Configuration
 
       def initialize
         @enabled = false
-        @setup_otlp_traces_exporter = true
+        @setup_otlp_traces_exporter = false
         @collector_url = nil
-        @setup_propagator = true
+        @setup_propagator = false
       end
     end
   end
diff --git a/sentry-opentelemetry/lib/sentry/opentelemetry/otlp_setup.rb b/sentry-opentelemetry/lib/sentry/opentelemetry/otlp_setup.rb
index a49af3b64..4c0b50b09 100644
--- a/sentry-opentelemetry/lib/sentry/opentelemetry/otlp_setup.rb
+++ b/sentry-opentelemetry/lib/sentry/opentelemetry/otlp_setup.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-#
 require "sentry/opentelemetry/otlp_propagator"
 
 module Sentry
diff --git a/sentry-opentelemetry/spec/sentry/opentelemetry/configuration_spec.rb b/sentry-opentelemetry/spec/sentry/opentelemetry/configuration_spec.rb
index 22f748423..397f71285 100644
--- a/sentry-opentelemetry/spec/sentry/opentelemetry/configuration_spec.rb
+++ b/sentry-opentelemetry/spec/sentry/opentelemetry/configuration_spec.rb
@@ -6,9 +6,9 @@
   describe "#initialize" do
     it "sets default values" do
       expect(subject.enabled).to eq(false)
-      expect(subject.setup_otlp_traces_exporter).to eq(true)
+      expect(subject.setup_otlp_traces_exporter).to eq(false)
       expect(subject.collector_url).to be_nil
-      expect(subject.setup_propagator).to eq(true)
+      expect(subject.setup_propagator).to eq(false)
     end
   end
 
@@ -29,8 +29,8 @@
     end
 
     it "allows setting setup_propagator" do
-      subject.setup_propagator = false
-      expect(subject.setup_propagator).to eq(false)
+      subject.setup_propagator = true
+      expect(subject.setup_propagator).to eq(true)
     end
   end
 end
diff --git a/sentry-opentelemetry/spec/sentry/opentelemetry/otlp_setup_spec.rb b/sentry-opentelemetry/spec/sentry/opentelemetry/otlp_setup_spec.rb
index 5f7dd0ce1..fd1bbd759 100644
--- a/sentry-opentelemetry/spec/sentry/opentelemetry/otlp_setup_spec.rb
+++ b/sentry-opentelemetry/spec/sentry/opentelemetry/otlp_setup_spec.rb
@@ -12,10 +12,28 @@ def span_processors
   end
 
   describe '.setup' do
+    context 'with setup_propagator disabled by default' do
+      before do
+        perform_basic_setup do |config|
+          config.otlp.enabled = true
+          config.otlp.setup_otlp_traces_exporter = false
+        end
+      end
+
+      it 'does not replace the configured propagator' do
+        propagator = ::OpenTelemetry.propagation
+
+        described_class.setup(Sentry.configuration)
+
+        expect(::OpenTelemetry.propagation).to equal(propagator)
+      end
+    end
+
     context 'with setup_propagator enabled' do
       before do
         perform_basic_setup do |config|
           config.otlp.enabled = true
+          config.otlp.setup_otlp_traces_exporter = false
           config.otlp.setup_propagator = true
         end
       end