From 638402cb6fb7d5a6ee5afdce05be5868f87db595 Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Wed, 21 Jul 2021 20:58:24 -0400
Subject: [PATCH] Allow WriteClientMetrics to be final

---
 .../rss/clients/DataBlockSyncWriteClient.java | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/uber/rss/clients/DataBlockSyncWriteClient.java b/src/main/java/com/uber/rss/clients/DataBlockSyncWriteClient.java
index 7ce44d3..63fe97d 100644
--- a/src/main/java/com/uber/rss/clients/DataBlockSyncWriteClient.java
+++ b/src/main/java/com/uber/rss/clients/DataBlockSyncWriteClient.java
@@ -51,7 +51,7 @@ public class DataBlockSyncWriteClient extends com.uber.rss.clients.ClientBase {
   private long totalWriteBytes = 0;
   private long startUploadShuffleByteSnapshot = 0;
 
-  private WriteClientMetrics metrics = null;
+  private final WriteClientMetrics metrics;
 
   public DataBlockSyncWriteClient(String host, int port, int timeoutMillis, String user, String appId, String appAttempt) {
     this(host, port, timeoutMillis, true, user, appId, appAttempt);
@@ -66,7 +66,7 @@ public DataBlockSyncWriteClient(String host, int port, int timeoutMillis, boolea
 
     this.metrics = new WriteClientMetrics(new WriteClientMetricsKey(
         this.getClass().getSimpleName(), user));
-    metrics.getNumClients().inc(1);
+    this.metrics.getNumClients().inc(1);
   }
 
   public ConnectUploadResponse connect() {
@@ -171,22 +171,15 @@ public void finishUpload(long taskAttemptId) {
   @Override
   public void close() {
     super.close();
-    closeMetrics();
-  }
-
-  public long getShuffleWriteBytes() {
-    return totalWriteBytes - startUploadShuffleByteSnapshot;
-  }
-
-  private void closeMetrics() {
     try {
-      if (metrics != null) {
         metrics.close();
-        metrics = null;
-      }
     } catch (Throwable e) {
       M3Stats.addException(e, this.getClass().getSimpleName());
-      logger.warn(String.format("Failed to close metrics: %s", connectionInfo), e);
+      logger.warn("Failed to close metrics: {}", connectionInfo, e);
     }
   }
+
+  public long getShuffleWriteBytes() {
+    return totalWriteBytes - startUploadShuffleByteSnapshot;
+  }
 }