fix: log steps

Author: ogzhanolguncu

go/apps/ctrl/services/build/backend/depot/create_build.go

@@ -163,8 +163,35 @@ func (s *Depot) CreateBuild(
 		"build_id", buildResp.ID,
 		"unkey_project_id", unkeyProjectID)
 
-	//nolint: exhaustruct
-	solverOptions := client.SolveOpt{
+	buildStatusCh := make(chan *client.SolveStatus, 100)
+	go s.processBuildStatus(buildStatusCh, req.Msg.GetWorkspaceId(), unkeyProjectID, deploymentID)
+
+	solverOptions := s.buildSolverOptions(platform, contextURL, dockerfilePath, imageName)
+	_, buildErr = buildkitClient.Solve(ctx, nil, solverOptions, buildStatusCh)
+	if buildErr != nil {
+		s.logger.Error("Build failed",
+			"error", buildErr,
+			"image_name", imageName,
+			"build_id", buildResp.ID,
+			"depot_project_id", depotProjectID,
+			"unkey_project_id", unkeyProjectID)
+		return nil, connect.NewError(connect.CodeInternal,
+			fmt.Errorf("build failed: %w", buildErr))
+	}
+
+	s.logger.Info("Build completed successfully")
+
+	return connect.NewResponse(&ctrlv1.CreateBuildResponse{
+		ImageName:      imageName,
+		BuildId:        buildResp.ID,
+		DepotProjectId: depotProjectID,
+	}), nil
+}
+
+func (s *Depot) buildSolverOptions(
+	platform, contextURL, dockerfilePath, imageName string,
+) client.SolveOpt {
+	return client.SolveOpt{
 		Frontend: "dockerfile.v0",
 		FrontendAttrs: map[string]string{
 			"platform": platform,
@@ -196,49 +223,6 @@ func (s *Depot) CreateBuild(
 			},
 		},
 	}
-
-	buildStatusCh := make(chan *client.SolveStatus, 10)
-	aggregator := NewBuildStepAggregator()
-
-	go func() {
-		for status := range buildStatusCh {
-			aggregator.ProcessStatus(
-				status,
-				req.Msg.GetWorkspaceId(),
-				unkeyProjectID,
-				deploymentID,
-				s.clickhouse.BufferBuildStep,
-				s.clickhouse.BufferBuildStepLog,
-			)
-		}
-	}()
-
-	_, buildErr = buildkitClient.Solve(ctx, nil, solverOptions, buildStatusCh)
-	if buildErr != nil {
-		s.logger.Error("Build failed",
-			"error", buildErr,
-			"image_name", imageName,
-			"build_id", buildResp.ID,
-			"depot_project_id", depotProjectID,
-			"unkey_project_id", unkeyProjectID)
-		return nil, connect.NewError(connect.CodeInternal,
-			fmt.Errorf("build failed: %w", buildErr))
-	}
-
-	s.logger.Info("Build completed successfully",
-		"image_name", imageName,
-		"build_id", buildResp.ID,
-		"build_token", buildResp.Token,
-		"depot_project_id", depotProjectID,
-		"platform", platform,
-		"architecture", architecture,
-		"unkey_project_id", unkeyProjectID)
-
-	return connect.NewResponse(&ctrlv1.CreateBuildResponse{
-		ImageName:      imageName,
-		BuildId:        buildResp.ID,
-		DepotProjectId: depotProjectID,
-	}), nil
 }
 
 // getOrCreateDepotProject retrieves or creates a Depot project for the given Unkey project.
@@ -310,15 +294,32 @@ func (s *Depot) getOrCreateDepotProject(ctx context.Context, unkeyProjectID stri
 	return depotProjectID, nil
 }
 
+func (s *Depot) processBuildStatus(
+	statusCh <-chan *client.SolveStatus,
+	workspaceID, projectID, deploymentID string,
+) {
+	aggregator := NewBuildStepAggregator()
+	for status := range statusCh {
+		aggregator.ProcessStatus(
+			status,
+			workspaceID,
+			projectID,
+			deploymentID,
+			s.clickhouse.BufferBuildStep,
+			s.clickhouse.BufferBuildStepLog,
+		)
+	}
+}
+
 type BuildStepAggregator struct {
-	completed map[digest.Digest]bool
-	logsSent  map[digest.Digest]int
+	completed        map[digest.Digest]bool
+	verticesWithLogs map[digest.Digest]bool
 }
 
 func NewBuildStepAggregator() *BuildStepAggregator {
 	return &BuildStepAggregator{
-		completed: make(map[digest.Digest]bool),
-		logsSent:  make(map[digest.Digest]int),
+		completed:        make(map[digest.Digest]bool),
+		verticesWithLogs: make(map[digest.Digest]bool),
 	}
 }
 
@@ -328,7 +329,10 @@ func (a *BuildStepAggregator) ProcessStatus(
 	cbStep func(schema.BuildStepV1),
 	cbLog func(schema.BuildStepLogV1),
 ) {
-	// Process completed steps
+	for _, log := range status.Logs {
+		a.verticesWithLogs[log.Vertex] = true
+	}
+
 	for _, vertex := range status.Vertexes {
 		if vertex.Completed != nil && !a.completed[vertex.Digest] {
 			a.completed[vertex.Digest] = true
@@ -343,27 +347,19 @@ func (a *BuildStepAggregator) ProcessStatus(
 				StepID:       string(vertex.Digest),
 				Name:         vertex.Name,
 				Cache:        vertex.Cached,
-				HasLogs:      len(status.Logs) > 0, // will be true if any logs exist
+				HasLogs:      a.verticesWithLogs[vertex.Digest],
 			})
 		}
 	}
 
-	// Send all new logs
 	for _, log := range status.Logs {
-		// Track which logs we've already sent for this vertex
-		sentCount := a.logsSent[log.Vertex]
-		a.logsSent[log.Vertex]++
-
-		// Only send if this is a new log we haven't seen
-		if sentCount < a.logsSent[log.Vertex] {
-			cbLog(schema.BuildStepLogV1{
-				WorkspaceID:  workspaceID,
-				ProjectID:    projectID,
-				DeploymentID: deploymentID,
-				StepID:       string(log.Vertex),
-				Time:         log.Timestamp.UnixMilli(),
-				Message:      string(log.Data),
-			})
-		}
+		cbLog(schema.BuildStepLogV1{
+			WorkspaceID:  workspaceID,
+			ProjectID:    projectID,
+			DeploymentID: deploymentID,
+			StepID:       string(log.Vertex),
+			Time:         log.Timestamp.UnixMilli(),
+			Message:      string(log.Data),
+		})
 	}
 }

go/demo_api/Dockerfile

@@ -1,12 +1,16 @@
 FROM golang:1.25-alpine AS builder
 
 WORKDIR /app
-
-COPY go.mod .
+COPY go.mod go.sum* ./
 RUN go mod download
-
 COPY . .
-
+# Debug output during build
+RUN echo "=== DsdsdsdBDDDDuilasadasdsdasdasdsaddD Info ===" && \
+  echo "Go version: $(go version)" && \
+  echo "Build time: $(date -u '+%Y-%m-%d %H:%M:%S UTC')" && \
+  echo "Working dir: $(pwd)" && \
+  echo "Soursce files:" && ls -la && \
+  echo "Go modules:" && go list -m all | head -10
 RUN CGO_ENABLED=0 GOOS=linux go build -a -o main .
 
 FROM alpine:latest
@@ -16,7 +20,12 @@ RUN apk --no-cache add ca-certificates
 WORKDIR /root/
 
 COPY --from=builder /app/main .
-
+RUN echo "=== StuffDDasdasdasdDDasdasdsd Info ===" && \
+  echo "Go version: $(go version)" && \
+  echo "Build time: $(date -u '+%Y-%m-%d %H:%M:%S UTC')" && \
+  echo "Working dir: $(pwd)" && \
+  echo "Sofurce files:" && ls -la && \
+  echo "Go modules:" && go list -m all | head -10
 ENV PORT 8080
 
 CMD ["./main"]

go/demo_api/main.go

@@ -252,15 +252,15 @@ func main() {
 			},
 			API: APIInfo{
 				Endpoints: map[string]EndpointMeta{
-					"health":    {"/v2/health", "Service health check"},
-					"greeting":  {"/v2/greeting", "Personalized greeting service"},
-					"accounts":  {"/v2/accounts", "Account management endpoints"},
-					"debug":     {"/v1/debug", "Request debugging utility"},
+					"health":    {"/v2/health", "LONG LIVE UNKEY"},
+					"greeting":  {"/v2/greeting", "Persosdasdasdasdnalized greeting service"},
+					"accounts":  {"/v2/accounts", "LONG LIVE UNKEY"},
+					"debug":     {"/v1/debug", "LONG LIVE UNKEY"},
 					"hello":     {"/v1/hello", "Simple hello endpoint"},
 					"liveness":  {"/v1/liveness", "Basic liveness check"},
 					"timeout":   {"/v1/timeout", "Timeout test endpoint"},
 					"protected": {"/v1/protected", "Auth protected endpoint"},
-					"openapi":   {"/openapi.yaml", "OpenAPI specification"},
+					"openapi":   {"/openapi.yaml", "LONG LIVE UNKEY"},
 				},
 				Versions: []string{"v1", "v2"},
 			},