Compatible with scenarios where the Audit Tag is empty

doleyzi · May 29, 2024 · 25b7c75 · 25b7c75
1 parent d43e1e8
commit 25b7c75
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 10 deletions.
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/AuditReporterImpl.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/AuditReporterImpl.java
@@ -522,6 +522,38 @@ public int buildAuditId(AuditIdEnum baseAuditId,
         return AuditManagerUtils.buildAuditId(baseAuditId, success, isRealtime, discard, retry);
     }
 
+    public int buildSuccessfulAuditId(AuditIdEnum baseAuditId) {
+        return buildAuditId(baseAuditId, true, true, false, false);
+    }
+
+    public int buildSuccessfulAuditId(AuditIdEnum baseAuditId, boolean isRealtime) {
+        return buildAuditId(baseAuditId, true, isRealtime, false, false);
+    }
+
+    public int buildFailedAuditId(AuditIdEnum baseAuditId) {
+        return buildAuditId(baseAuditId, false, true, false, false);
+    }
+
+    public int buildFailedAuditId(AuditIdEnum baseAuditId, boolean isRealtime) {
+        return buildAuditId(baseAuditId, false, isRealtime, false, false);
+    }
+
+    public int buildDiscardAuditId(AuditIdEnum baseAuditId) {
+        return buildAuditId(baseAuditId, true, true, true, false);
+    }
+
+    public int buildDiscardAuditId(AuditIdEnum baseAuditId, boolean isRealtime) {
+        return buildAuditId(baseAuditId, true, isRealtime, true, false);
+    }
+
+    public int buildRetryAuditId(AuditIdEnum baseAuditId) {
+        return buildAuditId(baseAuditId, true, true, false, true);
+    }
+
+    public int buildRetryAuditId(AuditIdEnum baseAuditId, boolean isRealtime) {
+        return buildAuditId(baseAuditId, true, isRealtime, false, true);
+    }
+
     public AuditInformation buildAuditInformation(String auditType,
             FlowType dataFlow,
             boolean success,
@@ -530,6 +562,7 @@ public AuditInformation buildAuditInformation(String auditType,
             boolean retry) {
         return AuditManagerUtils.buildAuditInformation(auditType, dataFlow, success, isRealtime, discard, retry);
     }
+
     public List<AuditInformation> getAllAuditInformation() {
         return AuditManagerUtils.getAllAuditInformation();
     }

diff --git a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/AuditReporterImplTest.java b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/AuditReporterImplTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.audit;
+
+import org.junit.Test;
+
+import static org.apache.inlong.audit.AuditIdEnum.AGENT_INPUT;
+import static org.apache.inlong.audit.AuditIdEnum.SORT_HIVE_INPUT;
+import static org.junit.Assert.assertEquals;
+
+public class AuditReporterImplTest {
+
+    @Test
+    public void TestBuildAuditId() {
+        int auditId = AuditOperator.getInstance().buildSuccessfulAuditId(AGENT_INPUT);
+        assertEquals(3, auditId);
+        auditId = AuditOperator.getInstance().buildFailedAuditId(AGENT_INPUT);
+        assertEquals(524291, auditId);
+        auditId = AuditOperator.getInstance().buildRetryAuditId(AGENT_INPUT);
+        assertEquals(65539, auditId);
+        auditId = AuditOperator.getInstance().buildDiscardAuditId(AGENT_INPUT);
+        assertEquals(131075, auditId);
+
+        auditId = AuditOperator.getInstance().buildSuccessfulAuditId(SORT_HIVE_INPUT, false);
+        assertEquals(262151, auditId);
+        auditId = AuditOperator.getInstance().buildFailedAuditId(SORT_HIVE_INPUT, false);
+        assertEquals(786439, auditId);
+        auditId = AuditOperator.getInstance().buildDiscardAuditId(SORT_HIVE_INPUT, false);
+        assertEquals(393223, auditId);
+        auditId = AuditOperator.getInstance().buildRetryAuditId(SORT_HIVE_INPUT, false);
+        assertEquals(327687, auditId);
+    }
+}
diff --git a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/SqlConstants.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/SqlConstants.java
@@ -100,7 +100,12 @@ public class SqlConstants {
                     "FROM (\n" +
                     "\tSELECT audit_version, docker_id, thread_id, sdk_ts, packet_id\n" +
                     "\t\t, log_ts, ip, inlong_group_id, inlong_stream_id, audit_id\n" +
-                    "\t\t, audit_tag, count, size, delay\n" +
+                    "\t\t, " +
+                    "   CASE \n" +
+                    "        WHEN audit_tag ='' THEN '-1'\n" +
+                    "        ELSE audit_tag\n" +
+                    "    END AS audit_tag ," +
+                    " count, size, delay\n" +
                     "\tFROM audit_data\n" +
                     "\tWHERE log_ts BETWEEN ? AND ?\n" +
                     "\t\tAND inlong_group_id = ?\n" +

diff --git a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/ApiService.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/ApiService.java
@@ -55,7 +55,6 @@
 import static org.apache.inlong.audit.config.OpenApiConstants.DEFAULT_API_REAL_LIMITER_QPS;
 import static org.apache.inlong.audit.config.OpenApiConstants.DEFAULT_API_THREAD_POOL_SIZE;
 import static org.apache.inlong.audit.config.OpenApiConstants.DEFAULT_HTTP_SERVER_BIND_PORT;
-import static org.apache.inlong.audit.config.OpenApiConstants.DEFAULT_PARAMS_AUDIT_TAG;
 import static org.apache.inlong.audit.config.OpenApiConstants.HTTP_RESPOND_CODE;
 import static org.apache.inlong.audit.config.OpenApiConstants.KEY_API_BACKLOG_SIZE;
 import static org.apache.inlong.audit.config.OpenApiConstants.KEY_API_DAY_PATH;
@@ -79,6 +78,7 @@
 import static org.apache.inlong.audit.config.OpenApiConstants.PARAMS_IP;
 import static org.apache.inlong.audit.config.OpenApiConstants.PARAMS_START_TIME;
 import static org.apache.inlong.audit.config.OpenApiConstants.VALUE_HTTP_HEADER_CONTENT_TYPE;
+import static org.apache.inlong.audit.consts.ConfigConstants.DEFAULT_AUDIT_TAG;
 import static org.apache.inlong.audit.entities.ApiType.DAY;
 import static org.apache.inlong.audit.entities.ApiType.GET_IDS;
 import static org.apache.inlong.audit.entities.ApiType.GET_IPS;
@@ -180,7 +180,7 @@ private Map<String, String> parseRequestURI(String query) {
                     }
                 }
             }
-            params.putIfAbsent(PARAMS_AUDIT_TAG, DEFAULT_PARAMS_AUDIT_TAG);
+            params.putIfAbsent(PARAMS_AUDIT_TAG, DEFAULT_AUDIT_TAG);
             return params;
         }
 

diff --git a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/source/JdbcSource.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/source/JdbcSource.java
@@ -28,6 +28,7 @@
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.Data;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,10 +71,9 @@
 import static org.apache.inlong.audit.config.ConfigConstants.KEY_STAT_THREAD_POOL_SIZE;
 import static org.apache.inlong.audit.config.ConfigConstants.PREP_STMT_CACHE_SIZE;
 import static org.apache.inlong.audit.config.ConfigConstants.PREP_STMT_CACHE_SQL_LIMIT;
-import static org.apache.inlong.audit.config.OpenApiConstants.DEFAULT_PARAMS_AUDIT_TAG;
+import static org.apache.inlong.audit.consts.ConfigConstants.DEFAULT_AUDIT_TAG;
 import static org.apache.inlong.audit.entities.AuditCycle.DAY;
 import static org.apache.inlong.audit.entities.AuditCycle.HOUR;
-
 /**
  * Jdbc source
  */
@@ -300,11 +300,7 @@ public void query(String startTime, String endTime, String auditId) {
                         data.setInlongStreamId(resultSet.getString(2));
                         data.setAuditId(resultSet.getString(3));
                         String auditTag = resultSet.getString(4);
-                        if (null == auditTag) {
-                            data.setAuditTag(DEFAULT_PARAMS_AUDIT_TAG);
-                        } else {
-                            data.setAuditTag(auditTag);
-                        }
+                        data.setAuditTag(StringUtils.isBlank(auditTag) ? DEFAULT_AUDIT_TAG : auditTag);
                         long count = resultSet.getLong(5);
                         data.setCount(count);
                         data.setSize(resultSet.getLong(6));