(inlong) branch master updated: [INLONG-10060][Manager] Optimize audit data query related logs (#10061)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 8be68c58a9 [INLONG-10060][Manager] Optimize audit data query related 
logs (#10061)
8be68c58a9 is described below

commit 8be68c58a96cbd3ce572b8f53f2fcc691d8a7c68
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Wed Apr 24 17:33:04 2024 +0800

    [INLONG-10060][Manager] Optimize audit data query related logs (#10061)
---
 .../java/org/apache/inlong/manager/pojo/audit/AuditResponse.java  | 1 +
 .../org/apache/inlong/manager/service/audit/AuditRunnable.java    | 8 ++++----
 .../apache/inlong/manager/service/core/impl/AuditServiceImpl.java | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditResponse.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditResponse.java
index 280189878d..0ed3ed30b5 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditResponse.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditResponse.java
@@ -38,6 +38,7 @@ public class AuditResponse {
     @AllArgsConstructor
     public static class AuditItem {
 
+        private String ip;
         private String logTs;
         private String inlongGroupId;
         private String inlongStreamId;
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
index aa74fed7e8..0f50c14698 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
@@ -114,10 +114,10 @@ public class AuditRunnable implements Runnable {
             StringBuilder builder = new StringBuilder();
             builder.append(auditUrl);
             if (StringUtils.isNotBlank(ip)) {
-                builder.append("/audit/query/getIps?")
+                builder.append("/audit/query/getIds?")
                         .append("&ip=").append(ip);
             } else {
-                builder.append("/audit/query/minutes?")
+                builder.append("/audit/query/getIps?")
                         .append("&inlongGroupId=").append(groupId)
                         .append("&inlongStreamId=").append(streamId);
             }
@@ -131,7 +131,7 @@ public class AuditRunnable implements Runnable {
                     HttpMethod.GET, null,
                     null,
                     AuditResponse.class);
-            LOGGER.info("success to query audit info result={}", result);
+            LOGGER.info("success to query audit info for url ={}", url);
             return CommonBeanUtils.copyListProperties(result.getData(), 
AuditInfo::new);
         } catch (Exception e) {
             LOGGER.info("query audit failed for request={}", request, e);
@@ -174,7 +174,7 @@ public class AuditRunnable implements Runnable {
                     HttpMethod.GET, null,
                     null,
                     AuditResponse.class);
-            LOGGER.info("success to query audit info result={}", result);
+            LOGGER.info("success to query audit info for url ={}", url);
             return CommonBeanUtils.copyListProperties(result.getData(), 
AuditInfo::new);
         } catch (Exception e) {
             LOGGER.info("query audit failed for request={}", request, e);
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
index a7ae4e4299..6615e3c240 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
@@ -389,6 +389,9 @@ public class AuditServiceImpl implements AuditService {
                         auditQueryUrl, null, true));
             }
         }
+        if (AuditQuerySource.CLICKHOUSE == querySource) {
+            latch.await(30, TimeUnit.SECONDS);
+        }
         return result;
     }