Release 3.4.1

Author: xuchang

SensorsAnalyticsSDK/pom.xml

@@ -15,7 +15,7 @@
     <groupId>com.sensorsdata.analytics.javasdk</groupId>
     <name>SensorsAnalyticsSDK</name>
     <artifactId>SensorsAnalyticsSDK</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
     <description>The official Java SDK of Sensors Analytics</description>
     <url>http://sensorsdata.cn</url>
 
@@ -55,6 +55,7 @@
         <junit.version>4.11</junit.version>
         <slf4j.version>1.7.25</slf4j.version>
         <slf4j-simple.version>1.6.6</slf4j-simple.version>
+        <jetty.version>9.4.12.v20180830</jetty.version>
     </properties>
 
     <dependencies>
@@ -91,6 +92,12 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/SensorsConst.java

@@ -15,7 +15,7 @@ private SensorsConst() {
     /**
      * 当前JDK版本号，注意要和pom文件里面的version保持一致
      */
-    public static final String SDK_VERSION = "3.4.0";
+    public static final String SDK_VERSION = "3.4.1";
     /**
      * 当前语言类型
      */

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/consumer/InnerLoggingConsumer.java

@@ -112,9 +112,6 @@ public synchronized void close() {
         log.info("Call close method.");
     }
 
-    public enum LogSplitMode {
-        DAY, HOUR
-    }
 }
 
 interface LoggingFileWriter {

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/consumer/LogSplitMode.java

@@ -0,0 +1,5 @@
+package com.sensorsdata.analytics.javasdk.consumer;
+
+public enum LogSplitMode {
+        DAY, HOUR
+    }

SensorsAnalyticsSDK/src/main/test/java/com.sensorsdata.analytics.javasdk/ConcurrentLoggingConsumerTest.java

@@ -0,0 +1,142 @@
+package com.sensorsdata.analytics.javasdk;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import com.sensorsdata.analytics.javasdk.consumer.ConcurrentLoggingConsumer;
+import com.sensorsdata.analytics.javasdk.consumer.LogSplitMode;
+
+import com.sensorsdata.analytics.javasdk.exceptions.InvalidArgumentException;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ConcurrentLoggingConsumer 单测
+ *
+ * @author fangzhuo
+ * @version 1.0.0
+ * @since 2021/11/25 16:46
+ */
+public class ConcurrentLoggingConsumerTest {
+
+  private ConcurrentLoggingConsumer consumer;
+
+  private StringBuilder messageBuffer;
+
+  @Before
+  public void init() throws NoSuchFieldException, IllegalAccessException {
+    consumer = new ConcurrentLoggingConsumer("file.log");
+    Field field = consumer.getClass().getSuperclass().getDeclaredField("messageBuffer");
+    field.setAccessible(true);
+    messageBuffer = (StringBuilder) field.get(consumer);
+  }
+
+  @Test
+  public void checkSendData() {
+    assertEquals(0, messageBuffer.length());
+    Map<String, Object> event = new HashMap<>();
+    event.put("distinct_id", "12345");
+    event.put("event", "test");
+    event.put("type", "track");
+    consumer.send(event);
+    assertNotNull(messageBuffer);
+    messageBuffer.setLength(0);
+  }
+
+  @Test
+  public void checkInit() {
+    new ConcurrentLoggingConsumer("file.log");
+    new ConcurrentLoggingConsumer("file.log", 30);
+    new ConcurrentLoggingConsumer("file.log", "lock.name", 20);
+    new ConcurrentLoggingConsumer("file.log", "lock.name", 20, LogSplitMode.DAY);
+    assertTrue(true);
+  }
+
+  @Test
+  public void testInit01() throws InvalidArgumentException {
+    consumer = new ConcurrentLoggingConsumer("test.log");
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("test", "test");
+    properties.put("$project", "abc");
+    properties.put("$token", "123");
+    sa.track("123", true, "test", properties);
+  }
+
+  @Test
+  public void testInit02() throws InvalidArgumentException {
+    consumer = new ConcurrentLoggingConsumer("test.log", 100);
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("test", "test");
+    properties.put("$project", "abc");
+    properties.put("$token", "123");
+    sa.track("123", true, "test01", properties);
+    sa.track("123", true, "test01", properties);
+  }
+
+  @Test
+  public void testInit03() throws InvalidArgumentException {
+    consumer = new ConcurrentLoggingConsumer("test.log", "lock.log");
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("test", "test");
+    properties.put("$project", "abc");
+    properties.put("$token", "123");
+    sa.track("123", true, "test01", properties);
+    sa.track("123", true, "test01", properties);
+  }
+
+  @Test
+  public void testInit04() throws InvalidArgumentException {
+    consumer = new ConcurrentLoggingConsumer("test.log", "lock.log", 100);
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("test", "test");
+    properties.put("$project", "abc");
+    properties.put("$token", "123");
+    sa.track("123", true, "test01", properties);
+    sa.track("123", true, "test01", properties);
+  }
+
+  @Test
+  public void testInit05() throws InvalidArgumentException {
+    consumer = new ConcurrentLoggingConsumer("test.log", "lock.log", 100);
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("test", "test");
+    properties.put("$project", "abc");
+    properties.put("$token", "123");
+    sa.track("123", true, "test01", properties);
+    sa.track("123", true, "test01", properties);
+  }
+
+  @Test
+  public void testInit06() throws InvalidArgumentException {
+    consumer = new ConcurrentLoggingConsumer("test.log", "lock.log", 100, LogSplitMode.DAY);
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("test", "test");
+    properties.put("$project", "abc");
+    properties.put("$token", "123");
+    sa.track("123", true, "test01", properties);
+    sa.track("123", true, "test01", properties);
+  }
+
+  @Test
+  public void testInit07() throws InvalidArgumentException {
+    consumer = new ConcurrentLoggingConsumer("test.log", "lock.log", 100, LogSplitMode.HOUR);
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("test", "test");
+    properties.put("$project", "abc");
+    properties.put("$token", "123");
+    sa.track("123", true, "test01", properties);
+    sa.track("123", true, "test01", properties);
+  }
+}

SensorsAnalyticsSDK/src/main/test/java/com.sensorsdata.analytics.javasdk/BatchConsumerTest.java renamed to SensorsAnalyticsSDK/src/test/java/com.sensorsdata.analytics.javasdk/BatchConsumerTest.java

@@ -0,0 +1,33 @@
+package com.sensorsdata.analytics.javasdk;
+
+import com.sensorsdata.analytics.javasdk.bean.EventRecord;
+import com.sensorsdata.analytics.javasdk.consumer.DebugConsumer;
+import com.sensorsdata.analytics.javasdk.exceptions.InvalidArgumentException;
+
+import org.junit.Test;
+
+import java.util.Calendar;
+
+/**
+ * debugConsumer 单元测试
+ *
+ * @author fangzhuo
+ * @version 1.0.0
+ * @since 2022/01/18 18:55
+ */
+public class DebugConsumerTest extends SensorsBaseTest {
+
+  @Test
+  public void checkDataSend() throws InvalidArgumentException {
+    DebugConsumer consumer = new DebugConsumer("http://localhost:8888/sa", true);
+    SensorsAnalytics sa = new SensorsAnalytics(consumer);
+    EventRecord firstRecord = EventRecord.builder().setDistinctId("a123").isLoginId(Boolean.FALSE)
+        .setEventName("track")
+        .addProperty("$time", Calendar.getInstance().getTime())
+        .addProperty("Channel", "baidu")
+        .addProperty("$project", "abc")
+        .addProperty("$token", "123")
+        .build();
+    sa.track(firstRecord);
+  }
+}