feat: schedule fetch trees optimally

execution/engine/engine_config.go

@@ -22,6 +22,7 @@ type Configuration struct {
 	schema                   *graphql.Schema
 	plannerConfig            plan.Configuration
 	websocketBeforeStartHook WebsocketBeforeStartHook
+	enableScheduleFetches    bool
 }
 
 func NewConfiguration(schema *graphql.Schema) Configuration {
@@ -79,6 +80,11 @@ func (e *Configuration) EnableMultiFetch() {
 	e.plannerConfig.EnableMultiFetch = true
 }
 
+// EnableScheduleFetches organizes fetches into component-split, chain-inlined trees.
+func (e *Configuration) EnableScheduleFetches() {
+	e.enableScheduleFetches = true
+}
+
 type dataSourceGeneratorOptions struct {
 	streamingClient           *http.Client
 	subscriptionType          SubscriptionType

execution/engine/execution_engine.go

@@ -158,6 +158,9 @@ func NewExecutionEngine(ctx context.Context, logger abstractlogger.Logger, engin
 	if engineConfig.plannerConfig.EnableMultiFetch {
 		postProcessorOptions = append(postProcessorOptions, postprocess.EnableMultiFetch())
 	}
+	if engineConfig.enableScheduleFetches {
+		postProcessorOptions = append(postProcessorOptions, postprocess.EnableScheduleFetches())
+	}
 
 	return &ExecutionEngine{
 		logger:             logger,

execution/engine/execution_engine_schedule_fetches_test.go

@@ -0,0 +1,260 @@
+package engine
+
+import (
+	"context"
+	"testing"
+
+	"github.com/jensneuse/abstractlogger"
+	"github.com/stretchr/testify/require"
+
+	"github.com/wundergraph/graphql-go-tools/execution/graphql"
+	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource"
+	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/plan"
+	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/resolve"
+)
+
+// Two independent fetch chains:
+//   - alpha root -> b entity fetch,
+//   - and b root -> alpha entity fetch.
+const scheduleFetchesSchema = `
+	type Query {
+		a: A
+		aTwo: A
+		b: B
+	}
+	type A {
+		id: ID!
+		bField: String
+	}
+	type B {
+		id: ID!
+		aField: String
+	}
+`
+const scheduleFetchesAlphaSDL = `
+	type Query {
+		a: A
+		aTwo: A
+	}
+	type A @key(fields: "id") {
+		id: ID!
+	}
+	type B @key(fields: "id") {
+		id: ID!
+		aField: String
+	}
+`
+const scheduleFetchesBetaSDL = `
+	type Query {
+		b: B
+	}
+	type B @key(fields: "id") {
+		id: ID!
+	}
+	type A @key(fields: "id") {
+		id: ID!
+		bField: String
+	}
+`
+const scheduleFetchesQuery = `
+	query {
+		a { bField }
+		b { aField }
+	}
+`
+const scheduleFetchesCombinedQuery = `
+	query {
+		a { bField }
+		aTwo { bField }
+		b { aField }
+	}
+`
+
+const (
+	scheduleFetchesAlphaRootBody   = `{"query":"{a {__typename id}}"}`
+	scheduleFetchesAlphaRootData   = `{"data":{"a":{"__typename":"A","id":"1"}}}`
+	scheduleFetchesAlphaEntityBody = `{"query":"query($representations: [_Any!]!){_entities(representations: $representations){... on B {__typename aField}}}","variables":{"representations":[{"__typename":"B","id":"2"}]}}`
+	scheduleFetchesAlphaEntityData = `{"data":{"_entities":[{"__typename":"B","aField":"a"}]}}`
+
+	scheduleFetchesBetaRootBody   = `{"query":"{b {__typename id}}"}`
+	scheduleFetchesBetaRootData   = `{"data":{"b":{"__typename":"B","id":"2"}}}`
+	scheduleFetchesBetaEntityBody = `{"query":"query($representations: [_Any!]!){_entities(representations: $representations){... on A {__typename bField}}}","variables":{"representations":[{"__typename":"A","id":"1"}]}}`
+	scheduleFetchesBetaEntityData = `{"data":{"_entities":[{"__typename":"A","bField":"b"}]}}`
+
+	scheduleFetchesClientResponse = `{"data":{"a":{"bField":"b"},"b":{"aField":"a"}}}`
+
+	scheduleFetchesCombinedAlphaRootBody = `{"query":"{a {__typename id} aTwo {__typename id}}"}`
+	scheduleFetchesCombinedAlphaRootData = `{"data":{"a":{"__typename":"A","id":"1"},"aTwo":{"__typename":"A","id":"3"}}}`
+	scheduleFetchesMergedBetaBody        = `{"query":"query($representations_f1: [_Any!]!, $includeF1: Boolean!, $representations_f2: [_Any!]!, $includeF2: Boolean!){f1: _entities(representations: $representations_f1)@include(if: $includeF1) {... on A {__typename bField}} f2: _entities(representations: $representations_f2)@include(if: $includeF2) {... on A {__typename bField}}}","variables":{"representations_f1":[{"__typename":"A","id":"1"}],"includeF1":true,"representations_f2":[{"__typename":"A","id":"3"}],"includeF2":true}}`
+	scheduleFetchesMergedBetaData        = `{"data":{"f1":[{"__typename":"A","bField":"b"}],"f2":[{"__typename":"A","bField":"b2"}]}}`
+
+	scheduleFetchesCombinedClientResponse = `{"data":{"a":{"bField":"b"},"aTwo":{"bField":"b2"},"b":{"aField":"a"}}}`
+)
+
+func scheduleFetchesDataSource(t *testing.T, name, sdl string, rec *multiFetchRecorder, responses map[string]sendResponse, rootNodes []plan.TypeField) plan.DataSource {
+	t.Helper()
+
+	return mustGraphqlDataSourceConfiguration(t,
+		name,
+		mustFactory(t, recordingClient(t, rec, name, "/", responses)),
+		&plan.DataSourceMetadata{
+			RootNodes: rootNodes,
+			FederationMetaData: plan.FederationMetaData{
+				Keys: plan.FederationFieldConfigurations{
+					{TypeName: "A", SelectionSet: "id"},
+					{TypeName: "B", SelectionSet: "id"},
+				},
+			},
+		},
+		mustConfiguration(t, graphql_datasource.ConfigurationInput{
+			Fetch: &graphql_datasource.FetchConfiguration{URL: "http://" + name + "/", Method: "POST"},
+			SchemaConfiguration: mustSchemaConfig(t,
+				&graphql_datasource.FederationConfiguration{Enabled: true, ServiceSDL: sdl},
+				sdl,
+			),
+		}),
+	)
+}
+
+func scheduleFetchesDataSources(t *testing.T, aRec, bRec *multiFetchRecorder) []plan.DataSource {
+	t.Helper()
+
+	a := scheduleFetchesDataSource(t, "a", scheduleFetchesAlphaSDL, aRec,
+		map[string]sendResponse{
+			scheduleFetchesAlphaRootBody:         {statusCode: 200, body: scheduleFetchesAlphaRootData},
+			scheduleFetchesAlphaEntityBody:       {statusCode: 200, body: scheduleFetchesAlphaEntityData},
+			scheduleFetchesCombinedAlphaRootBody: {statusCode: 200, body: scheduleFetchesCombinedAlphaRootData},
+		},
+		[]plan.TypeField{
+			{TypeName: "Query", FieldNames: []string{"a", "aTwo"}},
+			{TypeName: "A", FieldNames: []string{"id"}},
+			{TypeName: "B", FieldNames: []string{"id", "aField"}},
+		})
+
+	b := scheduleFetchesDataSource(t, "b", scheduleFetchesBetaSDL, bRec,
+		map[string]sendResponse{
+			scheduleFetchesBetaRootBody:   {statusCode: 200, body: scheduleFetchesBetaRootData},
+			scheduleFetchesBetaEntityBody: {statusCode: 200, body: scheduleFetchesBetaEntityData},
+			scheduleFetchesMergedBetaBody: {statusCode: 200, body: scheduleFetchesMergedBetaData},
+		},
+		[]plan.TypeField{
+			{TypeName: "Query", FieldNames: []string{"b"}},
+			{TypeName: "B", FieldNames: []string{"id"}},
+			{TypeName: "A", FieldNames: []string{"id", "bField"}},
+		})
+
+	return []plan.DataSource{a, b}
+}
+
+// runScheduleFetchesQuery plans and executes the query and returns
+// the response body, the organized fetch tree, and the request bodies each subgraph received.
+func runScheduleFetchesQuery(t *testing.T, query string, enableMultiFetch, enableScheduleFetches bool) (string, *resolve.FetchTreeNode, []string, []string) {
+	t.Helper()
+
+	schema, err := graphql.NewSchemaFromString(scheduleFetchesSchema)
+	require.NoError(t, err)
+
+	aRec, bRec := &multiFetchRecorder{}, &multiFetchRecorder{}
+	engineConf := NewConfiguration(schema)
+	engineConf.SetDataSources(scheduleFetchesDataSources(t, aRec, bRec))
+	if enableMultiFetch {
+		engineConf.EnableMultiFetch()
+	}
+	if enableScheduleFetches {
+		engineConf.EnableScheduleFetches()
+	}
+
+	ctx, cancel := context.WithCancel(t.Context())
+	defer cancel()
+
+	engine, err := NewExecutionEngine(ctx, abstractlogger.Noop{}, engineConf, resolve.ResolverOptions{MaxConcurrency: 1024})
+	require.NoError(t, err)
+
+	operation := graphql.Request{Query: query}
+	resultWriter := graphql.NewEngineResultWriter()
+	require.NoError(t, engine.Execute(ctx, &operation, &resultWriter))
+
+	require.Equal(t, 1, engine.executionPlanCache.Len())
+	_, cachedPlan, ok := engine.executionPlanCache.GetOldest()
+	require.True(t, ok)
+	syncPlan, ok := cachedPlan.(*plan.SynchronousResponsePlan)
+	require.True(t, ok)
+	return resultWriter.String(), syncPlan.Response.Fetches, aRec.requests(), bRec.requests()
+}
+
+func nodeKinds(nodes []*resolve.FetchTreeNode) []resolve.FetchTreeNodeKind {
+	kinds := make([]resolve.FetchTreeNodeKind, len(nodes))
+	for i, n := range nodes {
+		kinds[i] = n.Kind
+	}
+	return kinds
+}
+
+func TestExecutionEngine_ScheduleFetches(t *testing.T) {
+	// Request bodies are asserted as sets: under the scheduler the chains progress independently,
+	// so arrival order at a host is not deterministic.
+	cases := []struct {
+		name                 string
+		query                string
+		multiFetch, schedule bool
+		response             string
+		aReqs, bReqs         []string
+		rootKind             resolve.FetchTreeNodeKind
+		childKinds           []resolve.FetchTreeNodeKind
+	}{
+		{
+			name:       "default organizes legacy waves",
+			query:      scheduleFetchesQuery,
+			response:   scheduleFetchesClientResponse,
+			aReqs:      []string{scheduleFetchesAlphaRootBody, scheduleFetchesAlphaEntityBody},
+			bReqs:      []string{scheduleFetchesBetaRootBody, scheduleFetchesBetaEntityBody},
+			rootKind:   resolve.FetchTreeNodeKindSequence,
+			childKinds: []resolve.FetchTreeNodeKind{resolve.FetchTreeNodeKindParallel, resolve.FetchTreeNodeKindParallel},
+		},
+		{
+			name:       "scheduling organizes independent inlined chains",
+			query:      scheduleFetchesQuery,
+			schedule:   true,
+			response:   scheduleFetchesClientResponse,
+			aReqs:      []string{scheduleFetchesAlphaRootBody, scheduleFetchesAlphaEntityBody},
+			bReqs:      []string{scheduleFetchesBetaRootBody, scheduleFetchesBetaEntityBody},
+			rootKind:   resolve.FetchTreeNodeKindParallel,
+			childKinds: []resolve.FetchTreeNodeKind{resolve.FetchTreeNodeKindSequence, resolve.FetchTreeNodeKindSequence},
+		},
+		{
+			name:       "multi fetch without scheduling merges within legacy waves",
+			query:      scheduleFetchesCombinedQuery,
+			multiFetch: true,
+			response:   scheduleFetchesCombinedClientResponse,
+			aReqs:      []string{scheduleFetchesCombinedAlphaRootBody, scheduleFetchesAlphaEntityBody},
+			// The two same-wave b entity fetches merged into one aliased request,
+			// while the tree keeps the legacy wave shape.
+			bReqs:      []string{scheduleFetchesBetaRootBody, scheduleFetchesMergedBetaBody},
+			rootKind:   resolve.FetchTreeNodeKindSequence,
+			childKinds: []resolve.FetchTreeNodeKind{resolve.FetchTreeNodeKindParallel, resolve.FetchTreeNodeKindParallel},
+		},
+		{
+			name:       "multi fetch and scheduling together produce two inlined chains",
+			query:      scheduleFetchesCombinedQuery,
+			multiFetch: true,
+			schedule:   true,
+			response:   scheduleFetchesCombinedClientResponse,
+			aReqs:      []string{scheduleFetchesCombinedAlphaRootBody, scheduleFetchesAlphaEntityBody},
+			// The two same-wave b entity fetches merged into one aliased request.
+			bReqs:      []string{scheduleFetchesBetaRootBody, scheduleFetchesMergedBetaBody},
+			rootKind:   resolve.FetchTreeNodeKindParallel,
+			childKinds: []resolve.FetchTreeNodeKind{resolve.FetchTreeNodeKindSequence, resolve.FetchTreeNodeKindSequence},
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			response, fetches, aReqs, bReqs := runScheduleFetchesQuery(t, tc.query, tc.multiFetch, tc.schedule)
+			require.Equal(t, tc.response, response)
+			require.ElementsMatch(t, tc.aReqs, aReqs)
+			require.ElementsMatch(t, tc.bReqs, bReqs)
+			require.Equal(t, tc.rootKind, fetches.Kind)
+			require.Equal(t, tc.childKinds, nodeKinds(fetches.ChildNodes))
+		})
+	}
+}

execution/go.mod

@@ -67,13 +67,13 @@ require (
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/term v0.41.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
+	golang.org/x/mod v0.37.0 // indirect
+	golang.org/x/net v0.56.0 // indirect
+	golang.org/x/sync v0.21.0 // indirect
+	golang.org/x/sys v0.46.0 // indirect
+	golang.org/x/term v0.44.0 // indirect
+	golang.org/x/text v0.39.0 // indirect
+	golang.org/x/tools v0.47.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

execution/go.sum

@@ -191,19 +191,19 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
+golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191116160921-f9c825593386/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
+golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -217,24 +217,24 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
-golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
+golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
+golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
+golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=