Skip to content

Commit

Permalink
fix(MeshTrace): invalid sampling default values (backport of #11548) (#…
Browse files Browse the repository at this point in the history 
…11552)

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

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Co-authored-by: Mike Beaumont <mjboamail@gmail.com>
  • Loading branch information
@kumahq @michaelbeaumont
kumahq[bot] and michaelbeaumont authored Sep 25, 2024
1 parent 30c970e commit 32b4225
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 52 deletions.
10 changes: 5 additions & 5 deletions app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5332,7 +5332,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -5343,13 +5343,13 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -5359,7 +5359,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down
10 changes: 5 additions & 5 deletions app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5332,7 +5332,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -5343,13 +5343,13 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -5359,7 +5359,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down
10 changes: 5 additions & 5 deletions app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5352,7 +5352,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -5363,13 +5363,13 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -5379,7 +5379,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down
10 changes: 5 additions & 5 deletions app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6756,7 +6756,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -6767,13 +6767,13 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -6783,7 +6783,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down
10 changes: 5 additions & 5 deletions deployments/charts/kuma/crds/kuma.io_meshtraces.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -153,13 +153,13 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -169,7 +169,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down
14 changes: 7 additions & 7 deletions docs/generated/openapi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8670,7 +8670,7 @@ components:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: >-
Target percentage of requests that will be force traced
if the
Expand All @@ -8686,7 +8686,7 @@ components:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: >-
Target percentage of requests will be traced
Expand All @@ -8696,11 +8696,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. Mirror of
Expand All @@ -8714,7 +8714,7 @@ components:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: >-
Target percentage of requests that will be randomly
selected for trace
Expand Down
10 changes: 5 additions & 5 deletions docs/generated/raw/crds/kuma.io_meshtraces.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -153,13 +153,13 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -169,7 +169,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down
10 changes: 5 additions & 5 deletions pkg/plugins/policies/meshtrace/api/v1alpha1/meshtrace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,26 +103,26 @@ 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
// configured sampling rate. For instance, setting client_sampling to 100%
// but overall_sampling to 1% will result in only 1% of client requests with
// 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%"
// +kubebuilder:default=100
Overall *intstr.IntOrString `json:"overall,omitempty"`
// Target percentage of requests that will be force traced if the
// 'x-client-trace-id' header is set. 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.
// +kubebuilder:default="100%"
// +kubebuilder:default=100
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.
// 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.
// +kubebuilder:default="100%"
// +kubebuilder:default=100
Random *intstr.IntOrString `json:"random,omitempty"`
}

Expand Down
10 changes: 5 additions & 5 deletions pkg/plugins/policies/meshtrace/api/v1alpha1/schema.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ properties:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -120,13 +120,13 @@ properties:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -136,7 +136,7 @@ properties:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down
10 changes: 5 additions & 5 deletions pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be force traced if the
'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
Expand All @@ -153,13 +153,13 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
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
configured sampling rate. For instance, setting client_sampling to 100%
but overall_sampling to 1% will result in only 1% of client requests with
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
Expand All @@ -169,7 +169,7 @@ spec:
anyOf:
- type: integer
- type: string
default: 100%
default: 100
description: |-
Target percentage of requests that will be randomly selected for trace
generation, if not requested by the client or not forced.
Expand Down

0 comments on commit 32b4225

Please sign in to comment.