From cb62659a0e152790d03908cd0a1b7196c86d085b Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay@cockroachlabs.com>
Date: Wed, 25 Sep 2024 14:32:05 +0530
Subject: [PATCH] cli: add timestamp in datadog uploadID

Previously, we were generating short UUID and creating uploadID tag with format
clusterName-UUID. This was inadequate because it was challenging to figure out
latest upload. To address this, this patch replaces short UUID with timestamp
with format yyyyMMddHHmmss. So new uploadID would look like
clusterName-yyyyMMddHHmmss.

Epic: None
Release note: None
---
 pkg/cli/zip_upload.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/cli/zip_upload.go b/pkg/cli/zip_upload.go
index 3577ace7e92a..3d76c03113e8 100644
--- a/pkg/cli/zip_upload.go
+++ b/pkg/cli/zip_upload.go
@@ -36,7 +36,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
 	"github.com/cockroachdb/cockroach/pkg/util/system"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
-	"github.com/cockroachdb/cockroach/pkg/util/uuid"
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/oauth2/google"
@@ -710,14 +709,16 @@ var doUploadReq = func(req *http.Request) ([]byte, error) {
 	return rawBody, nil
 }
 
-// a wrapper around uuid.MakeV4().String() to make the tests more deterministic.
+// a wrapper around timestamp to make the tests more deterministic.
 // Everything is converted to lowercase and spaces are replaced with hyphens. Because,
 // datadog will do this anyway and we want to make sure the UUIDs match when we generate the
 // explore/dashboard links.
 var newUploadID = func(cluster string) string {
+	currentTime := timeutil.Now()
+	formattedTime := currentTime.Format("20060102150405")
 	return strings.ToLower(
 		strings.ReplaceAll(
-			fmt.Sprintf("%s-%s", cluster, uuid.NewV4().Short()), " ", "-",
+			fmt.Sprintf("%s-%s", cluster, formattedTime), " ", "-",
 		),
 	)
 }