Merge pull request #299 from techulus/automation/release/v0.59.0

Release v0.59.0

Author: arjunkomath

.agents/resume

@@ -43,7 +43,7 @@ jobs:
         run: go vet ./...
 
       - name: Install staticcheck
-        run: GOBIN=$PWD/.bin go install honnef.co/go/tools/cmd/staticcheck@latest
+        run: GOBIN=$PWD/.bin go install honnef.co/go/tools/cmd/staticcheck@v0.7.0
 
       - name: Staticcheck
         run: ./.bin/staticcheck ./...

.agents/setup

@@ -43,7 +43,7 @@ jobs:
         run: go vet ./...
 
       - name: Install staticcheck
-        run: GOBIN=$PWD/.bin go install honnef.co/go/tools/cmd/staticcheck@latest
+        run: GOBIN=$PWD/.bin go install honnef.co/go/tools/cmd/staticcheck@v0.7.0
 
       - name: Staticcheck
         run: ./.bin/staticcheck ./...

.github/workflows/agent-ci.yml

@@ -45,7 +45,7 @@ jobs:
         run: go vet ./...
 
       - name: Install staticcheck
-        run: GOBIN=$PWD/.bin go install honnef.co/go/tools/cmd/staticcheck@latest
+        run: GOBIN=$PWD/.bin go install honnef.co/go/tools/cmd/staticcheck@v0.7.0
 
       - name: Staticcheck
         run: ./.bin/staticcheck ./...

.github/workflows/cli-ci.yml

@@ -15,6 +15,7 @@ import (
 const (
 	lastReloadSuccessMetric = "traefik_config_last_reload_success"
 	pendingReloadMarkerName = ".routing-reload-pending"
+	metricsReadyTimeout     = 15 * time.Second
 )
 
 var (
@@ -30,6 +31,22 @@ func LastSuccessfulReload() (time.Time, error) {
 	return readLastSuccessfulReload()
 }
 
+func waitForMetricsReady(timeout time.Duration) error {
+	deadline := time.Now().Add(timeout)
+	var lastErr error
+	for {
+		if _, err := LastSuccessfulReload(); err == nil {
+			return nil
+		} else {
+			lastErr = err
+		}
+		if time.Now().After(deadline) {
+			return fmt.Errorf("traefik metrics did not become ready within %s: %w", timeout, lastErr)
+		}
+		time.Sleep(reloadPollInterval)
+	}
+}
+
 func fetchLastSuccessfulReload() (time.Time, error) {
 	response, err := metricsHTTPClient.Get(traefikMetricsURL)
 	if err != nil {

.github/workflows/updater-ci.yml

@@ -20,6 +20,54 @@ traefik_config_last_reload_success 1.725e+09
 	}
 }
 
+func TestWaitForMetricsReadyRetriesTemporaryErrors(t *testing.T) {
+	originalReader := readLastSuccessfulReload
+	originalPollInterval := reloadPollInterval
+	t.Cleanup(func() {
+		readLastSuccessfulReload = originalReader
+		reloadPollInterval = originalPollInterval
+	})
+
+	attempts := 0
+	readLastSuccessfulReload = func() (time.Time, error) {
+		attempts++
+		if attempts < 3 {
+			return time.Time{}, os.ErrNotExist
+		}
+		return time.Now(), nil
+	}
+	reloadPollInterval = time.Millisecond
+
+	if err := waitForMetricsReady(50 * time.Millisecond); err != nil {
+		t.Fatal(err)
+	}
+	if attempts != 3 {
+		t.Fatalf("metrics read attempted %d times, want 3", attempts)
+	}
+}
+
+func TestWaitForMetricsReadyTimesOut(t *testing.T) {
+	originalReader := readLastSuccessfulReload
+	originalPollInterval := reloadPollInterval
+	t.Cleanup(func() {
+		readLastSuccessfulReload = originalReader
+		reloadPollInterval = originalPollInterval
+	})
+
+	readLastSuccessfulReload = func() (time.Time, error) {
+		return time.Time{}, os.ErrDeadlineExceeded
+	}
+	reloadPollInterval = time.Millisecond
+
+	err := waitForMetricsReady(5 * time.Millisecond)
+	if err == nil {
+		t.Fatal("metrics readiness wait unexpectedly succeeded")
+	}
+	if !strings.Contains(err.Error(), "traefik metrics did not become ready within 5ms") {
+		t.Fatalf("unexpected timeout error: %v", err)
+	}
+}
+
 func TestDynamicConfigReloadedRequiresReloadAtOrAfterNewestFile(t *testing.T) {
 	originalDir := dynamicConfigDir
 	originalReader := readLastSuccessfulReload

agent/internal/traefik/reload.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"reflect"
-	"time"
 
 	"gopkg.in/yaml.v3"
 )
@@ -16,6 +15,7 @@ const (
 	metricsEntryPointAddr = "127.0.0.1:9100"
 )
 
+// Whole-number buckets must be ints to match yaml.v3's decoded types.
 var prometheusLatencyBuckets = []interface{}{
 	0.005,
 	0.01,
@@ -26,12 +26,12 @@ var prometheusLatencyBuckets = []interface{}{
 	0.25,
 	0.5,
 	0.75,
-	1.0,
+	1,
 	2.5,
-	5.0,
-	10.0,
-	30.0,
-	60.0,
+	5,
+	10,
+	30,
+	60,
 }
 
 func validateStaticConfig(data []byte) error {
@@ -218,6 +218,5 @@ func ReloadTraefik() error {
 		return fmt.Errorf("failed to restart traefik: %w", err)
 	}
 	log.Printf("[traefik] restarted traefik to apply static config changes")
-	time.Sleep(2 * time.Second)
-	return nil
+	return waitForMetricsReady(metricsReadyTimeout)
 }

agent/internal/traefik/reload_test.go

@@ -1,6 +1,10 @@
 package traefik
 
-import "testing"
+import (
+	"testing"
+
+	"gopkg.in/yaml.v3"
+)
 
 func TestEnsurePrometheusMetricsConfigAddsPrivateMetricsEndpoint(t *testing.T) {
 	config := map[string]interface{}{
@@ -44,7 +48,17 @@ func TestEnsurePrometheusMetricsConfigIsStable(t *testing.T) {
 	if !ensurePrometheusMetricsConfig(config) {
 		t.Fatal("expected first call to modify config")
 	}
-	if ensurePrometheusMetricsConfig(config) {
+
+	data, err := yaml.Marshal(config)
+	if err != nil {
+		t.Fatalf("failed to marshal config: %v", err)
+	}
+	var roundTripped map[string]interface{}
+	if err := yaml.Unmarshal(data, &roundTripped); err != nil {
+		t.Fatalf("failed to unmarshal config: %v", err)
+	}
+
+	if ensurePrometheusMetricsConfig(roundTripped) {
 		t.Fatal("expected second call to be stable")
 	}
 }

agent/internal/traefik/static.go

@@ -5,6 +5,7 @@ import { db } from "@/db";
 import { services } from "@/db/schema";
 import { requireDeveloperRole } from "@/lib/auth";
 import { parseComposeYaml } from "@/lib/compose-parser";
+import { reportServerError } from "@/lib/server-errors";
 import {
 	addServiceVolume,
 	createService,
@@ -144,6 +145,9 @@ export async function importCompose(
 							volume.containerPath,
 						);
 					} catch (e) {
+						reportServerError(e, "compose-import.volume.add", {
+							tags: { serviceId: result.id },
+						});
 						warnings.push({
 							service: finalName,
 							field: "volumes",
@@ -182,9 +186,16 @@ export async function importCompose(
 		for (const serviceId of createdServiceIds) {
 			try {
 				await db.delete(services).where(eq(services.id, serviceId));
-			} catch {}
+			} catch (cleanupError) {
+				reportServerError(cleanupError, "compose-import.cleanup", {
+					tags: { serviceId },
+				});
+			}
 		}
 
+		reportServerError(error, "compose-import.create", {
+			tags: { projectId, environmentId },
+		});
 		return {
 			success: false,
 			created: [],