review feedback: keep unused values marked as deprecated. Add a new

samohte · samohte · commit cec4b0fe01cf · 2024-03-25T09:54:35.000+01:00
field.

Signed-off-by: thomas.ebner &lt;thomas.ebner@dynatrace.com&gt;
diff --git a/api/envoy/extensions/tracers/opentelemetry/samplers/v3/BUILD b/api/envoy/extensions/tracers/opentelemetry/samplers/v3/BUILD
@@ -6,6 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
+        "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
         "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
diff --git a/api/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.proto b/api/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.proto
@@ -3,7 +3,9 @@ syntax = "proto3";
 package envoy.extensions.tracers.opentelemetry.samplers.v3;
 
 import "envoy/config/core/v3/http_service.proto";
+import "envoy/config/core/v3/http_uri.proto";
 
+import "envoy/annotations/deprecation.proto";
 import "udpa/annotations/status.proto";
 
 option java_package = "io.envoyproxy.envoy.extensions.tracers.opentelemetry.samplers.v3";
@@ -16,6 +18,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // Configuration for the Dynatrace Sampler extension.
 // [#extension: envoy.tracers.opentelemetry.samplers.dynatrace]
+// [#next-free-field: 7]
 message DynatraceSamplerConfig {
   // The Dynatrace tenant.
   //
@@ -27,6 +30,22 @@ message DynatraceSamplerConfig {
   // The value can be obtained from the Envoy deployment page in Dynatrace.
   int32 cluster_id = 2;
 
+  // [#not-implemented-hide:]
+  config.core.v3.HttpUri http_uri = 3
+      [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
+
+  // [#not-implemented-hide:]
+  string token = 4 [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
+
+  // Default number of root spans per minute, used when the value can't be obtained from the Dynatrace API.
+  //
+  // A default value of ``1000`` is used when:
+  //
+  // - ``root_spans_per_minute`` is unset
+  // - ``root_spans_per_minute`` is set to 0
+  //
+  uint32 root_spans_per_minute = 5;
+
   // The HTTP service to fetch the sampler configuration from the Dynatrace API (root spans per minute). For example:
   //
   // .. code-block:: yaml
@@ -41,14 +60,5 @@ message DynatraceSamplerConfig {
   //          key : "authorization"
   //          value: "Api-Token dt..."
   //
-  config.core.v3.HttpService http_service = 3;
-
-  // Default number of root spans per minute, used when the value can't be obtained from the Dynatrace API.
-  //
-  // A default value of ``1000`` is used when:
-  //
-  // - ``root_spans_per_minute`` is unset
-  // - ``root_spans_per_minute`` is set to 0
-  //
-  uint32 root_spans_per_minute = 4;
+  config.core.v3.HttpService http_service = 6;
 }
