hatchet-dev · abelanger5 · May 8, 2024 · May 8, 2024
diff --git a/api/v1/server/handlers/workflows/get_step_run_diff.go b/api/v1/server/handlers/workflows/get_step_run_diff.go
@@ -1,10 +1,12 @@
 package workflows
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/labstack/echo/v4"
 
+	"github.com/hatchet-dev/hatchet/api/v1/server/oas/apierrors"
 	"github.com/hatchet-dev/hatchet/api/v1/server/oas/gen"
 	"github.com/hatchet-dev/hatchet/internal/integrations/vcs/vcsutils"
 	"github.com/hatchet-dev/hatchet/internal/repository/prisma/db"
@@ -16,6 +18,12 @@ func (t *WorkflowService) StepRunGetDiff(ctx echo.Context, request gen.StepRunGe
 	diffs, originalValues, err := vcsutils.GetStepRunOverrideDiffs(t.config.APIRepository.StepRun(), stepRun)
 
 	if err != nil {
+		if errors.Is(err, vcsutils.ErrNoInput) {
+			return gen.StepRunGetDiff404JSONResponse(
+				apierrors.NewAPIErrors("step run does not have an input"),
+			), nil
+		}
+
 		return nil, fmt.Errorf("could not get diffs: %s", err)
 	}
 

diff --git a/api/v1/server/run/run.go b/api/v1/server/run/run.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"github.com/rs/zerolog"
 
 	"github.com/hatchet-dev/hatchet/api/v1/server/authn"
 	"github.com/hatchet-dev/hatchet/api/v1/server/authz"
@@ -230,9 +231,53 @@ func (t *APIServer) Run() (func() error, error) {
 		return nil, err
 	}
 
+	loggerMiddleware := middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
+		LogURI:       true,
+		LogStatus:    true,
+		LogError:     true,
+		LogLatency:   true,
+		LogRemoteIP:  true,
+		LogHost:      true,
+		LogMethod:    true,
+		LogURIPath:   true,
+		LogUserAgent: true,
+		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
+			statusCode := v.Status
+
+			// note that the status code is not set yet as it gets picked up by the global err handler
+			// see here: https://github.com/labstack/echo/issues/2310#issuecomment-1288196898
+			if v.Error != nil {
+				statusCode = 500
+			}
+
+			var e *zerolog.Event
+
+			switch {
+			case statusCode >= 500:
+				e = t.config.Logger.Error().Err(v.Error)
+			case statusCode >= 400:
+				e = t.config.Logger.Warn()
+			default:
+				e = t.config.Logger.Info()
+			}
+
+			e.
+				Dur("latency", v.Latency).
+				Int("status", statusCode).
+				Str("method", v.Method).
+				Str("uri", v.URI).
+				Str("user_agent", v.UserAgent).
+				Str("remote_ip", v.RemoteIP).
+				Str("host", v.Host).
+				Msg("API")
+
+			return nil
+		},
+	})
+
 	// register echo middleware
 	e.Use(
-		middleware.Logger(),
+		loggerMiddleware,
 		middleware.Recover(),
 		allHatchetMiddleware,
 	)

diff --git a/frontend/app/src/pages/main/workflow-runs/$run/components/step-run-playground.tsx b/frontend/app/src/pages/main/workflow-runs/$run/components/step-run-playground.tsx
@@ -137,7 +137,7 @@ export function StepRunPlayground({
 
   const stepRunDiffQuery = useQuery({
     ...queries.stepRuns.getDiff(stepRun?.metadata.id || ''),
-    enabled: !!stepRun,
+    enabled: !!stepRun && !!stepRun.input,
     refetchInterval: () => {
       if (stepRun?.status === StepRunStatus.RUNNING) {
         return 1000;

diff --git a/internal/integrations/alerting/alerter.go b/internal/integrations/alerting/alerter.go
@@ -46,10 +46,17 @@ func (t *TenantAlertManager) HandleAlert(tenantId string) error {
 		return err
 	}
 
-	if lastAlertedAt.IsZero() || time.Since(lastAlertedAt) > maxFrequency {
+	isZero := lastAlertedAt.IsZero()
+
+	if isZero || time.Since(lastAlertedAt) > maxFrequency {
 		// update the lastAlertedAt
 		now := time.Now().UTC()
 
+		// if we're in the zero state, we don't want to alert since the very beginning of the interval
+		if isZero {
+			lastAlertedAt = now.Add(-1 * maxFrequency)
+		}
+
 		err = t.repo.TenantAlertingSettings().UpdateTenantAlertingSettings(ctx, tenantId, &repository.UpdateTenantAlertingSettingsOpts{
 			LastAlertedAt: &now,
 		})

diff --git a/internal/integrations/vcs/vcsutils/diff.go b/internal/integrations/vcs/vcsutils/diff.go
@@ -13,6 +13,8 @@ import (
 	"github.com/hatchet-dev/hatchet/internal/repository/prisma/db"
 )
 
+var ErrNoInput = errors.New("no input found")
+
 // GetStepRunOverrideDiffs returns a map of the override keys to the override values which have changed
 // between the first step run and the latest step run.
 func GetStepRunOverrideDiffs(repo repository.StepRunAPIRepository, stepRun *db.StepRunModel) (diffs map[string]string, original map[string]string, err error) {
@@ -32,12 +34,20 @@ func GetStepRunOverrideDiffs(repo repository.StepRunAPIRepository, stepRun *db.S
 	firstInput, err := getStepRunInput(archivedResult)
 
 	if err != nil {
+		if errors.Is(err, ErrNoInput) {
+			return nil, nil, ErrNoInput
+		}
+
 		return nil, nil, fmt.Errorf("could not get input from archived result: %w", err)
 	}
 
 	secondInput, err := getStepRunInput(stepRun)
 
 	if err != nil {
+		if errors.Is(err, ErrNoInput) {
+			return nil, nil, ErrNoInput
+		}
+
 		return nil, nil, fmt.Errorf("could not get input from step run: %w", err)
 	}
 
@@ -87,7 +97,7 @@ func getStepRunInput(in inputtable) (*datautils.StepRunData, error) {
 	input, ok := in.Input()
 
 	if !ok {
-		return nil, fmt.Errorf("could not get input from inputtable")
+		return nil, ErrNoInput
 	}
 
 	data := &datautils.StepRunData{}

diff --git a/internal/repository/prisma/dbsqlc/tickers.sql b/internal/repository/prisma/dbsqlc/tickers.sql
@@ -223,9 +223,6 @@ WITH active_tenant_alerts AS (
         alerts.*
     FROM
         "TenantAlertingSettings" as alerts
-    -- only return alerts which have a slack webhook enabled
-    JOIN
-        "SlackAppWebhook" as webhooks ON webhooks."tenantId" = alerts."tenantId"
     WHERE
         "lastAlertedAt" IS NULL OR
         "lastAlertedAt" <= NOW() - convert_duration_to_interval(alerts."maxFrequency")
@@ -242,7 +239,10 @@ failed_run_count_by_tenant AS (
     WHERE
         "status" = 'FAILED'
         AND (
-            "lastAlertedAt" IS NULL OR
+            (
+                "lastAlertedAt" IS NULL AND
+                workflowRun."finishedAt" >= NOW() - convert_duration_to_interval(active_tenant_alerts."maxFrequency")
+            ) OR
             workflowRun."finishedAt" >= "lastAlertedAt"
         )
     GROUP BY workflowRun."tenantId"

diff --git a/internal/repository/prisma/dbsqlc/tickers.sql.go b/internal/repository/prisma/dbsqlc/tickers.sql.go