Revert "Commit NewReportingPlugin retries on error"

core/services/ocr2/plugins/ccip/ccipcommit/factory.go

@@ -9,7 +9,6 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcommon"
 
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
@@ -65,60 +64,40 @@ func (rf *CommitReportingPluginFactory) UpdateDynamicReaders(ctx context.Context
 	return nil
 }
 
-type reportingPluginAndInfo struct {
-	plugin     types.ReportingPlugin
-	pluginInfo types.ReportingPluginInfo
-}
-
-// NewReportingPlugin registers a new ReportingPlugin
+// NewReportingPlugin returns the ccip CommitReportingPlugin and satisfies the ReportingPluginFactory interface.
 func (rf *CommitReportingPluginFactory) NewReportingPlugin(config types.ReportingPluginConfig) (types.ReportingPlugin, types.ReportingPluginInfo, error) {
-	initialRetryDelay := rf.config.newReportingPluginRetryConfig.InitialDelay
-	maxDelay := rf.config.newReportingPluginRetryConfig.MaxDelay
+	ctx := context.Background() // todo: consider adding some timeout
 
-	pluginAndInfo, err := ccipcommon.RetryUntilSuccess(rf.NewReportingPluginFn(config), initialRetryDelay, maxDelay)
+	destPriceReg, err := rf.config.commitStore.ChangeConfig(ctx, config.OnchainConfig, config.OffchainConfig)
 	if err != nil {
 		return nil, types.ReportingPluginInfo{}, err
 	}
-	return pluginAndInfo.plugin, pluginAndInfo.pluginInfo, err
-}
-
-// NewReportingPluginFn implements the NewReportingPlugin logic. It is defined as a function so that it can easily be
-// retried via RetryUntilSuccess. NewReportingPlugin must return successfully in order for the Commit plugin to
-// function, hence why we can only keep retrying it until it succeeds.
-func (rf *CommitReportingPluginFactory) NewReportingPluginFn(config types.ReportingPluginConfig) func() (reportingPluginAndInfo, error) {
-	return func() (reportingPluginAndInfo, error) {
-		ctx := context.Background() // todo: consider adding some timeout
 
-		destPriceReg, err := rf.config.commitStore.ChangeConfig(ctx, config.OnchainConfig, config.OffchainConfig)
-		if err != nil {
-			return reportingPluginAndInfo{}, err
-		}
-
-		priceRegEvmAddr, err := ccipcalc.GenericAddrToEvm(destPriceReg)
-		if err != nil {
-			return reportingPluginAndInfo{}, err
-		}
-		if err = rf.UpdateDynamicReaders(ctx, priceRegEvmAddr); err != nil {
-			return reportingPluginAndInfo{}, err
-		}
+	priceRegEvmAddr, err := ccipcalc.GenericAddrToEvm(destPriceReg)
+	if err != nil {
+		return nil, types.ReportingPluginInfo{}, err
+	}
+	if err = rf.UpdateDynamicReaders(ctx, priceRegEvmAddr); err != nil {
+		return nil, types.ReportingPluginInfo{}, err
+	}
 
-		pluginOffChainConfig, err := rf.config.commitStore.OffchainConfig(ctx)
-		if err != nil {
-			return reportingPluginAndInfo{}, err
-		}
+	pluginOffChainConfig, err := rf.config.commitStore.OffchainConfig(ctx)
+	if err != nil {
+		return nil, types.ReportingPluginInfo{}, err
+	}
 
-		gasPriceEstimator, err := rf.config.commitStore.GasPriceEstimator(ctx)
-		if err != nil {
-			return reportingPluginAndInfo{}, err
-		}
+	gasPriceEstimator, err := rf.config.commitStore.GasPriceEstimator(ctx)
+	if err != nil {
+		return nil, types.ReportingPluginInfo{}, err
+	}
 
-		err = rf.config.priceService.UpdateDynamicConfig(ctx, gasPriceEstimator, rf.destPriceRegReader)
-		if err != nil {
-			return reportingPluginAndInfo{}, err
-		}
+	err = rf.config.priceService.UpdateDynamicConfig(ctx, gasPriceEstimator, rf.destPriceRegReader)
+	if err != nil {
+		return nil, types.ReportingPluginInfo{}, err
+	}
 
-		lggr := rf.config.lggr.Named("CommitReportingPlugin")
-		plugin := &CommitReportingPlugin{
+	lggr := rf.config.lggr.Named("CommitReportingPlugin")
+	return &CommitReportingPlugin{
 			sourceChainSelector:     rf.config.sourceChainSelector,
 			sourceNative:            rf.config.sourceNative,
 			onRampReader:            rf.config.onRampReader,
@@ -133,18 +112,14 @@ func (rf *CommitReportingPluginFactory) NewReportingPluginFn(config types.Report
 			metricsCollector:        rf.config.metricsCollector,
 			chainHealthcheck:        rf.config.chainHealthcheck,
 			priceService:            rf.config.priceService,
-		}
-
-		pluginInfo := types.ReportingPluginInfo{
+		},
+		types.ReportingPluginInfo{
 			Name:          "CCIPCommit",
 			UniqueReports: false, // See comment in CommitStore constructor.
 			Limits: types.ReportingPluginLimits{
 				MaxQueryLength:       ccip.MaxQueryLength,
 				MaxObservationLength: ccip.MaxObservationLength,
 				MaxReportLength:      MaxCommitReportLength,
 			},
-		}
-
-		return reportingPluginAndInfo{plugin, pluginInfo}, nil
-	}
+		}, nil
 }

core/services/ocr2/plugins/ccip/ccipcommit/initializers.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"math/big"
 	"strings"
-	"time"
 
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/pricegetter"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib"
@@ -44,8 +43,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 )
 
-var defaultNewReportingPluginRetryConfig = ccipdata.RetryConfig{InitialDelay: time.Second, MaxDelay: 5 * time.Minute}
-
 func NewCommitServices(ctx context.Context, ds sqlutil.DataSource, srcProvider commontypes.CCIPCommitProvider, dstProvider commontypes.CCIPCommitProvider, chainSet legacyevm.LegacyChainContainer, jb job.Job, lggr logger.Logger, pr pipeline.Runner, argsNoPlugin libocr2.OCR2OracleArgs, new bool, sourceChainID int64, destChainID int64, logError func(string)) ([]job.ServiceCtx, error) {
 	spec := jb.OCR2OracleSpec
 
@@ -177,18 +174,17 @@ func NewCommitServices(ctx context.Context, ds sqlutil.DataSource, srcProvider c
 	)
 
 	wrappedPluginFactory := NewCommitReportingPluginFactory(CommitPluginStaticConfig{
-		lggr:                          lggr,
-		newReportingPluginRetryConfig: defaultNewReportingPluginRetryConfig,
-		onRampReader:                  onRampReader,
-		sourceChainSelector:           staticConfig.SourceChainSelector,
-		sourceNative:                  sourceNative,
-		offRamp:                       offRampReader,
-		commitStore:                   commitStoreReader,
-		destChainSelector:             staticConfig.ChainSelector,
-		priceRegistryProvider:         ccip.NewChainAgnosticPriceRegistry(dstProvider),
-		metricsCollector:              metricsCollector,
-		chainHealthcheck:              chainHealthCheck,
-		priceService:                  priceService,
+		lggr:                  lggr,
+		onRampReader:          onRampReader,
+		sourceChainSelector:   staticConfig.SourceChainSelector,
+		sourceNative:          sourceNative,
+		offRamp:               offRampReader,
+		commitStore:           commitStoreReader,
+		destChainSelector:     staticConfig.ChainSelector,
+		priceRegistryProvider: ccip.NewChainAgnosticPriceRegistry(dstProvider),
+		metricsCollector:      metricsCollector,
+		chainHealthcheck:      chainHealthCheck,
+		priceService:          priceService,
 	})
 	argsNoPlugin.ReportingPluginFactory = promwrapper.NewPromFactory(wrappedPluginFactory, "CCIPCommit", jb.OCR2OracleSpec.Relay, big.NewInt(0).SetInt64(destChainID))
 	argsNoPlugin.Logger = commonlogger.NewOCRWrapper(commitLggr, true, logError)

core/services/ocr2/plugins/ccip/ccipcommit/ocr2.go

@@ -50,8 +50,7 @@ type update struct {
 }
 
 type CommitPluginStaticConfig struct {
-	lggr                          logger.Logger
-	newReportingPluginRetryConfig ccipdata.RetryConfig
+	lggr logger.Logger
 	// Source
 	onRampReader        ccipdata.OnRampReader
 	sourceChainSelector uint64