Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# frozen_string_literal: true

#
require "sentry/opentelemetry/otlp_propagator"

module Sentry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
18 changes: 18 additions & 0 deletions sentry-opentelemetry/spec/sentry/opentelemetry/otlp_setup_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading