error fix

Author: dewitt4

.gitignore

@@ -47,3 +47,4 @@ docs/PHASE2-COMPLETE.md
 docs/ALL-PHASES-COMPLETE.md
 docs/PHASE2-DELIVERABLES.md
 docs/PHASE3-COMPLETE.md
+.markdownlint.json

.markdownlint.json

@@ -12,5 +12,7 @@
   "MD034": false,
   "MD036": false,
   "MD040": false,
-  "MD041": false
+  "MD041": false,
+  "MD047": false,
+  "MD058": false
 }

go.mod

@@ -34,7 +34,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/stretchr/testify v1.8.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect

go.sum

@@ -248,8 +248,9 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

tests/integration/health_test.go

@@ -58,7 +58,7 @@ func TestPrometheusMetrics(t *testing.T) {
 
 	// Give Prometheus a moment to scrape at least once after being ready
 	time.Sleep(5 * time.Second)
-	resp, err := waitForEndpoint(prometheusURL+"/-/ready", healthTimeout)
+	resp, err = waitForEndpoint(prometheusURL+"/-/ready", healthTimeout)
 	if err != nil {
 		t.Fatalf("Prometheus not ready: %v", err)
 	}
@@ -67,7 +67,7 @@ func TestPrometheusMetrics(t *testing.T) {
 	// Give Prometheus a moment to scrape at least once after being ready
 	time.Sleep(5 * time.Second)
 
-	resp, err := http.Get(metricsURL)
+	resp, err = http.Get(metricsURL)
 	if err != nil {
 		t.Fatalf("Failed to get metrics: %v", err)
 	}
@@ -123,6 +123,7 @@ func TestDashboardContent(t *testing.T) {
 			t.Errorf("Dashboard missing expected content: %q", expected)
 		}
 	}
+}
 
 // TestPrometheusTargets verifies Prometheus is scraping AgentaFlow
 func TestPrometheusTargets(t *testing.T) {
@@ -132,10 +133,6 @@ func TestPrometheusTargets(t *testing.T) {
 	}
 }
 
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
 // waitForAgentaFlowTarget polls the Prometheus targets endpoint until AgentaFlow appears or timeout is reached.
 func waitForAgentaFlowTarget(url string, timeout, retryWait time.Duration) (bool, string) {
 	deadline := time.Now().Add(timeout)
@@ -160,21 +157,6 @@ func waitForAgentaFlowTarget(url string, timeout, retryWait time.Duration) (bool
 			return true, lastBody
 		}
 		time.Sleep(retryWait)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-=======
-=======
->>>>>>> Stashed changes
-	}
-	return false, lastBody
-	return false, lastBody
-
-	targets := string(body)
-
-	// Check that AgentaFlow is being scraped
-	if !strings.Contains(targets, "agentaflow") && !strings.Contains(targets, "9001") {
-		t.Errorf("AgentaFlow target not found in Prometheus targets. Response: %s", targets)
->>>>>>> Stashed changes
 	}
 	return false, lastBody
 }