Skip to content
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

Jump to bottom

fix: remove version tag if dd_service is not applied #4027

Merged
merged 4 commits into from
Oct 25, 2024
Merged

fix: remove version tag if dd_service is not applied #4027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e407935
fix: remove version tag if dd_service is not applied
mabdinur Oct 24, 2024
8a6e086
add test
mabdinur Oct 24, 2024
919bb0e
address nit
mabdinur Oct 24, 2024
a8025b1
Merge branch 'master' into munir/remove-version-tag-in-some-scenarios
mabdinur Oct 24, 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
25 changes: 15 additions & 10 deletions lib/datadog/tracing/tracer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ def start_span(
on_error: on_error,
resource: resource,
service: service,
tags: resolve_tags(tags),
tags: resolve_tags(tags, service),
type: type,
id: id,
&block
Expand All @@ -420,7 +420,7 @@ def start_span(
resource: resource,
service: service,
start_time: start_time,
tags: resolve_tags(tags),
tags: resolve_tags(tags, service),
type: type,
id: id
)
Expand All @@ -432,15 +432,20 @@ def start_span(
end
# rubocop:enable Lint/UnderscorePrefixedVariableName

def resolve_tags(tags)
if @tags.any? && tags
# Combine default tags with provided tags,
# preferring provided tags.
@tags.merge(tags)
else
# Use provided tags or default tags if none.
tags || @tags.dup
def resolve_tags(tags, service)
merged_tags = if @tags.any? && tags
# Combine default tags with provided tags,
# preferring provided tags.
@tags.merge(tags)
else
# Use provided tags or default tags if none.
tags || @tags.dup
end
# Remove version tag if service is not the default service
if merged_tags.key?(Core::Environment::Ext::TAG_VERSION) && service != @default_service
merged_tags.delete(Core::Environment::Ext::TAG_VERSION)
end
merged_tags
end

# Manually activate and deactivate the trace, when the span completes.
Expand Down
12 changes: 12 additions & 0 deletions spec/datadog/tracing/tracer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,18 @@
expect(span.get_tag('my')).to eq('tag')
end

context 'contains version and span.service is not equal to the default tracer service' do
let(:tracer_options) { { default_service: 'global-service', tags: { version: '1.1.0' } } }
let(:service) { 'my-service' }
it 'does not set version on the span' do
expect(tracer.default_service).to eq('global-service')
expect(span.service).not_to eq('my-service')

expect(tracer.tags).to include(version: '1.1.0')
expect(span.tags).not_to include(:version)
end
end

context 'and default tags are set on the tracer' do
let(:tracer_options) { { tags: default_tags } }

Expand Down
Loading