Add archiver metrics and logger tags (cadence-workflow#2242)

code-4-fun · Jul 20, 2019 · f0de6d1 · f0de6d1
1 parent bad88bb
commit f0de6d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/common/log/tag/tags.go b/common/log/tag/tags.go
@@ -721,9 +721,9 @@ func ArchivalUploadFailReason(uploadFailReason string) Tag {
 	return newStringTag("archival-upload-fail-reason", uploadFailReason)
 }
 
-// ArchivalDeleteBlobsFailReason returns tag for ArchivalDeleteBlobsFailReason
-func ArchivalDeleteBlobsFailReason(deleteBlobsFailReason string) Tag {
-	return newStringTag("archival-delete-blobs-fail-reason", deleteBlobsFailReason)
+// ArchivalCleanUpFailReason returns tag for ArchivalCleanUpFailReason
+func ArchivalCleanUpFailReason(cleanUpFailReason string) Tag {
+	return newStringTag("archival-clean-up-fail-reason", cleanUpFailReason)
 }
 
 // ArchivalDeterministicConstructionCheckFailReason returns tag for ArchivalDeterministicConstructionCheckFailReason

diff --git a/common/metrics/defs.go b/common/metrics/defs.go
@@ -1263,6 +1263,8 @@ const (
 	HistoryArchiverRunningBlobIntegrityCheckCount
 	HistoryArchiverBlobIntegrityCheckFailedCount
 	HistoryArchiverCouldNotRunBlobIntegrityCheckCount
+	HistoryArchiverUploadNonRetryableErrorCount
+	HistoryArchiverCleanupFailedCount
 
 	NumCommonMetrics // Needs to be last on this list for iota numbering
 )
@@ -1524,6 +1526,8 @@ var MetricDefs = map[ServiceIdx]map[int]metricDefinition{
 		HistoryArchiverRunningBlobIntegrityCheckCount:                 {metricName: "history_archiver_running_blob_integrity_check", metricType: Counter},
 		HistoryArchiverBlobIntegrityCheckFailedCount:                  {metricName: "history_archiver_blob_integrity_check_failed", metricType: Counter},
 		HistoryArchiverCouldNotRunBlobIntegrityCheckCount:             {metricName: "history_archiver_could_not_run_blob_integrity_check", metricType: Counter},
+		HistoryArchiverUploadNonRetryableErrorCount:                   {metricName: "history_archiver_upload_non_retryable_error", metricType: Counter},
+		HistoryArchiverCleanupFailedCount:                             {metricName: "history_archiver_cleanup_failed", metricType: Counter},
 	},
 	Frontend: {},
 	History: {