chore(kuma-cp): stop using deprecated StartChildSpan (#9045)

Signed-off-by: Mike Beaumont <[email protected]>
kumahq · Jan 26, 2024 · f0be390 · f0be390
1 parent bda3bc4
commit f0be390
Show file tree

Hide file tree

Showing 101 changed files with 60 additions and 153 deletions.
diff --git a/...olicies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml b/...olicies/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/...s/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml b/...s/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/...es/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml b/...es/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
@@ -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/...es/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml b/...es/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/...adbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.listeners.golden.yaml b/...adbalancingstrategy/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/...oadbalancingstrategy/plugin/v1alpha1/testdata/no-cross-zone.gateway.listeners.golden.yaml b/...oadbalancingstrategy/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/...lugins/policies/meshratelimit/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml b/...lugins/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
@@ -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
@@ -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/...policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml b/...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/...policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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