move promtail to ctf obs up, speed up

Author: skudasov

framework/.changeset/v0.3.8.md

@@ -0,0 +1,3 @@
+- Move promtail to CLI
+- Speed up container polling
+- Allow debug entrypoint for dlv

framework/cmd/interactive.go

@@ -75,9 +75,6 @@ func createComponentsFromForm(form *nodeSetForm) error {
 	}
 	switch form.Observability {
 	case true:
-		if err = framework.NewPromtail(); err != nil {
-			return err
-		}
 		if err := observabilityUp(); err != nil {
 			return err
 		}

framework/cmd/observability.go

@@ -10,6 +10,9 @@ func observabilityUp() error {
 	if err := extractAllFiles("observability"); err != nil {
 		return err
 	}
+	if err := framework.NewPromtail(); err != nil {
+		return err
+	}
 	err := runCommand("bash", "-c", fmt.Sprintf(`
 		cd %s && \
 		docker compose up -d

framework/components/blockchain/anvil.go

@@ -53,7 +53,7 @@ func newAnvil(in *Input) (*Output, error) {
 		NetworkAliases: map[string][]string{
 			framework.DefaultNetworkName: {containerName},
 		},
-		WaitingFor: wait.ForListeningPort(nat.Port(in.Port)).WithStartupTimeout(10 * time.Second),
+		WaitingFor: wait.ForListeningPort(nat.Port(in.Port)).WithStartupTimeout(10 * time.Second).WithPollInterval(200 * time.Millisecond),
 		Entrypoint: entryPoint,
 	}
 	c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{

framework/components/blockchain/besu.go

@@ -82,7 +82,7 @@ func newBesu(in *Input) (*Output, error) {
 				},
 			}
 		},
-		WaitingFor: wait.ForListeningPort(nat.Port(in.Port)).WithStartupTimeout(15 * time.Second),
+		WaitingFor: wait.ForListeningPort(nat.Port(in.Port)).WithStartupTimeout(15 * time.Second).WithPollInterval(200 * time.Millisecond),
 		Cmd:        entryPoint,
 	}
 

framework/components/blockchain/geth.go

@@ -191,7 +191,7 @@ func newGeth(in *Input) (*Output, error) {
 				FileMode:          0644,
 			},
 		},
-		WaitingFor: wait.ForListeningPort(nat.Port(in.Port)).WithStartupTimeout(15 * time.Second),
+		WaitingFor: wait.ForListeningPort(nat.Port(in.Port)).WithStartupTimeout(15 * time.Second).WithPollInterval(200 * time.Millisecond),
 		Cmd:        entryPoint,
 	}
 	c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{

framework/components/clnode/clnode.go

@@ -222,7 +222,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 			"/bin/sh", "-c",
 			"chainlink -c /config/config -c /config/overrides -c /config/user-overrides -s /config/secrets -s /config/secrets-overrides -s /config/user-secrets-overrides node start -d -p /config/node_password -a /config/apicredentials",
 		},
-		WaitingFor: wait.ForHTTP("/").WithPort(DefaultHTTPPort).WithStartupTimeout(2 * time.Minute),
+		WaitingFor: wait.ForHTTP("/").WithPort(DefaultHTTPPort).WithStartupTimeout(1 * time.Minute).WithPollInterval(200 * time.Millisecond),
 	}
 	if in.Node.HTTPPort != 0 && in.Node.P2PPort != 0 {
 		req.HostConfigModifier = func(h *container.HostConfig) {

framework/components/postgres/postgres.go

@@ -107,8 +107,8 @@ func NewPostgreSQL(in *Input) (*Output, error) {
 		},
 		WaitingFor: tcwait.ForExec([]string{"psql", "-h", "127.0.0.1",
 			"-U", User, "-p", Port, "-c", "select", "1", "-d", Database}).
-			WithStartupTimeout(20 * time.Second).
-			WithPollInterval(1 * time.Second),
+			WithStartupTimeout(15 * time.Second).
+			WithPollInterval(200 * time.Millisecond),
 	}
 	var portToExpose int
 	if in.Port != 0 {

framework/config.go

@@ -144,10 +144,6 @@ func Load[X any](t *testing.T) (*X, error) {
 	//}
 	err = DefaultNetwork(once)
 	require.NoError(t, err)
-	if os.Getenv(EnvVarCI) != "true" {
-		err = NewPromtail()
-		require.NoError(t, err)
-	}
 	return input, nil
 }
 

framework/promtail.go

@@ -59,7 +59,7 @@ scrape_configs:
 	lokiTenantID := os.Getenv("LOKI_TENANT_ID")
 
 	if lokiURL == "" {
-		lokiURL = "http://host.docker.internal:3030/loki/api/v1/push"
+		lokiURL = "http://host.docker.internal:3100/loki/api/v1/push"
 	}
 	if lokiTenantID == "" {
 		lokiTenantID = "promtail"
@@ -108,7 +108,7 @@ scrape_configs:
 }
 
 func NewPromtail() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 	defer cancel()
 
 	pcn, err := promtailConfig()