volcengine · jerryqi7 · Jul 18, 2022 · Jul 18, 2022 · Aug 3, 2022 · Aug 8, 2022
diff --git a/README.md b/README.md
@@ -13,11 +13,11 @@ datarangers-sdk-java是 [DataFinder](https://www.volcengine.com/product/datafind
 <dependency>
   <groupId>com.datarangers</groupId>
   <artifactId>datarangers-sdk-core</artifactId>
-  <version>1.5.3-release</version>
+  <version>1.5.5-release</version>
 </dependency>
 ```
 
-version是sdk的版本号，当前最新的版本为1.5.3-release。
+version是sdk的版本号，当前最新的版本为1.5.5-release。
 
 火山引擎仓库地址：
 ```xml
@@ -32,7 +32,7 @@ version是sdk的版本号，当前最新的版本为1.5.3-release。
 
 ### 2. 配置SDK
 DataRangers SDK需要进行一定的参数配置才能够使用，具体需要配置的参数为：
-* domain：datarangers的域名或者ip，支持http和https，例如为 http://www.datarangers.com，在私有化环境中，需要修改为对应的sdk上报域名或者使用DataRangers服务器的ip地址。在saas环境中需要修改成对应的域名：
+* domain：datarangers的域名或者ip，支持http和https，例如为 https://www.xxx.com，在私有化环境中，需要修改为对应的sdk上报域名或者使用DataRangers服务器的ip地址。在saas环境中需要修改成对应的域名：
     * 中国区：https://mcs.ctobsnssdk.com
     * sg(新加坡): https://mcs.tobsnssdk.com
     * va(美东): https://mcs.itobsnssdk.com  
@@ -86,7 +86,7 @@ DataRangers SDK需要进行一定的参数配置才能够使用，具体需要
 <dependency>
    <groupId>com.datarangers</groupId>
    <artifactId>datarangers-sdk-starter</artifactId>
-   <version>1.5.3-release</version>
+   <version>1.5.5-release</version>
 </dependency>
 ```
 
@@ -108,20 +108,31 @@ datarangers.sdk.headers.Host=host
 # datarangers.sdk.appKeys.${appId}=xxx
 
 # 如果是在saas环境中，需要配置openapi, 私有化环境中可以不配置
-# openapi的domain， 国内: https://analytics.volcengineapi.com，国际是: https://datarangers.com
+# openapi的domain， 国内: https://analytics.volcengineapi.com，国际是: https://analytics.byteplusapi.com
 # datarangers.sdk.openapiConfig.domain=xxx
 
 # openapi的ak, sk
 # datarangers.sdk.openapiConfig.ak=xxx
 # datarangers.sdk.openapiConfig.sk=xxx
 
-
 # 是否保存到本地,如果需要配合logagent使用需要将其定义为true
 datarangers.sdk.save=true
 # 异步方式的发送线程数量,如果为logagent模式请设置为1
 datarangers.sdk.threadCount=4
+# 异步方式的发送核心线程数量，建议corePoolSize 跟threadCount 配置成一样
+datarangers.sdk.corePoolSize=4
 # 异步方式队列长度
 datarangers.sdk.queueSize=102400
+
+# 是否使用批量发送,默认为false
+#datarangers.sdk.sendBatch=true
+
+# 批量发送的大小
+#datarangers.sdk.batchSize=16
+
+# 批量的等待时间，当批量达到batchSize，或者等待时间超过waitTimeMs，就立刻发送
+#datarangers.sdk.waitTimeMs=100
+
 # 保存日志文件路径
 datarangers.sdk.eventSavePath=logs/
 # 保存日志文件名

diff --git a/datarangers-sdk-core/pom.xml b/datarangers-sdk-core/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>datarangers-sdk</artifactId>
+        <groupId>com.datarangers</groupId>
+        <version>1.5.5-release</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <name>datarangers-server-sdk-core</name>
+    <description>A SDK for datarangers user</description>
+    <url>https://github.com/volcengine/datarangers-sdk-java</url>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>datarangers-opensource</name>
+            <email>datarangers-opensource@bytedance.com</email>
+            <organization>DataFinder</organization>
+            <organizationUrl>https://www.volcengine.com/product/datafinder</organizationUrl>
+        </developer>
+    </developers>
+    <groupId>com.datarangers</groupId>
+    <artifactId>datarangers-sdk-core</artifactId>
+    <version>1.5.5-release</version>
+    <distributionManagement>
+    </distributionManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.11.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.11.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.11.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>0.10.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/datarangers-sdk-core/src/main/java/com/datarangers/asynccollector/CollectorContainer.java b/datarangers-sdk-core/src/main/java/com/datarangers/asynccollector/CollectorContainer.java
@@ -43,6 +43,10 @@ public List<Message> consume(int waitTimeMs) throws InterruptedException {
         return handleMessage(messageQueue.poll(waitTimeMs));
     }
 
+    public List<Message> consume(int size, int waitTimeMs) throws InterruptedException {
+        return handleMessage(messageQueue.poll(size, waitTimeMs));
+    }
+
     public int size() {
         return messageQueue.size();
     }

diff --git a/datarangers-sdk-core/src/main/java/com/datarangers/asynccollector/CollectorCounter.java b/datarangers-sdk-core/src/main/java/com/datarangers/asynccollector/CollectorCounter.java
@@ -34,7 +34,7 @@ public void run() {
         FileOutputStream stream = null;
         try {
             stream = new FileOutputStream(output, true);
-            Map<String, Object> status = new HashMap<String, Object>() {{
+            Map<String, Object> status = new HashMap<String, Object>(2) {{
                 put("history", CollectorContainer.SEND_HISTORY);
                 put("queue_length", Collector.collectorContainer.size());
             }};

diff --git a/datarangers-sdk-core/src/main/java/com/datarangers/asynccollector/CollectorQueue.java b/datarangers-sdk-core/src/main/java/com/datarangers/asynccollector/CollectorQueue.java
@@ -23,7 +23,17 @@ public interface CollectorQueue {
      * @date: 2021/2/7 15:51
      */
     List<Message> take() throws InterruptedException;
+
     List<Message> poll(int waitTimeMs) throws InterruptedException;
+
+    /**
+     * 每次等待waitTimeMs，获取数据最多size的数据
+     * @param size
+     * @param waitTimeMs
+     * @return
+     * @throws InterruptedException
+     */
+    List<Message> poll(int size, int waitTimeMs) throws InterruptedException;
     /**
      * 功能描述: 发送一个Message到队列中
      *