Merge #151382

151382: cli(tsdump): update tsdump summary log request of Datadog r=aa-joshi a=aa-joshi

Previously, TestTSDumpUploadE2E test was failing on `s390x` architecture. It
seems like the nested JSON string of Message is not behaving unexpected. It was
throwing an error `expected comma after object value`. To address this, this
patch updates the Message with the string and rest of the information is passed
into the AdditionalProperties of datadogV2.HTTPLogItem.

Epic: None
Fixes: #150792
Release note: None

Co-authored-by: Akshay Joshi <[email protected]>

Author: craig[bot]

pkg/cli/testdata/tsdump_upload_e2e

@@ -8,6 +8,6 @@ cr.store.rocksdb.block.cache.usage,2021-01-01T00:00:00Z,2,75.2
 ----
 {"series":[{"interval":10,"metric":"crdb.tsdump.admission.admitted.elastic-cpu","points":[{"timestamp":1748248320,"value":1}],"tags":["node_id:1","cluster_type:SELF_HOSTED","cluster_label:\"test-cluster\"","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:\"test-cluster\"-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0},{"interval":10,"metric":"crdb.tsdump.sql.query.count","points":[{"timestamp":1609459200,"value":100.5}],"tags":["node_id:1","cluster_type:SELF_HOSTED","cluster_label:\"test-cluster\"","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:\"test-cluster\"-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0},{"interval":10,"metric":"crdb.tsdump.sql.query.count","points":[{"timestamp":1609459210,"value":102.3}],"tags":["node_id:1","cluster_type:SELF_HOSTED","cluster_label:\"test-cluster\"","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:\"test-cluster\"-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0},{"interval":10,"metric":"crdb.tsdump.rocksdb.block.cache.usage","points":[{"timestamp":1609459200,"value":75.2}],"tags":["store:2","cluster_type:SELF_HOSTED","cluster_label:\"test-cluster\"","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:\"test-cluster\"-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0}]}
 
-[{"ddsource":"tsdump_upload","ddtags":"cluster_type:SELF_HOSTED,cluster_label:\"test-cluster\",cluster_id:test-cluster-id,zendesk_ticket:zd-test,org_name:test-org,user_name:test-user,upload_id:\"test-cluster\"-20241114000000,upload_timestamp:2024-11-14 00:00:00,upload_year:2024,upload_month:11,upload_day:14,series_uploaded:4","hostname":"hostname","message":"{\"message\":\"tsdump upload completed: uploaded 4 series overall\",\"series_uploaded\":4,\"estimated_cost\":0.000186986301369863,\"duration\":0,\"dry_run\":false,\"success\":true}","service":"tsdump_upload"}]
+[{"ddsource":"tsdump_upload","ddtags":"cluster_type:SELF_HOSTED,cluster_label:\"test-cluster\",cluster_id:test-cluster-id,zendesk_ticket:zd-test,org_name:test-org,user_name:test-user,upload_id:\"test-cluster\"-20241114000000,upload_timestamp:2024-11-14 00:00:00,upload_year:2024,upload_month:11,upload_day:14,series_uploaded:4","dry_run":"false","duration":"0","estimated_cost":"0.000186986301369863","hostname":"hostname","message":"tsdump upload completed: uploaded 4 series overall","series_uploaded":"4","service":"tsdump_upload","success":"true"}]
 ----
 ----

pkg/cli/tsdump_upload.go

@@ -574,28 +574,20 @@ func (d *datadogWriter) upload(fileName string) error {
 
 	api := datadogV2.NewLogsApi(d.apiClient)
 	hostName := getHostname()
-	msgJson, _ := json.Marshal(struct {
-		Message        string  `json:"message"`
-		SeriesUploaded int     `json:"series_uploaded"`
-		EstimatedCost  float64 `json:"estimated_cost"`
-		Duration       int     `json:"duration"`
-		DryRun         bool    `json:"dry_run"`
-		Success        bool    `json:"success"`
-	}{
-		Message:        fmt.Sprintf("tsdump upload completed: uploaded %d series overall", seriesUploaded),
-		SeriesUploaded: seriesUploaded,
-		Duration:       int(getCurrentTime().Sub(d.uploadTime).Nanoseconds()),
-		DryRun:         debugTimeSeriesDumpOpts.dryRun,
-		EstimatedCost:  estimatedCost,
-		Success:        success,
-	})
 	_, _, err = api.SubmitLog(d.datadogContext, []datadogV2.HTTPLogItem{
 		{
 			Ddsource: datadog.PtrString("tsdump_upload"),
 			Ddtags:   datadog.PtrString(strings.Join(eventTags, ",")),
-			Message:  string(msgJson),
+			Message:  fmt.Sprintf("tsdump upload completed: uploaded %d series overall", seriesUploaded),
 			Service:  datadog.PtrString("tsdump_upload"),
 			Hostname: datadog.PtrString(hostName),
+			AdditionalProperties: map[string]string{
+				"series_uploaded": strconv.Itoa(seriesUploaded),
+				"estimated_cost":  fmt.Sprintf("%g", estimatedCost),
+				"duration":        strconv.Itoa(int(getCurrentTime().Sub(d.uploadTime).Nanoseconds())),
+				"dry_run":         strconv.FormatBool(debugTimeSeriesDumpOpts.dryRun),
+				"success":         strconv.FormatBool(success),
+			},
 		},
 	}, datadogV2.SubmitLogOptionalParameters{
 		ContentEncoding: datadogV2.CONTENTENCODING_GZIP.Ptr(),