Skip to content

[Backport 1.27] tracing: fix Datadog span name (#29932) #30186

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
phlax merged 1 commit into from
Oct 13, 2023
Merged

[Backport 1.27] tracing: fix Datadog span name (#29932) #30186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions changelogs/current.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ minor_behavior_changes:

bug_fixes:
# *Changes expected to improve the state of the world and are unlikely to have negative effects*
- area: tracing
change: |
Fixed a bug in the Datadog tracer where Datadog's "operation name" field would contain what should be in the "resource name" field.

removed_config_or_runtime:
# *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`
Expand Down
7 changes: 6 additions & 1 deletion source/extensions/tracers/datadog/tracer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ Tracing::SpanPtr Tracer::startSpan(const Tracing::Config&, Tracing::TraceContext
// The OpenTracing implementation ignored the `Tracing::Config` argument,
// so we will as well.
datadog::tracing::SpanConfig span_config;
span_config.name = operation_name;
// The `operation_name` parameter to this function more closely matches
// Datadog's concept of "resource name." Datadog's "span name," or "operation
// name," instead describes the category of operation being performed, which
// here we hard-code.
span_config.name = "envoy.proxy";
span_config.resource = operation_name;
span_config.start = estimateTime(stream_info.startTime());

datadog::tracing::Tracer& tracer = *thread_local_tracer.tracer;
Expand Down
10 changes: 7 additions & 3 deletions test/extensions/tracers/datadog/tracer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,13 @@ TEST_F(DatadogTracerTest, SpanProperties) {
ASSERT_TRUE(maybe_dd_span);
const datadog::tracing::Span& dd_span = *maybe_dd_span;

// Verify that the span has the expected service name, operation name, start
// time, and sampling decision.
EXPECT_EQ("do.thing", dd_span.name());
// Verify that the span has the expected service name, operation name,
// resource name, start time, and sampling decision.
// Note that the `operation_name` we specified above becomes the
// `resource_name()` of the resulting Datadog span, while the Datadog span's
// `name()` (operation name) is hard-coded to "envoy.proxy."
EXPECT_EQ("envoy.proxy", dd_span.name());
EXPECT_EQ("do.thing", dd_span.resource_name());
EXPECT_EQ("envoy", dd_span.service_name());
ASSERT_TRUE(dd_span.trace_segment().sampling_decision());
EXPECT_EQ(int(datadog::tracing::SamplingPriority::USER_DROP),
Expand Down