From 6047a09e5fc42de12d839935604155bba8d63e3d Mon Sep 17 00:00:00 2001
From: qidaijie <qidaijie@mesalab.cn>
Date: Thu, 25 Jan 2024 11:30:20 +0800
Subject: [PATCH] [TSG-18743] - To adapt the application and protocol metric
 log field modifications.

---
 pom.xml                                                     | 2 +-
 src/main/java/com/zdjizhi/common/pojo/Tags.java             | 4 ++--
 .../com/zdjizhi/utils/functions/process/ParsingData.java    | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8aec1b7..08a1647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.zdjizhi</groupId>
     <artifactId>app-protocol-stat-traffic-merge</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
 
     <name>app-protocol-stat-traffic-merge</name>
     <url>http://www.example.com</url>
diff --git a/src/main/java/com/zdjizhi/common/pojo/Tags.java b/src/main/java/com/zdjizhi/common/pojo/Tags.java
index bad2520..28be9fe 100644
--- a/src/main/java/com/zdjizhi/common/pojo/Tags.java
+++ b/src/main/java/com/zdjizhi/common/pojo/Tags.java
@@ -61,7 +61,7 @@ public class Tags {
         return protocol_stack_id;
     }
 
-    @JSONField(name = "protocol_label")
+    @JSONField(name = "decoded_path")
     public void setProtocol_stack_id(String protocol_stack_id) {
         this.protocol_stack_id = protocol_stack_id;
     }
@@ -70,7 +70,7 @@ public class Tags {
         return app_name;
     }
 
-    @JSONField(name = "app_full_path")
+    @JSONField(name = "app")
     public void setApp_name(String app_name) {
         this.app_name = app_name;
     }
diff --git a/src/main/java/com/zdjizhi/utils/functions/process/ParsingData.java b/src/main/java/com/zdjizhi/utils/functions/process/ParsingData.java
index e88ae78..e9a40bf 100644
--- a/src/main/java/com/zdjizhi/utils/functions/process/ParsingData.java
+++ b/src/main/java/com/zdjizhi/utils/functions/process/ParsingData.java
@@ -28,9 +28,11 @@ public class ParsingData extends ProcessFunction<String, Tuple3<Tags, Fields, Lo
                     Tags tags = JSONObject.parseObject(originalLog.getString("tags"), Tags.class);
                     Long timestamp_ms = originalLog.getLong("timestamp_ms");
 
-                    joinProtocol(tags);
+                    if (StringUtil.isNotBlank(tags.getProtocol_stack_id())) {
+                        joinProtocol(tags);
 
-                    out.collect(new Tuple3<>(tags, fields, timestamp_ms));
+                        out.collect(new Tuple3<>(tags, fields, timestamp_ms));
+                    }
                 }
             }
         } catch (RuntimeException e) {