diff --git a/pkg/plugins/policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml b/pkg/plugins/policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml index 816f1d0f99eb..63c4882df9c8 100644 --- a/pkg/plugins/policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml +++ b/pkg/plugins/policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml @@ -50,7 +50,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml b/pkg/plugins/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml index 3549b18f7a43..a1e5a47139d4 100644 --- a/pkg/plugins/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml +++ b/pkg/plugins/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml @@ -50,7 +50,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml index 0cb9bc33e3d1..548d6e465bb7 100644 --- a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml +++ b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml @@ -37,7 +37,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -96,7 +95,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml index 07a95bbb4d74..3060462da1c8 100644 --- a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml +++ b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml @@ -37,7 +37,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -96,7 +95,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -155,7 +153,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml b/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml index 4a86c0ed887e..5fb72f224f35 100644 --- a/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml +++ b/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml @@ -37,7 +37,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.listeners.golden.yaml b/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.listeners.golden.yaml index 4a86c0ed887e..5fb72f224f35 100644 --- a/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.listeners.golden.yaml +++ b/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.listeners.golden.yaml @@ -37,7 +37,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/no-cross-zone.gateway.listeners.golden.yaml b/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/no-cross-zone.gateway.listeners.golden.yaml index 4a86c0ed887e..5fb72f224f35 100644 --- a/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/no-cross-zone.gateway.listeners.golden.yaml +++ b/pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/no-cross-zone.gateway.listeners.golden.yaml @@ -37,7 +37,6 @@ resources: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshratelimit/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml b/pkg/plugins/policies/meshratelimit/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml index bc5797e21379..88df4d36c4d3 100644 --- a/pkg/plugins/policies/meshratelimit/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml +++ b/pkg/plugins/policies/meshratelimit/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml @@ -33,7 +33,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/gateway.http.listeners.golden.yaml b/pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/gateway.http.listeners.golden.yaml index bc5797e21379..88df4d36c4d3 100644 --- a/pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/gateway.http.listeners.golden.yaml +++ b/pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/gateway.http.listeners.golden.yaml @@ -33,7 +33,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.listener.golden.yaml b/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.listener.golden.yaml index e7a49c035d58..51a45abaa122 100644 --- a/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.listener.golden.yaml +++ b/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.listener.golden.yaml @@ -33,7 +33,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml b/pkg/plugins/policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml index bc5797e21379..88df4d36c4d3 100644 --- a/pkg/plugins/policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml +++ b/pkg/plugins/policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml @@ -33,7 +33,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml b/pkg/plugins/policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml index bc5797e21379..88df4d36c4d3 100644 --- a/pkg/plugins/policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml +++ b/pkg/plugins/policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml @@ -33,7 +33,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/policies/meshtrace/plugin/v1alpha1/plugin_test.go b/pkg/plugins/policies/meshtrace/plugin/v1alpha1/plugin_test.go index e09fcd13d23c..eaee27fdbcdc 100644 --- a/pkg/plugins/policies/meshtrace/plugin/v1alpha1/plugin_test.go +++ b/pkg/plugins/policies/meshtrace/plugin/v1alpha1/plugin_test.go @@ -135,6 +135,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_17777" tracing: + spawnUpstreamSpan: false clientSampling: value: 20 customTags: @@ -179,6 +180,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_27777" tracing: + spawnUpstreamSpan: false clientSampling: value: 20 customTags: @@ -272,6 +274,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_17777" tracing: + spawnUpstreamSpan: false clientSampling: value: 20 customTags: @@ -314,6 +317,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_27777" tracing: + spawnUpstreamSpan: false clientSampling: value: 20 customTags: @@ -405,6 +409,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_17777" tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.datadog typedConfig: @@ -430,6 +435,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_27777" tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.datadog typedConfig: @@ -496,6 +502,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_17777" tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.zipkin typedConfig: @@ -524,6 +531,7 @@ var _ = Describe("MeshTrace", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: "127_0_0_1_27777" tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.zipkin typedConfig: diff --git a/pkg/plugins/policies/meshtrace/plugin/v1alpha1/testdata/simple-gateway.listeners.golden.yaml b/pkg/plugins/policies/meshtrace/plugin/v1alpha1/testdata/simple-gateway.listeners.golden.yaml index 5d1a7e5a9c8e..3c7e35e1420c 100644 --- a/pkg/plugins/policies/meshtrace/plugin/v1alpha1/testdata/simple-gateway.listeners.golden.yaml +++ b/pkg/plugins/policies/meshtrace/plugin/v1alpha1/testdata/simple-gateway.listeners.golden.yaml @@ -33,7 +33,6 @@ filterChains: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -58,6 +57,7 @@ filterChains: sharedSpanContext: true splitSpansForRequest: true traceId128bit: true + spawnUpstreamSpan: true useRemoteAddress: true listenerFilters: - name: envoy.filters.listener.tls_inspector diff --git a/pkg/plugins/policies/meshtrace/plugin/xds/configurer.go b/pkg/plugins/policies/meshtrace/plugin/xds/configurer.go index d66edfc47b7f..7aeea81714e9 100644 --- a/pkg/plugins/policies/meshtrace/plugin/xds/configurer.go +++ b/pkg/plugins/policies/meshtrace/plugin/xds/configurer.go @@ -50,7 +50,9 @@ func (c *Configurer) Configure(filterChain *envoy_listener.FilterChain) error { } return v3.UpdateHTTPConnectionManager(filterChain, func(hcm *envoy_hcm.HttpConnectionManager) error { - hcm.Tracing = &envoy_hcm.HttpConnectionManager_Tracing{} + hcm.Tracing = &envoy_hcm.HttpConnectionManager_Tracing{ + SpawnUpstreamSpan: wrapperspb.Bool(c.IsGateway), + } if c.Conf.Sampling != nil { if overall := c.Conf.Sampling.Overall; overall != nil { diff --git a/pkg/plugins/runtime/gateway/filter_chain_generator.go b/pkg/plugins/runtime/gateway/filter_chain_generator.go index 0f0a12f1d714..0dff4d6fdeff 100644 --- a/pkg/plugins/runtime/gateway/filter_chain_generator.go +++ b/pkg/plugins/runtime/gateway/filter_chain_generator.go @@ -219,7 +219,13 @@ func newHTTPFilterChain(ctx xds_context.MeshContext, info GatewayListenerInfo) * // is a no-op unless we later add a per-route configuration. envoy_listeners.RateLimit([]*core_mesh.RateLimitResource{nil}), envoy_listeners.DefaultCompressorFilter(), - envoy_listeners.Tracing(ctx.GetTracingBackend(info.Proxy.Policies.TrafficTrace), service, envoy_common.TrafficDirectionUnspecified, ""), + envoy_listeners.Tracing( + ctx.GetTracingBackend(info.Proxy.Policies.TrafficTrace), + service, + envoy_common.TrafficDirectionUnspecified, + "", + true, + ), // In mesh proxies, the access log is configured on the outbound // listener, which is why we index the Logs slice by destination // service name. A Gateway listener by definition forwards traffic @@ -237,8 +243,6 @@ func newHTTPFilterChain(ctx xds_context.MeshContext, info GatewayListenerInfo) * ), ) - builder.AddConfigurer(&envoy_listeners_v3.HTTPRouterStartChildSpanRouter{}) - // TODO(jpeach) if proxy protocol is enabled, add the proxy protocol listener filter. return builder diff --git a/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml index fd43c74e2a8a..74b66e99de26 100644 --- a/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml @@ -40,7 +40,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml index 15c857aacfba..0e3fd4c2b3fc 100644 --- a/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml @@ -40,7 +40,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -97,7 +96,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml index 9761dbbc3038..b6352fc4ac51 100644 --- a/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml @@ -55,7 +55,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -79,6 +78,7 @@ Listeners: collectorEndpoint: /api/v2/spans collectorEndpointVersion: HTTP_JSON collectorHostname: jaeger-collector.kuma-tracing:9411 + spawnUpstreamSpan: true useRemoteAddress: true listenerFilters: - name: envoy.filters.listener.tls_inspector diff --git a/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml index 6aa30c89c86f..c84fba7259d9 100644 --- a/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml @@ -49,7 +49,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml index 303747b62cdb..22e04fc499da 100644 --- a/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml @@ -44,7 +44,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -107,7 +106,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -170,7 +168,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -231,7 +228,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml index ac5700a41b67..fa7843ed15f2 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml index a55aba6ce5bb..368107633c48 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml index 26d81fef89cd..13606dfd4af2 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml index 3bc819ee5411..0c1dd81eef54 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml @@ -122,7 +122,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml index 56774f97df3c..85b5fc66617f 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml @@ -40,7 +40,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml index ae2ed4bf0420..f915391a5fe8 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml @@ -122,7 +122,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml index 7f7158810021..5b0a5384bb69 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml index 6b0e0e7735f1..85e40a1a6112 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml @@ -136,7 +136,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml index f605693bd7f8..dfc42cc941f4 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml index 91ae4dde16e5..f01f4826a4a1 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml @@ -232,7 +232,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml index abaae9f313da..9aee5c2f71e0 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml @@ -136,7 +136,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml index d9bebf21351b..d9e3c3ca6462 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml index 5da71c667132..184eb5ef5173 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml @@ -184,7 +184,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml index 7eda8bf4c9b4..3fc0e1606cc3 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml index 0032c9f764de..b60aa35beebc 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml @@ -178,7 +178,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml index 4d0dd0a60702..7985a0c78d21 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml @@ -175,7 +175,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml index 59e602b49b4c..4f12868bd597 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml @@ -202,7 +202,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml index 98648e99b208..c2ed309f4eaa 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml @@ -85,7 +85,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml index 6e113b9859df..40d3c42281ce 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml @@ -99,7 +99,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml index 34bf499258a0..f2d957ca5f81 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml @@ -178,7 +178,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml index d28e5c443604..a78c441298dd 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml @@ -184,7 +184,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml index c558307b9f67..251bbf26c406 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml @@ -136,7 +136,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml index b8b78365d817..b35c9b712f1a 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml @@ -184,7 +184,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml index 8835db60ba7c..c693441e7320 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml @@ -136,7 +136,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml index a3328450a0e7..05e73027d8f4 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml @@ -112,7 +112,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml index 33297194031c..1d507af98715 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml @@ -96,7 +96,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/cross-mesh-gateway.yaml b/pkg/plugins/runtime/gateway/testdata/http/cross-mesh-gateway.yaml index a0a1ba45ca62..6683453c5548 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/cross-mesh-gateway.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/cross-mesh-gateway.yaml @@ -437,7 +437,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -516,7 +515,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -595,7 +593,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/drop-prefix-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/drop-prefix-gateway-route.yaml index 639154680071..d150ff2f3ebb 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/drop-prefix-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/drop-prefix-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/external-service-with-timeout-no-egress.yaml b/pkg/plugins/runtime/gateway/testdata/http/external-service-with-timeout-no-egress.yaml index 5b8a1551e4e2..72972f032519 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/external-service-with-timeout-no-egress.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/external-service-with-timeout-no-egress.yaml @@ -98,7 +98,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/external-service-without-default-traffic-permission.yaml b/pkg/plugins/runtime/gateway/testdata/http/external-service-without-default-traffic-permission.yaml index 98648e99b208..c2ed309f4eaa 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/external-service-without-default-traffic-permission.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/external-service-without-default-traffic-permission.yaml @@ -85,7 +85,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/http-tcp-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/http-tcp-route.yaml index bc8c18bdca31..11edfa841439 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/http-tcp-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/http-tcp-route.yaml @@ -40,7 +40,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/no-timeout.yaml b/pkg/plugins/runtime/gateway/testdata/http/no-timeout.yaml index ff469ccf2091..0366d398a9f6 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/no-timeout.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/no-timeout.yaml @@ -86,7 +86,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/response-header-set-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/response-header-set-gateway-route.yaml index 679c0234b4fc..7a3729088d0e 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/response-header-set-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/response-header-set-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/retry-policy.yaml b/pkg/plugins/runtime/gateway/testdata/http/retry-policy.yaml index e94304f01649..ed55c01881c9 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/retry-policy.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/retry-policy.yaml @@ -184,7 +184,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-gateway-route.yaml index 424f005b2e08..d06a8d3adfed 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-trailing-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-trailing-gateway-route.yaml index d37cace8fa83..7444f4bb07cc 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-trailing-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-trailing-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/http/unresolved-backend.yaml b/pkg/plugins/runtime/gateway/testdata/http/unresolved-backend.yaml index f3feccb004ea..9c3a58fa86b0 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/unresolved-backend.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/unresolved-backend.yaml @@ -40,7 +40,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml index ac5700a41b67..fa7843ed15f2 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml index a55aba6ce5bb..368107633c48 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml @@ -88,7 +88,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml index 22bd9072adde..2a4a9619b0e8 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml index bfaa2ff64f9d..cbff2df19098 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml @@ -126,7 +126,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml index e63084617a4a..f11e14bb8767 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml @@ -44,7 +44,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml index be973ce9cce3..f180a99a3543 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml @@ -126,7 +126,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml index afdbbd1904e1..c7b46d2a65a5 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml index 2c5516f267bc..bfba90ffb23c 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml @@ -140,7 +140,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml index b36d665bc840..624f825ecc80 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml index b6d4d3e6546d..44358b106871 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml @@ -236,7 +236,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml index fdc87714ddd2..b4b77bae1454 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml @@ -140,7 +140,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml index 773811a98d28..aa3449305159 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml index d7628957710b..375168c0d77d 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml @@ -188,7 +188,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml index 167f55e4fdf5..2c9d465ed85a 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml index 0c19a9de979f..7c5bf8974d0d 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml @@ -182,7 +182,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml index 28d10e7d90c9..5c53b61ce38f 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml @@ -179,7 +179,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml index 61c3b5686504..93985727274c 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml @@ -206,7 +206,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml index e64b4cfcf8dc..ea0a4b6470ba 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml @@ -89,7 +89,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml index 954c3a01fa20..72dcf9c72acb 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml @@ -103,7 +103,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml index 6dc2f3956f4e..4d3e55d1322a 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml @@ -182,7 +182,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -245,7 +244,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -308,7 +306,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml index 157f3700fd29..00c1e2530e9f 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml @@ -188,7 +188,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml index c558307b9f67..251bbf26c406 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml @@ -136,7 +136,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml index b8b78365d817..b35c9b712f1a 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml @@ -184,7 +184,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml index 8835db60ba7c..c693441e7320 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml @@ -136,7 +136,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml index f94261aa217a..970036857a63 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml @@ -116,7 +116,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml index 6f97c2343750..8008002f8b73 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml @@ -100,7 +100,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/cross-mesh-gateway.yaml b/pkg/plugins/runtime/gateway/testdata/https/cross-mesh-gateway.yaml index a0a1ba45ca62..6683453c5548 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/cross-mesh-gateway.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/cross-mesh-gateway.yaml @@ -437,7 +437,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -516,7 +515,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT @@ -595,7 +593,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/drop-prefix-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/drop-prefix-gateway-route.yaml index 485b8e88b275..f41b57fd2d9e 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/drop-prefix-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/drop-prefix-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/external-service-with-timeout-no-egress.yaml b/pkg/plugins/runtime/gateway/testdata/https/external-service-with-timeout-no-egress.yaml index 5b8a1551e4e2..72972f032519 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/external-service-with-timeout-no-egress.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/external-service-with-timeout-no-egress.yaml @@ -98,7 +98,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/external-service-without-default-traffic-permission.yaml b/pkg/plugins/runtime/gateway/testdata/https/external-service-without-default-traffic-permission.yaml index e64b4cfcf8dc..ea0a4b6470ba 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/external-service-without-default-traffic-permission.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/external-service-without-default-traffic-permission.yaml @@ -89,7 +89,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/http-tcp-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/http-tcp-route.yaml index 2dcdf33916b5..b6b57f1f0f5e 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/http-tcp-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/http-tcp-route.yaml @@ -44,7 +44,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/no-timeout.yaml b/pkg/plugins/runtime/gateway/testdata/https/no-timeout.yaml index 31d4d19b1edd..a635efed440a 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/no-timeout.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/no-timeout.yaml @@ -90,7 +90,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/response-header-set-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/response-header-set-gateway-route.yaml index 1a86051f5fea..415477c4fe91 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/response-header-set-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/response-header-set-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/retry-policy.yaml b/pkg/plugins/runtime/gateway/testdata/https/retry-policy.yaml index c87dc56f0027..b8517aaa5d4b 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/retry-policy.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/retry-policy.yaml @@ -188,7 +188,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-gateway-route.yaml index 01b22a08175c..0c001ebd6d90 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-trailing-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-trailing-gateway-route.yaml index ca209f386f68..18fe31b6d570 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-trailing-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-trailing-gateway-route.yaml @@ -92,7 +92,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/plugins/runtime/gateway/testdata/https/unresolved-backend.yaml b/pkg/plugins/runtime/gateway/testdata/https/unresolved-backend.yaml index 3087fc118406..c0c0a551171f 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/unresolved-backend.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/unresolved-backend.yaml @@ -44,7 +44,6 @@ Listeners: - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - startChildSpan: true mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT diff --git a/pkg/xds/envoy/listeners/filter_chain_configurers.go b/pkg/xds/envoy/listeners/filter_chain_configurers.go index 5b1e9c3c2848..8219a431c158 100644 --- a/pkg/xds/envoy/listeners/filter_chain_configurers.go +++ b/pkg/xds/envoy/listeners/filter_chain_configurers.go @@ -27,12 +27,19 @@ func Kafka(statsName string) FilterChainBuilderOpt { }) } -func Tracing(backend *mesh_proto.TracingBackend, service string, direction envoy_common.TrafficDirection, destination string) FilterChainBuilderOpt { +func Tracing( + backend *mesh_proto.TracingBackend, + service string, + direction envoy_common.TrafficDirection, + destination string, + spawnUpstreamSpan bool, +) FilterChainBuilderOpt { return AddFilterChainConfigurer(&v3.TracingConfigurer{ - Backend: backend, - Service: service, - TrafficDirection: direction, - Destination: destination, + Backend: backend, + Service: service, + TrafficDirection: direction, + Destination: destination, + SpawnUpstreamSpan: spawnUpstreamSpan, }) } diff --git a/pkg/xds/envoy/listeners/v3/http_router_configurer.go b/pkg/xds/envoy/listeners/v3/http_router_configurer.go deleted file mode 100644 index f7efb90dc9e2..000000000000 --- a/pkg/xds/envoy/listeners/v3/http_router_configurer.go +++ /dev/null @@ -1,33 +0,0 @@ -package v3 - -import ( - envoy_listener "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" - envoy_router "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3" - envoy_hcm "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" - - util_proto "github.com/kumahq/kuma/pkg/util/proto" -) - -// HTTPRouterStartChildSpanRouter configures the router to start child spans. -type HTTPRouterStartChildSpanRouter struct{} - -var _ FilterChainConfigurer = &HTTPRouterStartChildSpanRouter{} - -func (c *HTTPRouterStartChildSpanRouter) Configure(filterChain *envoy_listener.FilterChain) error { - return UpdateHTTPConnectionManager(filterChain, func(hcm *envoy_hcm.HttpConnectionManager) error { - typedConfig, err := util_proto.MarshalAnyDeterministic(&envoy_router.Router{ - StartChildSpan: true, - }) - if err != nil { - return err - } - router := &envoy_hcm.HttpFilter{ - Name: "envoy.filters.http.router", - ConfigType: &envoy_hcm.HttpFilter_TypedConfig{ - TypedConfig: typedConfig, - }, - } - hcm.HttpFilters = append(hcm.HttpFilters, router) - return nil - }) -} diff --git a/pkg/xds/envoy/listeners/v3/tracing_configurer.go b/pkg/xds/envoy/listeners/v3/tracing_configurer.go index aeb038b76091..bdd94789b0e4 100644 --- a/pkg/xds/envoy/listeners/v3/tracing_configurer.go +++ b/pkg/xds/envoy/listeners/v3/tracing_configurer.go @@ -10,6 +10,7 @@ import ( envoy_type "github.com/envoyproxy/go-control-plane/envoy/type/v3" "github.com/pkg/errors" "google.golang.org/protobuf/types/known/structpb" + "google.golang.org/protobuf/types/known/wrapperspb" mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1" "github.com/kumahq/kuma/pkg/util/proto" @@ -25,6 +26,8 @@ type TracingConfigurer struct { Service string TrafficDirection envoy_common.TrafficDirection Destination string + + SpawnUpstreamSpan bool } var _ FilterChainConfigurer = &TracingConfigurer{} @@ -35,7 +38,9 @@ func (c *TracingConfigurer) Configure(filterChain *envoy_listener.FilterChain) e } return UpdateHTTPConnectionManager(filterChain, func(hcm *envoy_hcm.HttpConnectionManager) error { - hcm.Tracing = &envoy_hcm.HttpConnectionManager_Tracing{} + hcm.Tracing = &envoy_hcm.HttpConnectionManager_Tracing{ + SpawnUpstreamSpan: wrapperspb.Bool(c.SpawnUpstreamSpan), + } if c.Backend.Sampling != nil { hcm.Tracing.OverallSampling = &envoy_type.Percent{ Value: c.Backend.Sampling.Value, diff --git a/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go b/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go index e25894f891b1..0d9d9acc5b1c 100644 --- a/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go @@ -26,7 +26,7 @@ var _ = Describe("TracingConfigurer", func() { listener, err := NewInboundListenerBuilder(envoy.APIV3, "192.168.0.1", 8080, xds.SocketAddressProtocolTCP). Configure(FilterChain(NewFilterChainBuilder(envoy.APIV3, envoy.AnonymousResource). Configure(HttpConnectionManager("localhost:8080", false)). - Configure(Tracing(given.backend, "service", given.direction, given.destination)))). + Configure(Tracing(given.backend, "service", given.direction, given.destination, false)))). Build() // then Expect(err).ToNot(HaveOccurred()) @@ -63,6 +63,7 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: + spawnUpstreamSpan: false overallSampling: value: 30.5 provider: @@ -101,6 +102,7 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.zipkin typedConfig: @@ -139,6 +141,7 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.datadog typedConfig: @@ -176,6 +179,7 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.datadog typedConfig: @@ -214,6 +218,7 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: + spawnUpstreamSpan: false provider: name: envoy.tracers.datadog typedConfig: diff --git a/pkg/xds/generator/inbound_proxy_generator.go b/pkg/xds/generator/inbound_proxy_generator.go index 763250e77fcb..07e9e78ef9fb 100644 --- a/pkg/xds/generator/inbound_proxy_generator.go +++ b/pkg/xds/generator/inbound_proxy_generator.go @@ -101,7 +101,7 @@ func (g InboundProxyGenerator) Generate(ctx context.Context, _ *core_xds.Resourc Configure(envoy_listeners.HttpConnectionManager(localClusterName, true)). Configure(envoy_listeners.FaultInjection(proxy.Policies.FaultInjections[endpoint]...)). Configure(envoy_listeners.RateLimit(proxy.Policies.RateLimitsInbound[endpoint])). - Configure(envoy_listeners.Tracing(xdsCtx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), service, envoy_common.TrafficDirectionInbound, "")). + Configure(envoy_listeners.Tracing(xdsCtx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), service, envoy_common.TrafficDirectionInbound, "", false)). Configure(envoy_listeners.HttpInboundRoutes(service, routes)) case core_mesh.ProtocolGRPC: filterChainBuilder. @@ -109,7 +109,7 @@ func (g InboundProxyGenerator) Generate(ctx context.Context, _ *core_xds.Resourc Configure(envoy_listeners.GrpcStats()). Configure(envoy_listeners.FaultInjection(proxy.Policies.FaultInjections[endpoint]...)). Configure(envoy_listeners.RateLimit(proxy.Policies.RateLimitsInbound[endpoint])). - Configure(envoy_listeners.Tracing(xdsCtx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), service, envoy_common.TrafficDirectionInbound, "")). + Configure(envoy_listeners.Tracing(xdsCtx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), service, envoy_common.TrafficDirectionInbound, "", false)). Configure(envoy_listeners.HttpInboundRoutes(service, routes)) case core_mesh.ProtocolKafka: filterChainBuilder. diff --git a/pkg/xds/generator/outbound_proxy_generator.go b/pkg/xds/generator/outbound_proxy_generator.go index d737972611d6..ce89b2a4c243 100644 --- a/pkg/xds/generator/outbound_proxy_generator.go +++ b/pkg/xds/generator/outbound_proxy_generator.go @@ -120,7 +120,13 @@ func (OutboundProxyGenerator) generateLDS(ctx xds_context.Context, proxy *model. case core_mesh.ProtocolGRPC: filterChainBuilder. Configure(envoy_listeners.HttpConnectionManager(serviceName, false)). - Configure(envoy_listeners.Tracing(ctx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), sourceService, envoy_common.TrafficDirectionOutbound, serviceName)). + Configure(envoy_listeners.Tracing( + ctx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), + sourceService, + envoy_common.TrafficDirectionOutbound, + serviceName, + false, + )). Configure(envoy_listeners.HttpAccessLog(meshName, envoy_common.TrafficDirectionOutbound, sourceService, serviceName, ctx.Mesh.GetLoggingBackend(proxy.Policies.TrafficLogs[serviceName]), proxy)). Configure(envoy_listeners.HttpOutboundRoute(serviceName, routes, proxy.Dataplane.Spec.TagSet())). @@ -131,7 +137,13 @@ func (OutboundProxyGenerator) generateLDS(ctx xds_context.Context, proxy *model. case core_mesh.ProtocolHTTP, core_mesh.ProtocolHTTP2: filterChainBuilder. Configure(envoy_listeners.HttpConnectionManager(serviceName, false)). - Configure(envoy_listeners.Tracing(ctx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), sourceService, envoy_common.TrafficDirectionOutbound, serviceName)). + Configure(envoy_listeners.Tracing( + ctx.Mesh.GetTracingBackend(proxy.Policies.TrafficTrace), + sourceService, + envoy_common.TrafficDirectionOutbound, + serviceName, + false, + )). // backwards compatibility to support RateLimit for ExternalServices without ZoneEgress ConfigureIf(!ctx.Mesh.Resource.ZoneEgressEnabled(), envoy_listeners.RateLimit(rateLimits)). Configure(envoy_listeners.HttpAccessLog(