diff --git a/api/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.proto b/api/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.proto index 848c4a942416e..e8c4f3238aa6f 100644 --- a/api/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.proto +++ b/api/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.proto @@ -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: // diff --git a/source/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler.cc b/source/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler.cc index 0fa29c4f12e3c..783a07f6c55ab 100644 --- a/source/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler.cc +++ b/source/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler.cc @@ -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 { diff --git a/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_integration_test.cc b/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_integration_test.cc index 73bd31e7360b8..512225909c2d3 100644 --- a/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_integration_test.cc +++ b/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_integration_test.cc @@ -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 = diff --git a/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_test.cc b/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_test.cc index beac4a0bbe626..9a965ac2bbd73 100644 --- a/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_test.cc +++ b/test/extensions/tracers/opentelemetry/samplers/dynatrace/dynatrace_sampler_test.cc @@ -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: diff --git a/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_fetcher_test.cc b/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_fetcher_test.cc index 09dd935f14e8e..cd527a2590782 100644 --- a/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_fetcher_test.cc +++ b/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_fetcher_test.cc @@ -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"