Skip to content

[bp/1.28] datadog: fix names in Span::spawnChild#31595

Merged
phlax merged 2 commits into
envoyproxy:release/v1.28from
DataDog:david.goffredo/backport-v1.28-datadog-fix-names-in-spawn-child
Jan 4, 2024
Merged

[bp/1.28] datadog: fix names in Span::spawnChild#31595
phlax merged 2 commits into
envoyproxy:release/v1.28from
DataDog:david.goffredo/backport-v1.28-datadog-fix-names-in-spawn-child

Conversation

@dgoffredo
Copy link
Copy Markdown
Contributor

This is a backport of #31366 onto the v1.28 release branch.

These changes fix a bug in the Datadog tracing extension. Previously, Span::spawnChild would produce spans whose "operation name" had the value of what should instead be the "resource name." With these changes, setting the "operation name" sets the "resource name" instead, and the "operation name" is always the hard-coded value "envoy.proxy".

Signed-off-by: David Goffredo <david.goffredo@datadoghq.com>
Copy link
Copy Markdown
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same for this one - can we add the changelog please

@phlax phlax self-assigned this Jan 3, 2024
@phlax
Copy link
Copy Markdown
Member

phlax commented Jan 3, 2024

@dgoffredo im wondering if 1.26 also requires the fix (1.25 is going EOL shortly so possibly wont get another release)

@dgoffredo
Copy link
Copy Markdown
Contributor Author

@dgoffredo im wondering if 1.26 also requires the fix (1.25 is going EOL shortly so possibly wont get another release)

v1.26 does not contain the rewrite that introduced this bug. Previously, I mistakenly said that v1.26 includes the rewrite, but it does not. The rewrite added code file-by-file to the source tree, but the switch to the new implementation did not happen until after v1.26 was cut.

Signed-off-by: David Goffredo <david.goffredo@datadoghq.com>
@phlax
Copy link
Copy Markdown
Member

phlax commented Jan 3, 2024

verify fail is unrelated to this pr - the branch requires a backport - ill resolve shortly

Copy link
Copy Markdown
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks @dgoffredo

@phlax phlax merged commit be7d2f3 into envoyproxy:release/v1.28 Jan 4, 2024
SeanKilleen pushed a commit to SeanKilleen/envoy that referenced this pull request Apr 3, 2024
Signed-off-by: David Goffredo <david.goffredo@datadoghq.com>
Signed-off-by: Sean Killeen <SeanKilleen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants