fix(MeshTrace): invalid sampling default values (#11548)

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
kumahq · Sep 25, 2024 · 48975f6 · 48975f6
1 parent 6f7d2dd
commit 48975f6
Show file tree

Hide file tree

Showing 10 changed files with 178 additions and 4 deletions.
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -4099,6 +4099,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be force traced if the
                           'x-client-trace-id' header is set. Default: 100% Mirror of
@@ -4110,13 +4114,23 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests will be traced
                           after all other sampling checks have been applied (client, force tracing,
                           random sampling). This field functions as an upper limit on the total
+<<<<<<< HEAD
                           configured sampling rate. For instance, setting client_sampling to 100%
                           but overall_sampling to 1% will result in only 1% of client requests with
                           the appropriate headers to be force traced. Default: 100% Mirror of
+=======
+                          configured sampling rate. For instance, setting client to 100
+                          but overall to 1 will result in only 1% of client requests with
+                          the appropriate headers to be force traced. Mirror of
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                           overall_sampling in Envoy
                           https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
                           Either int or decimal represented as string.
@@ -4125,6 +4139,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be randomly selected for trace
                           generation, if not requested by the client or not forced. Default: 100%

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
@@ -4322,6 +4322,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be force traced if the
                           'x-client-trace-id' header is set. Default: 100% Mirror of
@@ -4333,13 +4337,23 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests will be traced
                           after all other sampling checks have been applied (client, force tracing,
                           random sampling). This field functions as an upper limit on the total
+<<<<<<< HEAD
                           configured sampling rate. For instance, setting client_sampling to 100%
                           but overall_sampling to 1% will result in only 1% of client requests with
                           the appropriate headers to be force traced. Default: 100% Mirror of
+=======
+                          configured sampling rate. For instance, setting client to 100
+                          but overall to 1 will result in only 1% of client requests with
+                          the appropriate headers to be force traced. Mirror of
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                           overall_sampling in Envoy
                           https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
                           Either int or decimal represented as string.
@@ -4348,6 +4362,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be randomly selected for trace
                           generation, if not requested by the client or not forced. Default: 100%

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
@@ -4119,6 +4119,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be force traced if the
                           'x-client-trace-id' header is set. Default: 100% Mirror of
@@ -4130,13 +4134,23 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests will be traced
                           after all other sampling checks have been applied (client, force tracing,
                           random sampling). This field functions as an upper limit on the total
+<<<<<<< HEAD
                           configured sampling rate. For instance, setting client_sampling to 100%
                           but overall_sampling to 1% will result in only 1% of client requests with
                           the appropriate headers to be force traced. Default: 100% Mirror of
+=======
+                          configured sampling rate. For instance, setting client to 100
+                          but overall to 1 will result in only 1% of client requests with
+                          the appropriate headers to be force traced. Mirror of
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                           overall_sampling in Envoy
                           https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
                           Either int or decimal represented as string.
@@ -4145,6 +4159,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be randomly selected for trace
                           generation, if not requested by the client or not forced. Default: 100%

diff --git a/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml b/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
@@ -5403,6 +5403,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be force traced if the
                           'x-client-trace-id' header is set. Default: 100% Mirror of
@@ -5414,13 +5418,23 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests will be traced
                           after all other sampling checks have been applied (client, force tracing,
                           random sampling). This field functions as an upper limit on the total
+<<<<<<< HEAD
                           configured sampling rate. For instance, setting client_sampling to 100%
                           but overall_sampling to 1% will result in only 1% of client requests with
                           the appropriate headers to be force traced. Default: 100% Mirror of
+=======
+                          configured sampling rate. For instance, setting client to 100
+                          but overall to 1 will result in only 1% of client requests with
+                          the appropriate headers to be force traced. Mirror of
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                           overall_sampling in Envoy
                           https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
                           Either int or decimal represented as string.
@@ -5429,6 +5443,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be randomly selected for trace
                           generation, if not requested by the client or not forced. Default: 100%

diff --git a/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml b/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml
@@ -139,6 +139,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be force traced if the
                           'x-client-trace-id' header is set. Default: 100% Mirror of
@@ -150,13 +154,23 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests will be traced
                           after all other sampling checks have been applied (client, force tracing,
                           random sampling). This field functions as an upper limit on the total
+<<<<<<< HEAD
                           configured sampling rate. For instance, setting client_sampling to 100%
                           but overall_sampling to 1% will result in only 1% of client requests with
                           the appropriate headers to be force traced. Default: 100% Mirror of
+=======
+                          configured sampling rate. For instance, setting client to 100
+                          but overall to 1 will result in only 1% of client requests with
+                          the appropriate headers to be force traced. Mirror of
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                           overall_sampling in Envoy
                           https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
                           Either int or decimal represented as string.
@@ -165,6 +179,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be randomly selected for trace
                           generation, if not requested by the client or not forced. Default: 100%

diff --git a/docs/generated/openapi.yaml b/docs/generated/openapi.yaml
@@ -6765,6 +6765,10 @@ components:
                       anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                      default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                       description: >-
                         Target percentage of requests that will be force traced
                         if the
@@ -6782,6 +6786,10 @@ components:
                       anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                      default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                       description: >-
                         Target percentage of requests will be traced
 
@@ -6791,11 +6799,11 @@ components:
                         random sampling). This field functions as an upper limit
                         on the total
 
-                        configured sampling rate. For instance, setting
-                        client_sampling to 100%
+                        configured sampling rate. For instance, setting client
+                        to 100
 
-                        but overall_sampling to 1% will result in only 1% of
-                        client requests with
+                        but overall to 1 will result in only 1% of client
+                        requests with
 
                         the appropriate headers to be force traced. Default:
                         100% Mirror of
@@ -6810,6 +6818,10 @@ components:
                       anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                      default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                       description: >-
                         Target percentage of requests that will be randomly
                         selected for trace

diff --git a/docs/generated/raw/crds/kuma.io_meshtraces.yaml b/docs/generated/raw/crds/kuma.io_meshtraces.yaml
@@ -139,6 +139,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be force traced if the
                           'x-client-trace-id' header is set. Default: 100% Mirror of
@@ -150,13 +154,23 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests will be traced
                           after all other sampling checks have been applied (client, force tracing,
                           random sampling). This field functions as an upper limit on the total
+<<<<<<< HEAD
                           configured sampling rate. For instance, setting client_sampling to 100%
                           but overall_sampling to 1% will result in only 1% of client requests with
                           the appropriate headers to be force traced. Default: 100% Mirror of
+=======
+                          configured sampling rate. For instance, setting client to 100
+                          but overall to 1 will result in only 1% of client requests with
+                          the appropriate headers to be force traced. Mirror of
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                           overall_sampling in Envoy
                           https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
                           Either int or decimal represented as string.
@@ -165,6 +179,10 @@ spec:
                         anyOf:
                         - type: integer
                         - type: string
+<<<<<<< HEAD
+=======
+                        default: 100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
                         description: |-
                           Target percentage of requests that will be randomly selected for trace
                           generation, if not requested by the client or not forced. Default: 100%

diff --git a/pkg/plugins/policies/meshtrace/api/v1alpha1/meshtrace.go b/pkg/plugins/policies/meshtrace/api/v1alpha1/meshtrace.go
@@ -98,24 +98,42 @@ type Sampling struct {
 	// Target percentage of requests will be traced
 	// after all other sampling checks have been applied (client, force tracing,
 	// random sampling). This field functions as an upper limit on the total
+<<<<<<< HEAD
 	// configured sampling rate. For instance, setting client_sampling to 100%
 	// but overall_sampling to 1% will result in only 1% of client requests with
 	// the appropriate headers to be force traced. Default: 100% Mirror of
 	// overall_sampling in Envoy
 	// https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
 	// Either int or decimal represented as string.
+=======
+	// configured sampling rate. For instance, setting client to 100
+	// but overall to 1 will result in only 1% of client requests with
+	// the appropriate headers to be force traced. Mirror of
+	// overall_sampling in Envoy
+	// https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
+	// Either int or decimal represented as string.
+	// +kubebuilder:default=100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
 	Overall *intstr.IntOrString `json:"overall,omitempty"`
 	// Target percentage of requests that will be force traced if the
 	// 'x-client-trace-id' header is set. Default: 100% Mirror of
 	// client_sampling in Envoy
 	// https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L127-L133
 	// Either int or decimal represented as string.
+<<<<<<< HEAD
+=======
+	// +kubebuilder:default=100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
 	Client *intstr.IntOrString `json:"client,omitempty"`
 	// Target percentage of requests that will be randomly selected for trace
 	// generation, if not requested by the client or not forced. Default: 100%
 	// Mirror of random_sampling in Envoy
 	// https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L135-L140
 	// Either int or decimal represented as string.
+<<<<<<< HEAD
+=======
+	// +kubebuilder:default=100
+>>>>>>> 79a23897c (fix(MeshTrace): invalid sampling default values (#11548))
 	Random *intstr.IntOrString `json:"random,omitempty"`
 }