From 2ac48e6489e770afda038d657fc77f5da5d14ee3 Mon Sep 17 00:00:00 2001
From: saxenakshitiz <kshitiz@traceable.ai>
Date: Fri, 17 Dec 2021 15:21:38 +0530
Subject: [PATCH 1/2] Fix label update scenario where description, color,
 enabled fields are updated

---
 .../service/LabelsConfigServiceImpl.java      |  8 +++-
 .../service/LabelsConfigServiceImplTest.java  | 38 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java b/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java
index c24f49ea..c6b98148 100644
--- a/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java
+++ b/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java
@@ -16,6 +16,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
@@ -246,7 +247,7 @@ public void updateLabel(
             responseObserver.onError(new StatusRuntimeException(Status.INVALID_ARGUMENT));
             return;
           }
-          if (isDuplicateKey(requestContext, updateLabelData.getKey())) {
+          if (isDuplicateKey(requestContext, request.getId(), updateLabelData.getKey())) {
             responseObserver.onError(new StatusRuntimeException(Status.ALREADY_EXISTS));
             return;
           }
@@ -301,6 +302,11 @@ public void deleteLabel(
     }
   }
 
+  private boolean isDuplicateKey(RequestContext requestContext, String id, String key) {
+    return Optional.ofNullable(getLabelsMap(requestContext).get(key)).stream()
+        .anyMatch(label -> !label.getId().equals(id));
+  }
+
   private boolean isDuplicateKey(RequestContext requestContext, String key) {
     return getLabelsMap(requestContext).containsKey(key);
   }
diff --git a/labels-config-service-impl/src/test/java/org/hypertrace/label/config/service/LabelsConfigServiceImplTest.java b/labels-config-service-impl/src/test/java/org/hypertrace/label/config/service/LabelsConfigServiceImplTest.java
index 85f1ab6f..cca2ae14 100644
--- a/labels-config-service-impl/src/test/java/org/hypertrace/label/config/service/LabelsConfigServiceImplTest.java
+++ b/labels-config-service-impl/src/test/java/org/hypertrace/label/config/service/LabelsConfigServiceImplTest.java
@@ -253,7 +253,8 @@ void test_updateLabel() {
                       .build());
             });
     assertEquals(Status.ALREADY_EXISTS, Status.fromThrowable(exception1));
-    // Updating the labels by appending the keys of labels with a "new"
+
+    // Updating the labels by adding description
     List<Label> updateLabelsList =
         createdLabelsList.stream()
             .map(
@@ -261,7 +262,10 @@ void test_updateLabel() {
                     Label.newBuilder()
                         .setId(label.getId())
                         .setData(
-                            LabelData.newBuilder().setKey(label.getData().getKey() + "new").build())
+                            LabelData.newBuilder()
+                                .setKey(label.getData().getKey())
+                                .setDescription("description")
+                                .build())
                         .build())
             .collect(Collectors.toList());
     List<Label> updatedLabelsList =
@@ -278,6 +282,36 @@ void test_updateLabel() {
                 })
             .collect(Collectors.toList());
     assertEquals(updateLabelsList, updatedLabelsList);
+
+    // Updating the labels by appending the keys of labels with a "new"
+    updateLabelsList =
+        createdLabelsList.stream()
+            .map(
+                label ->
+                    Label.newBuilder()
+                        .setId(label.getId())
+                        .setData(
+                            LabelData.newBuilder()
+                                .setKey(label.getData().getKey() + "new")
+                                .setDescription("description")
+                                .build())
+                        .build())
+            .collect(Collectors.toList());
+    updatedLabelsList =
+        updateLabelsList.stream()
+            .map(
+                updateLabel -> {
+                  UpdateLabelResponse response =
+                      labelConfigStub.updateLabel(
+                          UpdateLabelRequest.newBuilder()
+                              .setId(updateLabel.getId())
+                              .setData(updateLabel.getData())
+                              .build());
+                  return response.getLabel();
+                })
+            .collect(Collectors.toList());
+    assertEquals(updateLabelsList, updatedLabelsList);
+
     // Updating a label that does not exist
     Throwable exception =
         assertThrows(

From 7771c03d48d3471a740bc64f575b359629e53ea2 Mon Sep 17 00:00:00 2001
From: saxenakshitiz <kshitiz@traceable.ai>
Date: Fri, 17 Dec 2021 15:31:42 +0530
Subject: [PATCH 2/2] Upgraded log4j to 2.16.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ca588157..546d9288 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -54,7 +54,7 @@ kotlin-stdlibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", versio
 commons-compress = { module = "org.apache.commons:commons-compress", version = "1.21" }
 jersey-common = { module = "org.glassfish.jersey.core:jersey-common", version = "2.34" }
 
-slf4j-log4jimpl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version = "2.15.0" }
+slf4j-log4jimpl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version = "2.16.0" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.30" }