cherry pick: non-zero default period (#14206) + head report chain_id …

…(#14212) (#1355)

cherry pick 

smartcontractkit/chainlink@621e875

smartcontractkit/chainlink@25d2961

.changeset/eight-bees-speak.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#bugfix head reporter non-zero reporting period

.changeset/swift-pumas-taste.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal add head report chain_id

core/services/headreporter/head_reporter.go

@@ -35,11 +35,12 @@ type (
 
 func NewHeadReporterService(ds sqlutil.DataSource, lggr logger.Logger, reporters ...HeadReporter) *HeadReporterService {
 	return &HeadReporterService{
-		ds:        ds,
-		lggr:      lggr.Named("HeadReporter"),
-		newHeads:  mailbox.NewSingle[*evmtypes.Head](),
-		chStop:    make(chan struct{}),
-		reporters: reporters,
+		ds:           ds,
+		lggr:         lggr.Named("HeadReporter"),
+		newHeads:     mailbox.NewSingle[*evmtypes.Head](),
+		chStop:       make(chan struct{}),
+		reporters:    reporters,
+		reportPeriod: 15 * time.Second,
 	}
 }
 

core/services/headreporter/head_reporter_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
@@ -42,4 +43,9 @@ func Test_HeadReporterService(t *testing.T) {
 
 		require.Eventually(t, func() bool { return reportCalls.Load() == 2 }, 5*time.Second, 100*time.Millisecond)
 	})
+
+	t.Run("has default report period", func(t *testing.T) {
+		service := NewHeadReporterService(pgtest.NewSqlxDB(t), logger.TestLogger(t), NewMockHeadReporter(t))
+		assert.Equal(t, service.reportPeriod, 15*time.Second)
+	})
 }

core/services/headreporter/telemetry_reporter.go

@@ -44,6 +44,7 @@ func (t *telemetryReporter) ReportNewHead(ctx context.Context, head *evmtypes.He
 		}
 	}
 	request := &telem.HeadReportRequest{
+		ChainID: head.EVMChainID.String(),
 		Latest: &telem.Block{
 			Timestamp: uint64(head.Timestamp.UTC().Unix()),
 			Number:    uint64(head.Number),

core/services/headreporter/telemetry_reporter_test.go

@@ -35,6 +35,7 @@ func Test_TelemetryReporter_NewHead(t *testing.T) {
 		},
 	}
 	requestBytes, err := proto.Marshal(&telem.HeadReportRequest{
+		ChainID: "100",
 		Latest: &telem.Block{
 			Timestamp: uint64(head.Timestamp.UTC().Unix()),
 			Number:    42,
@@ -70,6 +71,7 @@ func Test_TelemetryReporter_NewHeadMissingFinalized(t *testing.T) {
 		IsFinalized: false,
 	}
 	requestBytes, err := proto.Marshal(&telem.HeadReportRequest{
+		ChainID: "100",
 		Latest: &telem.Block{
 			Timestamp: uint64(head.Timestamp.UTC().Unix()),
 			Number:    42,