Rename multipart-specific field to be more general

Author: endigma

v2/pkg/engine/resolve/event_loop_test.go

@@ -119,16 +119,16 @@ func TestEventLoop(t *testing.T) {
 	testReporter := &TestReporter{}
 
 	resolver := New(resolverCtx, ResolverOptions{
-		MaxConcurrency:                1024,
-		Debug:                         false,
-		AsyncErrorWriter:              ew,
-		PropagateSubgraphErrors:       false,
-		PropagateSubgraphStatusCodes:  false,
-		SubgraphErrorPropagationMode:  SubgraphErrorPropagationModePassThrough,
-		DefaultErrorExtensionCode:     "TEST",
-		MaxRecyclableParserSize:       1024 * 1024,
-		MultipartSubHeartbeatInterval: DefaultHeartbeatInterval,
-		Reporter:                      testReporter,
+		MaxConcurrency:               1024,
+		Debug:                        false,
+		AsyncErrorWriter:             ew,
+		PropagateSubgraphErrors:      false,
+		PropagateSubgraphStatusCodes: false,
+		SubgraphErrorPropagationMode: SubgraphErrorPropagationModePassThrough,
+		DefaultErrorExtensionCode:    "TEST",
+		MaxRecyclableParserSize:      1024 * 1024,
+		SubHeartbeatInterval:         DefaultHeartbeatInterval,
+		Reporter:                     testReporter,
 	})
 
 	subscription := &GraphQLSubscription{

v2/pkg/engine/resolve/resolve.go

@@ -139,8 +139,8 @@ type ResolverOptions struct {
 	ResolvableOptions ResolvableOptions
 	// AllowedCustomSubgraphErrorFields defines which fields are allowed in the subgraph error when in passthrough mode
 	AllowedSubgraphErrorFields []string
-	// MultipartSubHeartbeatInterval defines the interval in which a heartbeat is sent to all multipart subscriptions
-	MultipartSubHeartbeatInterval time.Duration
+	// SubHeartbeatInterval defines the interval in which a heartbeat is sent to all subscriptions (whether or not this does anything is determined by the subscription response writer)
+	SubHeartbeatInterval time.Duration
 	// MaxSubscriptionFetchTimeout defines the maximum time a subscription fetch can take before it is considered timed out
 	MaxSubscriptionFetchTimeout time.Duration
 	// ApolloRouterCompatibilitySubrequestHTTPError is a compatibility flag for Apollo Router, it is used to handle HTTP errors in subrequests differently
@@ -154,8 +154,8 @@ func New(ctx context.Context, options ResolverOptions) *Resolver {
 		options.MaxConcurrency = 32
 	}
 
-	if options.MultipartSubHeartbeatInterval <= 0 {
-		options.MultipartSubHeartbeatInterval = DefaultHeartbeatInterval
+	if options.SubHeartbeatInterval <= 0 {
+		options.SubHeartbeatInterval = DefaultHeartbeatInterval
 	}
 
 	// We transform the allowed fields into a map for faster lookups
@@ -198,7 +198,7 @@ func New(ctx context.Context, options ResolverOptions) *Resolver {
 		triggerUpdateBuf:             bytes.NewBuffer(make([]byte, 0, 1024)),
 		allowedErrorExtensionFields:  allowedExtensionFields,
 		allowedErrorFields:           allowedErrorFields,
-		heartbeatInterval:            options.MultipartSubHeartbeatInterval,
+		heartbeatInterval:            options.SubHeartbeatInterval,
 		maxSubscriptionFetchTimeout:  options.MaxSubscriptionFetchTimeout,
 	}
 	resolver.maxConcurrency = make(chan struct{}, options.MaxConcurrency)

v2/pkg/engine/resolve/resolve_test.go

@@ -90,12 +90,12 @@ var multipartSubHeartbeatInterval = 100 * time.Millisecond
 
 func newResolver(ctx context.Context) *Resolver {
 	return New(ctx, ResolverOptions{
-		MaxConcurrency:                1024,
-		Debug:                         false,
-		PropagateSubgraphErrors:       true,
-		PropagateSubgraphStatusCodes:  true,
-		AsyncErrorWriter:              &TestErrorWriter{},
-		MultipartSubHeartbeatInterval: multipartSubHeartbeatInterval,
+		MaxConcurrency:               1024,
+		Debug:                        false,
+		PropagateSubgraphErrors:      true,
+		PropagateSubgraphStatusCodes: true,
+		AsyncErrorWriter:             &TestErrorWriter{},
+		SubHeartbeatInterval:         multipartSubHeartbeatInterval,
 	})
 }