From 484d16df092a4de182ca99fd60747020f494032d Mon Sep 17 00:00:00 2001
From: syaning <syaningv@gmail.com>
Date: Mon, 23 Dec 2024 20:08:57 +0800
Subject: [PATCH 1/2] feature: support ingest processor

---
 README.md                                             |  5 ++++-
 README_CN.md                                          |  5 ++++-
 pom.xml                                               |  4 ++--
 .../aliyun/openservices/log/log4j/LoghubAppender.java | 11 +++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1036b18..5a9479d 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Field Specifications:
 <dependency>
     <groupId>com.aliyun.openservices</groupId>
     <artifactId>aliyun-log-log4j-appender</artifactId>
-    <version>0.1.12</version>
+    <version>0.1.16</version>
 </dependency>
 ```
 
@@ -113,6 +113,9 @@ log4j.appender.loghub.timeFormat = yyyy-MM-dd'T'HH:mm:ssZ
 
 # Specify timezone of the field time, default is UTC, optional
 log4j.appender.loghub.timeZone = UTC
+
+# Specify ingest processor, default is "", optional
+log4j.appender.loghub.processor=[ingest processor]
 ```
 
 ## Sample Code
diff --git a/README_CN.md b/README_CN.md
index 86b4784..37d8401 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -57,7 +57,7 @@ __topic__: yyy
 <dependency>
     <groupId>com.aliyun.openservices</groupId>
     <artifactId>aliyun-log-log4j-appender</artifactId>
-    <version>0.1.12</version>
+    <version>0.1.16</version>
 </dependency>
 ```
 
@@ -116,6 +116,9 @@ log4j.appender.loghub.source = [your source]
 log4j.appender.loghub.timeFormat=yyyy-MM-dd'T'HH:mm:ssZ
 #设置时区，默认为 UTC，可选参数（如果希望 time 字段的时区为东八区，可将该值设定为 Asia/Shanghai）
 log4j.appender.loghub.timeZone=UTC
+
+#设置写入处理器，默认为 ""，可选参数
+log4j.appender.loghub.processor=[ingest processor]
 ```
 参阅：https://github.com/aliyun/aliyun-log-producer-java
 
diff --git a/pom.xml b/pom.xml
index f32d943..dc75199 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>com.aliyun.openservices</groupId>
     <artifactId>aliyun-log-log4j-appender</artifactId>
-    <version>0.1.15</version>
+    <version>0.1.16</version>
 
     <name>aliyun log log4j appender</name>
     <url>http://www.aliyun.com</url>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.aliyun.openservices</groupId>
             <artifactId>aliyun-log-producer</artifactId>
-            <version>0.3.18</version>
+            <version>0.3.23</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java b/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java
index a178ead..21ba070 100644
--- a/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java
+++ b/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java
@@ -50,6 +50,8 @@ public class LoghubAppender extends AppenderSkeleton {
 
   private DateTimeFormatter formatter;
 
+  private String processor;
+
   @Override
   public void activateOptions() {
     super.activateOptions();
@@ -88,6 +90,7 @@ public boolean requiresLayout() {
 
   public Producer createProducer() {
     projectConfig = buildProjectConfig();
+    producerConfig.setProcessor(processor);
     Producer producer = new LogProducer(producerConfig);
     producer.putProjectConfig(projectConfig);
     return producer;
@@ -322,4 +325,12 @@ public String getTimeZone() {
   public void setTimeZone(String timeZone) {
     this.timeZone = timeZone;
   }
+
+  public String getProcessor() {
+    return processor;
+  }
+
+  public void setProcessor(String processor) {
+    this.processor = processor;
+  }
 }

From 8be3dc7e646f96b5bddb37658bbbfd262d6e5d68 Mon Sep 17 00:00:00 2001
From: syaning <syaningv@gmail.com>
Date: Tue, 24 Dec 2024 10:36:00 +0800
Subject: [PATCH 2/2] fix: update processor setter

---
 .../java/com/aliyun/openservices/log/log4j/LoghubAppender.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java b/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java
index 21ba070..14ee1c8 100644
--- a/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java
+++ b/src/main/java/com/aliyun/openservices/log/log4j/LoghubAppender.java
@@ -90,7 +90,6 @@ public boolean requiresLayout() {
 
   public Producer createProducer() {
     projectConfig = buildProjectConfig();
-    producerConfig.setProcessor(processor);
     Producer producer = new LogProducer(producerConfig);
     producer.putProjectConfig(projectConfig);
     return producer;
@@ -332,5 +331,6 @@ public String getProcessor() {
 
   public void setProcessor(String processor) {
     this.processor = processor;
+    producerConfig.setProcessor(processor);
   }
 }