Skip to content

change data type for cluster_id to int32 #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
samohte merged 2 commits into from
Feb 14, 2024
Merged

change data type for cluster_id to int32 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af8c54f
change data type for cluster_id to int32
samohte Feb 13, 2024
81c579c
remove unintentionally committed test
samohte Feb 13, 2024
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
2 changes: 1 addition & 1 deletion api/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ message DynatraceSamplerConfig {
string tenant = 1;

// The id of the Dynatrace cluster which the spans are reported to.
string cluster_id = 2;
int32 cluster_id = 2;

// The HTTP URI to fetch the sampler configuration (root spans per minute). For example:
//
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ DynatraceSampler::DynatraceSampler(
Server::Configuration::TracerFactoryContext& context,
SamplerConfigFetcherPtr sampler_config_fetcher)
: dt_tracestate_key_(absl::StrCat(calculateTenantId(config.tenant()), "-",
absl::string_view(config.cluster_id()), "@dt")),
absl::Hex(config.cluster_id()), "@dt")),
sampling_controller_(std::move(sampler_config_fetcher)) {

timer_ = context.serverFactoryContext().mainThreadDispatcher().createTimer([this]() -> void {
Expand Down
2 changes: 1 addition & 1 deletion ...extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class DynatraceSamplerIntegrationTest : public Envoy::HttpIntegrationTest,
typed_config:
"@type": type.googleapis.com/envoy.extensions.tracers.opentelemetry.samplers.v3.DynatraceSamplerConfig
tenant: "abc12345"
cluster_id: "980df25c"
cluster_id: -1743916452
)EOF";

auto tracing_config =
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class DynatraceSamplerTest : public testing::Test {

const std::string yaml_string_ = R"EOF(
tenant: "abc12345"
cluster_id: "980df25c"
cluster_id: -1743916452
)EOF";

public:
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_fetcher_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SamplerConfigFetcherTest : public testing::Test {

const std::string yaml_string = R"EOF(
tenant: "abc12345"
cluster_id: "980df25c"
cluster_id: -1743916452
token: "tokenval"
http_uri:
cluster: "cluster_name"
Expand Down