dlv from flag, fix promtail logs (#1488)

smartcontractkit · Dec 16, 2024 · ee5df76 · ee5df76
1 parent 88c6d2e
commit ee5df76
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/book/src/framework/configuration.md b/book/src/framework/configuration.md
@@ -10,6 +10,7 @@
 |   CTF_IGNORE_CRITICAL_LOGS   |                                      Ignore all logs that has CRIT,FATAL or PANIC levels (Chainlink nodes only!)                                       |          `true`, `false` |                       `false`                       |    🚫     |
 |     CTF_CHAINLINK_IMAGE      |                                           Flag to override Chainlink Docker image in format $repository:$tag                                           |         $repository:$tag |                          -                          |    🚫     |
 |         CTF_JD_IMAGE         |                                                Job distributor service image in format $repository:$tag                                                |         $repository:$tag |                          -                          |    🚫     |
+|        CTF_CLNODE_DLV        |                          Use debug entrypoint to allow Delve debugger connection, works only with "plugins" image of CL node                           |          `true`, `false` |                       `false`                       |    🚫     |
 |           LOKI_URL           |                                            URL to `Loki` push api, should be like`${host}/loki/api/v1/push`                                            |                      URL | `http://host.docker.internal:3030/loki/api/v1/push` |    🚫     |
 |        LOKI_TENANT_ID        |                                                Streams all components logs to `Loki`, see params below                                                 |                 `string` |                     `promtail`                      |    🚫     |
 |       LOKI_BASIC_AUTH        |                                                          Basic auth in format $user:$password                                                          |        `$user:$password` |                          -                          |    🚫     |

diff --git a/framework/.changeset/v0.3.9.md b/framework/.changeset/v0.3.9.md
@@ -0,0 +1,2 @@
+- Dlv from original image
+- Fix logs for promtail
diff --git a/framework/docker.go b/framework/docker.go
@@ -264,8 +264,7 @@ func WriteAllContainersLogs(dir string) error {
 func BuildImageOnce(once *sync.Once, dctx, dfile, nameAndTag string) error {
 	var err error
 	once.Do(func() {
-		dfilePath := filepath.Join(dctx, dfile)
-		err = runCommand("docker", "build", "-t", nameAndTag, "-f", dfilePath, dctx)
+		err = BuildImage(dctx, dfile, nameAndTag)
 		if err != nil {
 			err = fmt.Errorf("failed to build Docker image: %w", err)
 		}
@@ -275,5 +274,9 @@ func BuildImageOnce(once *sync.Once, dctx, dfile, nameAndTag string) error {
 
 func BuildImage(dctx, dfile, nameAndTag string) error {
 	dfilePath := filepath.Join(dctx, dfile)
-	return runCommand("docker", "build", "-t", nameAndTag, "-f", dfilePath, dctx)
+	if os.Getenv("CTF_CLNODE_DLV") == "true" {
+		return runCommand("docker", "build", "--build-arg", `GO_GCFLAGS=all=-N -l`, "-t", nameAndTag, "-f", dfilePath, dctx)
+	} else {
+		return runCommand("docker", "build", "-t", nameAndTag, "-f", dfilePath, dctx)
+	}
 }
diff --git a/framework/promtail.go b/framework/promtail.go
@@ -59,7 +59,7 @@ scrape_configs:
 	lokiTenantID := os.Getenv("LOKI_TENANT_ID")
 
 	if lokiURL == "" {
-		lokiURL = "http://host.docker.internal:3100/loki/api/v1/push"
+		lokiURL = "http://host.docker.internal:3030/loki/api/v1/push"
 	}
 	if lokiTenantID == "" {
 		lokiTenantID = "promtail"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Dlv from original image
		- Fix logs for promtail