[vcr-2.0] Fix metric names (linkedin#2870)

Some metrics are not showing up after recent deployment.
justinlin-linkedin · Aug 22, 2024 · e3b411a · e3b411a
1 parent 4235742
commit e3b411a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/ambry-cloud/src/main/java/com/github/ambry/cloud/azure/AzureMetrics.java b/ambry-cloud/src/main/java/com/github/ambry/cloud/azure/AzureMetrics.java
@@ -24,14 +24,14 @@ public class AzureMetrics extends AzureMetricsOld {
   // Metric name constants
   public static final String BLOB_UPLOAD_SUCCESS_RATE = "BlobUploadSuccessRate";
   public static final String BLOB_UPDATE_TTL_SUCCESS_RATE = "BlobUpdateTTLSuccessRate";
-  public static final String BLOB_UPDATE_TTL_LATENCY = "blobUpdateTTLLatency";
+  public static final String BLOB_UPDATE_TTL_LATENCY = "BlobUpdateTTLLatency";
   public static final String BLOB_UPDATE_TTL_ERROR_COUNT = "BlobUpdateTTLErrorCount";
-  public static final String BLOB_UPDATE_DELETE_TIME_SUCCESS_RATE = "BlobUpdateDeleteTimeSuccessRate";
-  public static final String BLOB_UPDATE_DELETE_TIME_LATENCY = "blobUpdateDeleteTimeLatency";
-  public static final String BLOB_UPDATE_DELETE_TIME_ERROR_COUNT = "BlobUpdateDeleteTimeErrorCount";
-  public static final String BLOB_UNDELETE_SUCCESS_RATE = "BlobUndeleteTimeSuccessRate";
-  public static final String BLOB_UNDELETE_LATENCY = "blobUndeleteLatency";
-  public static final String BLOB_UNDELETE_ERROR_COUNT = "blobUndeleteErrorCount";
+  public static final String BLOB_DELETE_SUCCESS_RATE = "BlobDeleteSuccessRate";
+  public static final String BLOB_DELETE_LATENCY = "BlobDeleteLatency";
+  public static final String BLOB_DELETE_ERROR_COUNT = "BlobDeleteErrorCount";
+  public static final String BLOB_UNDELETE_SUCCESS_RATE = "BlobUndeleteSuccessRate";
+  public static final String BLOB_UNDELETE_LATENCY = "BlobUndeleteLatency";
+  public static final String BLOB_UNDELETE_ERROR_COUNT = "BlobUndeleteErrorCount";
   public static final String BLOB_UPLOAD_ERROR_COUNT = "BlobUploadErrorCount";
   public static final String BLOB_GET_PROPERTIES_SUCCESS_RATE = "BlobGetPropertiesSuccessRate";
   public static final String BLOB_GET_PROPERTIES_LATENCY = "BlobGetPropertiesLatency";
@@ -112,9 +112,9 @@ public AzureMetrics(MetricRegistry registry) {
     blobUndeleteErrorCount = registry.counter(MetricRegistry.name(AzureMetrics.class, BLOB_UNDELETE_ERROR_COUNT));
     blobUndeleteLatency = registry.timer(MetricRegistry.name(AzureMetrics.class, BLOB_UNDELETE_LATENCY));
     blobUndeleteSuccessRate = registry.meter(MetricRegistry.name(AzureMetrics.class, BLOB_UNDELETE_SUCCESS_RATE));
-    blobDeleteErrorCount = registry.counter(MetricRegistry.name(AzureMetrics.class, BLOB_UPDATE_DELETE_TIME_ERROR_COUNT));
-    blobDeleteLatency = registry.timer(MetricRegistry.name(AzureMetrics.class, BLOB_UPDATE_DELETE_TIME_LATENCY));
-    blobDeleteSuccessRate = registry.meter(MetricRegistry.name(AzureMetrics.class, BLOB_UPDATE_DELETE_TIME_SUCCESS_RATE));
+    blobDeleteErrorCount = registry.counter(MetricRegistry.name(AzureMetrics.class, BLOB_DELETE_ERROR_COUNT));
+    blobDeleteLatency = registry.timer(MetricRegistry.name(AzureMetrics.class, BLOB_DELETE_LATENCY));
+    blobDeleteSuccessRate = registry.meter(MetricRegistry.name(AzureMetrics.class, BLOB_DELETE_SUCCESS_RATE));
     blobUpdateTTLErrorCount = registry.counter(MetricRegistry.name(AzureMetrics.class, BLOB_UPDATE_TTL_ERROR_COUNT));
     blobUpdateTTLLatency = registry.timer(MetricRegistry.name(AzureMetrics.class, BLOB_UPDATE_TTL_LATENCY));
     blobUpdateTTLSuccessRate = registry.meter(MetricRegistry.name(AzureMetrics.class, BLOB_UPDATE_TTL_SUCCESS_RATE));

diff --git a/ambry-cloud/src/main/java/com/github/ambry/cloud/azure/AzureMetricsOld.java b/ambry-cloud/src/main/java/com/github/ambry/cloud/azure/AzureMetricsOld.java
@@ -29,7 +29,6 @@ public class AzureMetricsOld {
   public static final String BACKUP_SUCCESS_BYTE_RATE = "BackupSuccessByteRate";
   public static final String BACKUP_SUCCESS_LATENCY = "BackupSuccessLatency";
   public static final String BLOB_DELETED_COUNT = "BlobDeletedCount";
-  public static final String BLOB_DELETE_ERROR_COUNT = "BlobDeleteErrorCount";
   public static final String BLOB_DELETE_REQUEST_COUNT = "BlobDeleteRequestCount";
   public static final String BLOB_DELETION_TIME = "BlobDeletionTime";
   public static final String BLOB_DOWNLOAD_REQUEST_COUNT = "BlobDownloadRequestCount";
@@ -78,7 +77,6 @@ public class AzureMetricsOld {
   public final Counter absForbiddenExceptionCount;
   public final Counter absTokenRefreshAttemptCount;
   public final Counter backupErrorCount;
-  public final Counter blobDeleteErrorCount;
   public final Counter blobDeleteRequestCount;
   public final Counter blobDeletedCount;
   public final Counter blobDownloadRequestCount;
@@ -177,7 +175,6 @@ public AzureMetricsOld(MetricRegistry registry) {
         registry.counter(MetricRegistry.name(AzureCloudDestination.class, BLOB_DELETE_REQUEST_COUNT));
     blobDeletedCount = registry.counter(MetricRegistry.name(AzureCloudDestination.class, BLOB_DELETED_COUNT));
     blobDeletionTime = registry.timer(MetricRegistry.name(AzureCloudDestination.class, BLOB_DELETION_TIME));
-    blobDeleteErrorCount = registry.counter(MetricRegistry.name(AzureCloudDestination.class, BLOB_DELETE_ERROR_COUNT));
     configErrorCount = registry.counter(MetricRegistry.name(AzureCloudDestination.class, CONFIG_ERROR_COUNT));
     backupSuccessByteRate = registry.meter(MetricRegistry.name(AzureCloudDestination.class, BACKUP_SUCCESS_BYTE_RATE));
     backupSuccessLatency = registry.timer(MetricRegistry.name(AzureCloudDestination.class, BACKUP_SUCCESS_LATENCY));