Skip to content

change default propagation styles to begin with W3C #18

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

change default propagation styles to begin with W3C #18

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
6 changes: 4 additions & 2 deletions src/datadog/tracer_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ struct TracerConfig {
// All styles indicated by `injection_styles` are used for injection.
// `injection_styles` is overridden by the `DD_TRACE_PROPAGATION_STYLE_INJECT`
// and `DD_TRACE_PROPAGATION_STYLE` environment variables.
std::vector<PropagationStyle> injection_styles = {PropagationStyle::DATADOG};
std::vector<PropagationStyle> injection_styles = {PropagationStyle::W3C,
PropagationStyle::DATADOG};

// `extraction_styles` indicates with which tracing systems trace propagation
// will be compatible when extracting (receiving) trace context.
Expand All @@ -73,7 +74,8 @@ struct TracerConfig {
// `extraction_styles` is overridden by the
// `DD_TRACE_PROPAGATION_STYLE_EXTRACT` and `DD_TRACE_PROPAGATION_STYLE`
// environment variables.
std::vector<PropagationStyle> extraction_styles = {PropagationStyle::DATADOG};
std::vector<PropagationStyle> extraction_styles = {PropagationStyle::W3C,
PropagationStyle::DATADOG};

// `report_hostname` indicates whether the tracer will include the result of
// `gethostname` with traces sent to the collector.
Expand Down
35 changes: 15 additions & 20 deletions test/test_tracer_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,17 @@ TEST_CASE("TracerConfig propagation styles") {
TracerConfig config;
config.defaults.service = "testsvc";

SECTION("default styles are [W3C, Datadog]") {
auto finalized = finalize_config(config);
REQUIRE(finalized);

const std::vector<PropagationStyle> expected_styles = {
PropagationStyle::W3C, PropagationStyle::DATADOG};

REQUIRE(finalized->injection_styles == expected_styles);
REQUIRE(finalized->extraction_styles == expected_styles);
}

SECTION("DD_TRACE_PROPAGATION_STYLE overrides defaults") {
const EnvGuard guard{"DD_TRACE_PROPAGATION_STYLE", "B3"};
auto finalized = finalize_config(config);
Expand All @@ -989,14 +1000,6 @@ TEST_CASE("TracerConfig propagation styles") {
}

SECTION("injection_styles") {
SECTION("defaults to just Datadog") {
auto finalized = finalize_config(config);
REQUIRE(finalized);
const std::vector<PropagationStyle> expected_styles = {
PropagationStyle::DATADOG};
REQUIRE(finalized->injection_styles == expected_styles);
}

SECTION("need at least one") {
config.injection_styles.clear();
auto finalized = finalize_config(config);
Expand Down Expand Up @@ -1089,14 +1092,6 @@ TEST_CASE("TracerConfig propagation styles") {

// This section is very much like "injection_styles", above.
SECTION("extraction_styles") {
SECTION("defaults to just Datadog") {
auto finalized = finalize_config(config);
REQUIRE(finalized);
const std::vector<PropagationStyle> expected_styles = {
PropagationStyle::DATADOG};
REQUIRE(finalized->extraction_styles == expected_styles);
}

SECTION("need at least one") {
config.extraction_styles.clear();
auto finalized = finalize_config(config);
Expand Down Expand Up @@ -1164,13 +1159,13 @@ TEST_CASE("TracerConfig propagation styles") {
// ts tse se tsi si
// --- --- --- --- ---
/* ts */{ x, true, true, true, true },

/* tse */{ x, x, true, false, false },

/* se */{ x, x, x, false, false },

/* tsi */{ x, x, x, x, true },

/* si */{ x, x, x, x, x },
};
// clang-format on
Expand Down