feat: add a 1ms delta to --until (#1088)

Author: lionello

src/pkg/cli/debug.go

@@ -126,21 +126,22 @@ func DebugDeployment(ctx context.Context, client client.FabricClient, debugConfi
 		return ErrDryRun
 	}
 
-	var sinceTime, untilTime *timestamppb.Timestamp
+	var sinceTs, untilTs *timestamppb.Timestamp
 	if pkg.IsValidTime(debugConfig.Since) {
-		sinceTime = timestamppb.New(debugConfig.Since)
+		sinceTs = timestamppb.New(debugConfig.Since)
 	}
 	if pkg.IsValidTime(debugConfig.Until) {
-		untilTime = timestamppb.New(debugConfig.Until)
+		until := debugConfig.Until.Add(time.Millisecond) // add a millisecond to make it inclusive
+		untilTs = timestamppb.New(until)
 	}
 	req := defangv1.DebugRequest{
 		Etag:     debugConfig.Etag,
 		Files:    files,
 		ModelId:  debugConfig.ModelId,
 		Project:  debugConfig.Project.Name,
 		Services: debugConfig.FailedServices,
-		Since:    sinceTime,
-		Until:    untilTime,
+		Since:    sinceTs,
+		Until:    untilTs,
 	}
 	err := debugConfig.Provider.QueryForDebug(ctx, &req)
 	if err != nil {

src/pkg/cli/tail.go

@@ -198,18 +198,19 @@ func isTransientError(err error) bool {
 }
 
 func tail(ctx context.Context, provider client.Provider, projectName string, options TailOptions) error {
-	var since, until *timestamppb.Timestamp
+	var sinceTs, untilTs *timestamppb.Timestamp
 	if pkg.IsValidTime(options.Since) {
-		since = timestamppb.New(options.Since)
+		sinceTs = timestamppb.New(options.Since)
 	} else {
 		options.Since = time.Now() // this is used to continue from the last timestamp
 	}
 	if pkg.IsValidTime(options.Until) {
-		until = timestamppb.New(options.Until)
+		until := options.Until.Add(time.Millisecond) // add a millisecond to make it inclusive
+		untilTs = timestamppb.New(until)
 		// If the user specifies a deadline in the future, we should respect it
-		if options.Until.After(time.Now()) {
+		if until.After(time.Now()) {
 			var cancel context.CancelFunc
-			ctx, cancel = context.WithDeadline(ctx, options.Until)
+			ctx, cancel = context.WithDeadline(ctx, until)
 			defer cancel()
 		}
 	}
@@ -220,8 +221,8 @@ func tail(ctx context.Context, provider client.Provider, projectName string, opt
 		Pattern:  options.Filter,
 		Project:  projectName,
 		Services: options.Services,
-		Since:    since, // this is also used to continue from the last timestamp
-		Until:    until,
+		Since:    sinceTs, // this is also used to continue from the last timestamp
+		Until:    untilTs,
 	}
 
 	serverStream, err := provider.QueryLogs(ctx, tailRequest)