Skip to content

Commit a0b50db

Browse files
committed
default propagation style is now [Datadog, W3C]
1 parent 1a1bd9d commit a0b50db

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/datadog/tracer_config.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ struct TracerConfig {
7272
// All styles indicated by `injection_styles` are used for injection.
7373
// `injection_styles` is overridden by the `DD_TRACE_PROPAGATION_STYLE_INJECT`
7474
// and `DD_TRACE_PROPAGATION_STYLE` environment variables.
75-
std::vector<PropagationStyle> injection_styles = {PropagationStyle::DATADOG};
75+
std::vector<PropagationStyle> injection_styles = {PropagationStyle::DATADOG,
76+
PropagationStyle::W3C};
7677

7778
// `extraction_styles` indicates with which tracing systems trace propagation
7879
// will be compatible when extracting (receiving) trace context.
@@ -82,7 +83,8 @@ struct TracerConfig {
8283
// `extraction_styles` is overridden by the
8384
// `DD_TRACE_PROPAGATION_STYLE_EXTRACT` and `DD_TRACE_PROPAGATION_STYLE`
8485
// environment variables.
85-
std::vector<PropagationStyle> extraction_styles = {PropagationStyle::DATADOG};
86+
std::vector<PropagationStyle> extraction_styles = {PropagationStyle::DATADOG,
87+
PropagationStyle::W3C};
8688

8789
// `report_hostname` indicates whether the tracer will include the result of
8890
// `gethostname` with traces sent to the collector.

test/test_tracer_config.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,12 +1003,12 @@ TEST_CASE("TracerConfig propagation styles") {
10031003
TracerConfig config;
10041004
config.defaults.service = "testsvc";
10051005

1006-
SECTION("default style is Datadog") {
1006+
SECTION("default style is [Datadog, W3C]") {
10071007
auto finalized = finalize_config(config);
10081008
REQUIRE(finalized);
10091009

10101010
const std::vector<PropagationStyle> expected_styles = {
1011-
PropagationStyle::DATADOG};
1011+
PropagationStyle::DATADOG, PropagationStyle::W3C};
10121012

10131013
REQUIRE(finalized->injection_styles == expected_styles);
10141014
REQUIRE(finalized->extraction_styles == expected_styles);

0 commit comments

Comments
 (0)