Skip to content

Commit 571050d

Browse files
dhaidashenkodhaidashenko
committed
Merge branch 'develop' into feature/PLEX-2611-cre-don2don-accept-ocr-attestatin
# Conflicts: # core/scripts/go.sum # deployment/go.sum # go.mod # go.sum # integration-tests/go.sum # integration-tests/load/go.mod # integration-tests/load/go.sum # system-tests/lib/go.sum # system-tests/tests/go.sum
2 parents 7f032af + 4844800 commit 571050d

17 files changed

Lines changed: 92 additions & 47 deletions

File tree

‎core/cmd/admin_commands.go‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,16 +332,25 @@ func (s *Shell) Profile(c *cli.Context) error {
332332
genDir := filepath.Join(baseDir, "debuginfo-"+time.Now().Format(time.RFC3339))
333333

334334
vitals := c.StringSlice("vitals")
335-
allVitals := []string{
335+
// supportsDeltaVitals contains profiles that can be run with or without seconds param.
336+
// (see https://pkg.go.dev/net/http/pprof#hdr-Parameters)
337+
supportsDeltaVitals := []string{
336338
"allocs", // A sampling of all past memory allocations
337339
"block", // Stack traces that led to blocking on synchronization primitives
338340
"cmdline", // The command line invocation of the current program
339341
"goroutine", // Stack traces of all current goroutines
340342
"heap", // A sampling of memory allocations of live objects.
341343
"mutex", // Stack traces of holders of contended mutexes
342-
"profile", // CPU profile.
343344
"threadcreate", // Stack traces that led to the creation of new OS threads
344-
"trace", // A trace of execution of the current program.
345+
}
346+
// durationOnlyVitals contains profiles that can be run only with the seconds param.
347+
durationOnlyVitals := []string{
348+
"profile", // CPU profile.
349+
"trace", // A trace of execution of the current program.
350+
}
351+
allVitals := supportsDeltaVitals
352+
if seconds > 0 {
353+
allVitals = append(allVitals, durationOnlyVitals...)
345354
}
346355
if len(vitals) == 0 {
347356
vitals = slices.Clone(allVitals)
@@ -436,7 +445,10 @@ func (s *Shell) profile(ctx context.Context, genDir string, name string, vitals
436445
defer wgPprof.Done()
437446
ctx, cancel := context.WithTimeout(ctx, time.Duration(max(seconds, 0)+web.PPROFOverheadSeconds)*time.Second)
438447
defer cancel()
439-
uri := fmt.Sprintf(path+"/debug/pprof/%s?seconds=%d", vt, seconds)
448+
uri := fmt.Sprintf(path+"/debug/pprof/%s", vt)
449+
if seconds > 0 {
450+
uri += fmt.Sprintf("?seconds=%d", seconds)
451+
}
440452
resp, err := s.HTTP.Get(ctx, uri)
441453
if err != nil {
442454
errs <- fmt.Errorf("error collecting %s: %w", uri, err)

‎core/scripts/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,11 +488,11 @@ require (
488488
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect
489489
github.com/smartcontractkit/chainlink-aptos v0.0.0-20260407161350-a86b1969da65 // indirect
490490
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260417153334-3b564ef614de // indirect
491-
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260406180811-0ec22f0243a4 // indirect
491+
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260408145530-22e2d05695cd // indirect
492492
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc // indirect
493493
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc // indirect
494494
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415165642-49f23e4d76cc // indirect
495-
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563 // indirect
495+
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260423133643-8d6a915c04b3 // indirect
496496
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 // indirect
497497
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect
498498
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect

‎core/scripts/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deployment/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ require (
423423
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 // indirect
424424
github.com/sirupsen/logrus v1.9.4 // indirect
425425
github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect
426-
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260406180811-0ec22f0243a4 // indirect
427-
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563 // indirect
426+
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260408145530-22e2d05695cd // indirect
427+
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260423133643-8d6a915c04b3 // indirect
428428
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect
429429
github.com/smartcontractkit/chainlink-data-streams v0.1.13 // indirect
430430
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect

‎deployment/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ require (
8383
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415165642-49f23e4d76cc
8484
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
8585
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc
86-
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563
86+
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260423133643-8d6a915c04b3
8787
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260422075950-29f37fa83c8a
8888
github.com/smartcontractkit/chainlink-common/keystore v1.1.0
8989
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10
@@ -360,7 +360,7 @@ require (
360360
github.com/sethvargo/go-retry v0.3.0 // indirect
361361
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
362362
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 // indirect
363-
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260406180811-0ec22f0243a4 // indirect
363+
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260408145530-22e2d05695cd // indirect
364364
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20260410144512-ca02ad6ed16a // indirect
365365
github.com/smartcontractkit/chainlink-protos/chainlink-ccv/committee-verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect
366366
github.com/smartcontractkit/chainlink-protos/chainlink-ccv/heartbeat v0.0.0-20260115142640-f6b99095c12e // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎integration-tests/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@ require (
402402
github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20260129135848-c86808ba5cb9 // indirect
403403
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect
404404
github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect
405-
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260406180811-0ec22f0243a4 // indirect
405+
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260408145530-22e2d05695cd // indirect
406406
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415165642-49f23e4d76cc // indirect
407-
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563 // indirect
407+
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260423133643-8d6a915c04b3 // indirect
408408
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect
409409
github.com/smartcontractkit/chainlink-data-streams v0.1.13 // indirect
410410
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect

‎integration-tests/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎integration-tests/load/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,9 @@ require (
478478
github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20260129135848-c86808ba5cb9 // indirect
479479
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect
480480
github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect
481-
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260406180811-0ec22f0243a4 // indirect
481+
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260408145530-22e2d05695cd // indirect
482482
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415165642-49f23e4d76cc // indirect
483-
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563 // indirect
483+
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260423133643-8d6a915c04b3 // indirect
484484
github.com/smartcontractkit/chainlink-common/keystore v1.1.0 // indirect
485485
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect
486486
github.com/smartcontractkit/chainlink-data-streams v0.1.13 // indirect

0 commit comments

Comments
 (0)