OpenTelemetry:Fix attribute merge with Datadog tags #3651
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR fixes an issue with the tracing OpenTelemetry integration where OpenTelemetry span
attributes
were processed and converted to Datadog span tags, but not correctly converted back into a Hash object; they were left as an Array of key/value pairs.Because an Array of key/value pairs is not what
Tracing.trace(tags:)
expects, this should have failed much earlier. But it actually has a chance of successfully setting span tags in the scenario that:DD_TAGS
. In this case, we don't need to merge the existing tag array with the provided Array of key/value pairs.dd-trace-rb/lib/datadog/tracing/tracer.rb
Line 423 in 7ca3042
set_tags
iterates over the provided tags in a way that works for both Hashes and Arrays of key/value pairs:dd-trace-rb/lib/datadog/tracing/metadata/tagging.rb
Line 65 in 7ca3042
This means that unless
DD_TAGS
(or the equivalentc.tags = ...
) was set, everything worked as expected.Motivation:
To fix this error:
How to test the change?
We have unit tests for this change.
Unsure? Have a question? Request a review!