Skip to content

fix: Include span kind in ActiveSupport Instrumentation helper #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2024
Merged

fix: Include span kind in ActiveSupport Instrumentation helper #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3b2314
fix: Include span kind in AS helper
arielvalentin Jun 20, 2024
114273f
squash: add test coverage
arielvalentin Jun 20, 2024
7194a79
squash: updated example
arielvalentin Jun 20, 2024
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
4 changes: 2 additions & 2 deletions ...tation/active_support/lib/opentelemetry/instrumentation/active_support/span_subscriber.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ def self.subscribe(
pattern,
notification_payload_transform = nil,
disallowed_notification_payload_keys = [],
kind = nil
kind: nil
)
subscriber = OpenTelemetry::Instrumentation::ActiveSupport::SpanSubscriber.new(
name: pattern,
tracer: tracer,
notification_payload_transform: notification_payload_transform,
disallowed_notification_payload_keys: disallowed_notification_payload_keys,
kind: nil
kind: kind
)

subscriber_object = ::ActiveSupport::Notifications.subscribe(pattern, subscriber)
Expand Down
11 changes: 11 additions & 0 deletions .../active_support/test/opentelemetry/instrumentation/active_support/span_subscriber_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ def finish(name, id, payload)
_(last_span).wont_be_nil
_(last_span.name).must_equal('foo bar')
_(last_span.attributes['extra']).must_equal('context')
_(last_span.kind).must_equal(:internal)
end

it 'finishes spans even when block subscribers blow up' do
Expand Down Expand Up @@ -260,5 +261,15 @@ def finish(name, id, payload)
_(obj.class).must_equal(ActiveSupport::Notifications::Fanout::Subscribers::Evented)
_(last_span).must_be_nil
end

it 'supports setting the span kind' do
OpenTelemetry::Instrumentation::ActiveSupport.subscribe(tracer, 'bar.foo', nil, [], kind: :client)
ActiveSupport::Notifications.instrument('bar.foo', extra: 'context')

_(last_span).wont_be_nil
_(last_span.name).must_equal('foo bar')
_(last_span.attributes['extra']).must_equal('context')
_(last_span.kind).must_equal(:client)
end
end
end