move the core components of the ocr2 monitoring into chainlink-relay

cmd/monitoring/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 
+	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
 	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring"
 	"github.com/smartcontractkit/chainlink/core/logger"
 	"go.uber.org/zap/zapcore"
@@ -11,16 +12,17 @@ import (
 func main() {
 	ctx := context.Background()
 
-	log := logger.NewLogger(loggerConfig{})
+	coreLog := logger.NewLogger(loggerConfig{})
+	log := logWrapper{coreLog}
 
 	solanaConfig, err := monitoring.ParseSolanaConfig()
 	if err != nil {
 		log.Fatalw("failed to parse solana specific configuration", "error", err)
 	}
 
-	solanaSourceFactory := monitoring.NewSolanaSourceFactory(log.With("component", "source"))
+	solanaSourceFactory := monitoring.NewSolanaSourceFactory(logWrapper{coreLog.With("component", "source")})
 
-	monitoring.Facade(
+	relayMonitoring.Facade(
 		ctx,
 		log,
 		solanaConfig,
@@ -56,3 +58,15 @@ func (l loggerConfig) LogLevel() zapcore.Level {
 func (l loggerConfig) LogUnixTimestamps() bool {
 	return false // log timestamp in ISO8601
 }
+
+type logWrapper struct {
+	logger.Logger
+}
+
+func (l logWrapper) Criticalw(format string, values ...interface{}) {
+	l.Logger.CriticalW(format, values...)
+}
+
+func (l logWrapper) With(values ...interface{}) relayMonitoring.Logger {
+	return logWrapper{l.Logger.With(values...)}
+}

pkg/monitoring/solana_config.go → pkg/monitoring/config.go

@@ -5,6 +5,8 @@ import (
 	"net/url"
 	"os"
 	"time"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
 )
 
 type SolanaConfig struct {
@@ -16,7 +18,7 @@ type SolanaConfig struct {
 	PollInterval time.Duration
 }
 
-var _ ChainConfig = SolanaConfig{}
+var _ relayMonitoring.ChainConfig = SolanaConfig{}
 
 func (s SolanaConfig) GetRPCEndpoint() string         { return s.RPCEndpoint }
 func (s SolanaConfig) GetNetworkName() string         { return s.NetworkName }