From b4c209bbd2419d678ea51aae64783f619ff92716 Mon Sep 17 00:00:00 2001
From: xiaoweii <xiaoweii@amazom.com>
Date: Fri, 8 Dec 2023 13:31:49 +0800
Subject: [PATCH] fix: resolve conflicts

---
 .../aws/solution/clickstream/client/AnalyticsClient.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clickstream/src/main/java/software/aws/solution/clickstream/client/AnalyticsClient.java b/clickstream/src/main/java/software/aws/solution/clickstream/client/AnalyticsClient.java
index 77d196f..7837e2f 100644
--- a/clickstream/src/main/java/software/aws/solution/clickstream/client/AnalyticsClient.java
+++ b/clickstream/src/main/java/software/aws/solution/clickstream/client/AnalyticsClient.java
@@ -101,7 +101,7 @@ public void deleteGlobalAttribute(String name) {
      */
     public void addUserAttribute(String name, Object value) {
         if (value != null) {
-            Event.EventError error = EventChecker.checkUserAttribute(userAttributes.length(), name, value);
+            Event.EventError error = EventChecker.checkUserAttribute(allUserAttributes.length(), name, value);
             if (error.getErrorCode() > 0) {
                 final AnalyticsEvent event = createEvent(Event.PresetEvent.CLICKSTREAM_ERROR);
                 event.addAttribute(Event.ReservedAttribute.ERROR_CODE, error.getErrorCode());