Skip to content

Commit 028ce18

Browse files
authored
handle nil drop list (#915)
1 parent 5850c73 commit 028ce18

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

lib/sentry/opentelemetry/sampler.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if Code.ensure_loaded?(:otel_sampler) do
3535
config
3636
) do
3737
result =
38-
if span_name in config[:drop] do
38+
if config[:drop] && span_name in config[:drop] do
3939
{:drop, [], []}
4040
else
4141
traces_sampler = Sentry.Config.traces_sampler()

test/sentry/opentelemetry/sampler_test.exs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,26 @@ defmodule Sentry.Opentelemetry.SamplerTest do
5050
assert {"sentry-sample_rate", "1.0"} in tracestate
5151
assert {"sentry-sampled", "true"} in tracestate
5252
end
53+
54+
test "records and samples spans when drop list is nil" do
55+
put_test_config(traces_sample_rate: 1.0)
56+
test_ctx = create_test_span_context()
57+
58+
assert {:record_and_sample, [], tracestate} =
59+
Sampler.should_sample(
60+
test_ctx,
61+
123,
62+
nil,
63+
"Elixir.Oban.Worker process",
64+
nil,
65+
nil,
66+
[]
67+
)
68+
69+
assert is_list(tracestate)
70+
assert {"sentry-sample_rate", "1.0"} in tracestate
71+
assert {"sentry-sampled", "true"} in tracestate
72+
end
5373
end
5474

5575
describe "sampling based on traces_sample_rate" do

0 commit comments

Comments
 (0)