From 25af2dd79be67ae8f86ce60d675cce81c46c17c0 Mon Sep 17 00:00:00 2001 From: Adam Hamrick Date: Thu, 14 Sep 2023 14:01:41 -0400 Subject: [PATCH 1/2] Fix typo (#10649) --- integration-tests/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/README.md b/integration-tests/README.md index c1393ea9cf3..c0b673fa92b 100644 --- a/integration-tests/README.md +++ b/integration-tests/README.md @@ -4,7 +4,7 @@ Here lives the integration tests for chainlink, utilizing our [chainlink-testing ## NOTE: Move to Testcontainers -If you have previously run these smoke tests using GitHub Actions or some sort of Kubernetes setup, that method is no longer necessary. We have moved the majority of our tests to utilize plain Docker containers (with the help of [Testcontainers](https://golang.testcontainers.org/)). This should make tests faster, more stable, and enable you to run them on your local machine without much hassle. More p +If you have previously run these smoke tests using GitHub Actions or some sort of Kubernetes setup, that method is no longer necessary. We have moved the majority of our tests to utilize plain Docker containers (with the help of [Testcontainers](https://golang.testcontainers.org/)). This should make tests faster, more stable, and enable you to run them on your local machine without much hassle. ## Requirements From 186d1d9c682c972cdd28296abbfbeadb5e83a63e Mon Sep 17 00:00:00 2001 From: Bolek <1416262+bolekk@users.noreply.github.com> Date: Thu, 14 Sep 2023 11:14:02 -0700 Subject: [PATCH 2/2] [Gateway] Use named loggers in all sub-components (#10639) --- core/services/gateway/connectionmanager.go | 2 +- core/services/gateway/connector/connector.go | 2 +- core/services/gateway/handlers/functions/handler.functions.go | 1 + core/services/gateway/handlers/handler.dummy.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/services/gateway/connectionmanager.go b/core/services/gateway/connectionmanager.go index 86660f03dc9..961212239f2 100644 --- a/core/services/gateway/connectionmanager.go +++ b/core/services/gateway/connectionmanager.go @@ -96,7 +96,7 @@ func NewConnectionManager(gwConfig *config.GatewayConfig, clock utils.Clock, lgg codec: codec, nodes: nodes, shutdownCh: make(chan struct{}), - lggr: lggr, + lggr: lggr.Named("DONConnectionManager." + donConfig.DonId), } } connMgr := &connectionManager{ diff --git a/core/services/gateway/connector/connector.go b/core/services/gateway/connector/connector.go index 1cd1995e3a4..ca0a45e98c8 100644 --- a/core/services/gateway/connector/connector.go +++ b/core/services/gateway/connector/connector.go @@ -85,7 +85,7 @@ func NewGatewayConnector(config *ConnectorConfig, signer Signer, handler Gateway signer: signer, handler: handler, shutdownCh: make(chan struct{}), - lggr: lggr, + lggr: lggr.Named("GatewayConnector"), } gateways := make(map[string]*gatewayState) urlToId := make(map[string]string) diff --git a/core/services/gateway/handlers/functions/handler.functions.go b/core/services/gateway/handlers/functions/handler.functions.go index aee099e6cee..4ef6ab72fb2 100644 --- a/core/services/gateway/handlers/functions/handler.functions.go +++ b/core/services/gateway/handlers/functions/handler.functions.go @@ -57,6 +57,7 @@ func NewFunctionsHandlerFromConfig(handlerConfig json.RawMessage, donConfig *con if err != nil { return nil, err } + lggr = lggr.Named("FunctionsHandler:" + donConfig.DonId) var allowlist OnchainAllowlist if cfg.OnchainAllowlist != nil { chain, err2 := legacyChains.Get(cfg.OnchainAllowlistChainID) diff --git a/core/services/gateway/handlers/handler.dummy.go b/core/services/gateway/handlers/handler.dummy.go index 7615c734d8d..9cdd0865606 100644 --- a/core/services/gateway/handlers/handler.dummy.go +++ b/core/services/gateway/handlers/handler.dummy.go @@ -32,7 +32,7 @@ func NewDummyHandler(donConfig *config.DONConfig, don DON, lggr logger.Logger) ( donConfig: donConfig, don: don, savedCallbacks: make(map[string]*savedCallback), - lggr: lggr, + lggr: lggr.Named("DummyHandler." + donConfig.DonId), }, nil }