From 4a323b8f1cd717b254ab102e4b1d7e21842e30c2 Mon Sep 17 00:00:00 2001
From: Ashwin Giridharan <girida@amazon.com>
Date: Wed, 29 Apr 2020 15:56:15 -0700
Subject: [PATCH] Fixing a metrics bug

---
 .../src/main/java/software/amazon/kinesis/leases/Lease.java | 3 +--
 .../kinesis/leases/dynamodb/DynamoDBLeaseRenewer.java       | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/Lease.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/Lease.java
index 8ffd3bda..427b3509 100644
--- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/Lease.java
+++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/Lease.java
@@ -163,7 +163,6 @@ public class Lease {
         pendingCheckpointState(lease.pendingCheckpointState);
         parentShardIds(lease.parentShardIds);
         childShardIds(lease.childShardIds);
-        hashKeyRange(lease.hashKeyRangeForLease);
     }
 
     /**
@@ -283,7 +282,7 @@ public class Lease {
      * Set the hash range key for this shard.
      * @param hashKeyRangeForLease
      */
-    public void hashKeyRange(final HashKeyRangeForLease hashKeyRangeForLease) {
+    public void hashKeyRange(HashKeyRangeForLease hashKeyRangeForLease) {
         if (this.hashKeyRangeForLease == null) {
             this.hashKeyRangeForLease = hashKeyRangeForLease;
         } else if (!this.hashKeyRangeForLease.equals(hashKeyRangeForLease)) {
diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/dynamodb/DynamoDBLeaseRenewer.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/dynamodb/DynamoDBLeaseRenewer.java
index a1e0afcc..544de8cd 100644
--- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/dynamodb/DynamoDBLeaseRenewer.java
+++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/dynamodb/DynamoDBLeaseRenewer.java
@@ -271,7 +271,7 @@ public class DynamoDBLeaseRenewer implements LeaseRenewer {
      * {@inheritDoc}
      */
     @Override
-    public boolean updateLease(Lease lease, UUID concurrencyToken, @NonNull String operation, String shardId)
+        public boolean updateLease(Lease lease, UUID concurrencyToken, @NonNull String operation, String shardId)
         throws DependencyException, InvalidStateException, ProvisionedThroughputException {
         verifyNotNull(lease, "lease cannot be null");
         verifyNotNull(lease.leaseKey(), "leaseKey cannot be null");
@@ -302,8 +302,10 @@ public class DynamoDBLeaseRenewer implements LeaseRenewer {
             if(lease instanceof MultiStreamLease) {
                 MetricsUtil.addStreamId(scope,
                         StreamIdentifier.multiStreamInstance(((MultiStreamLease) lease).streamIdentifier()));
+                MetricsUtil.addShardId(scope, ((MultiStreamLease) lease).shardId());
+            } else {
+                MetricsUtil.addShardId(scope, shardId);
             }
-            MetricsUtil.addShardId(scope, shardId);
         }
 
         long startTime = System.currentTimeMillis();