Merge branch 'hotfix/field-rename' into 'master'

[TSG-23852] feat: adapt to field renaming See merge request galaxy/tsg_olap/sip-rtp-correlation!41
docs: update docs
2024-11-26 07:56:36 +00:00 · 2024-11-25 16:27:45 +08:00 · 2024-11-25 16:02:41 +08:00 · 2024-11-19 01:43:21 +00:00 · 2024-11-18 17:06:23 +08:00 · 2024-11-18 15:00:49 +08:00
16 changed files with 70160 additions and 418 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@

    <groupId>com.geedgenetworks.application</groupId>
    <artifactId>sip-rtp-correlation</artifactId>
-    <version>2.0-rc6</version>
+    <version>2.2.0</version>

    <name>Flink : SIP-RTP : Correlation</name>

@@ -19,7 +19,7 @@
        <scala.version>2.12.10</scala.version>
        <scala.binary.version>2.12</scala.binary.version>
        <flink.version>1.13.6</flink.version>
-        <easy.stream.version>1.3-rc1</easy.stream.version>
+        <easy.stream.version>1.3-rc2</easy.stream.version>
        <slf4j.version>1.7.32</slf4j.version>
        <log4j.version>2.17.1</log4j.version>
        <junit.version>5.8.0</junit.version>
@@ -62,8 +62,8 @@
        </dependency>

        <dependency>
-            <groupId>com.zdjizhi</groupId>
-            <artifactId>galaxy</artifactId>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
        </dependency>
        <dependency>
            <groupId>xyz.downgoon</groupId>
@@ -239,23 +239,9 @@

            <!--  Common  -->
            <dependency>
-                <groupId>com.zdjizhi</groupId>
-                <artifactId>galaxy</artifactId>
-                <version>1.1.3</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-lang3</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>5.8.32</version>
            </dependency>

            <!-- Easy Stream-->
@@ -588,7 +574,8 @@
                                <groupId>${project.groupId}</groupId>
                                <artifactId>easy-stream-common</artifactId>
                                <version>${project.version}</version>
-                                <remoteRepositories>${project.distributionManagement.repository.url}</remoteRepositories>
+                                <remoteRepositories>${project.distributionManagement.repository.url}
+                                </remoteRepositories>
                            </configuration>
                        </execution>
                    </executions>
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/VoipUDFFactory.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/VoipUDFFactory.java
@@ -20,7 +20,9 @@ public class VoipUDFFactory implements UDFFactory {
                put("HAS_EXTERNAL_IP_ADDRESS", new HasExternalIpAddress());

                put("STREAM_DIR", new StreamDir());
+                put("STREAM_DIR_SET", new StreamDirSet());
                put("FIND_NOT_BLANK", new FindNotBlank());
+                put("DISTINCT_CONCAT", new DistinctConcat());
                put("SORT_ADDRESS", new SortAddress());

                put("SNOWFLAKE_ID", new SnowflakeID());
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/DistinctConcat.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/DistinctConcat.java
@@ -0,0 +1,18 @@
+package com.geedgenetworks.flink.easy.application.voip.udf;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.flink.table.annotation.DataTypeHint;
+import org.apache.flink.table.functions.ScalarFunction;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class DistinctConcat extends ScalarFunction {
+
+    public @DataTypeHint("STRING") String eval(String s1, String s2) {
+        return Stream.of(s1, s2).filter(StringUtils::isNotBlank)
+                .map(StringUtils::trim)
+                .distinct()
+                .collect(Collectors.joining(","));
+    }
+}
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/HasIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/HasIpAddress.java
@@ -1,17 +1,17 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-public class HasIpAddress extends ScalarFunction {
+public class HasIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String... ipaddr) {
        if (null == ipaddr) {
            return false;
        }
        for (var ip : ipaddr) {
-            return ip != null && IPUtil.isIPAddress(ip);
+            if (ip != null && isIpAddress(ip)) {
+                return true;
+            }
        }
        return false;
    }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IpAddressScalarFunction.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IpAddressScalarFunction.java
@@ -0,0 +1,25 @@
+package com.geedgenetworks.flink.easy.application.voip.udf;
+
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.net.NetUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.flink.table.functions.ScalarFunction;
+
+public abstract class IpAddressScalarFunction extends ScalarFunction {
+
+    protected static boolean isIpAddress(String ipaddr) {
+        return isIpv4(ipaddr) || isIpv6(ipaddr);
+    }
+
+    protected static boolean isIpv4(String ipaddr) {
+        return Validator.isIpv4(StringUtils.trim(ipaddr));
+    }
+
+    protected static boolean isIpv6(String ipaddr) {
+        return Validator.isIpv6(StringUtils.trim(ipaddr));
+    }
+
+    protected static boolean isInternalIpAddress(String ipaddr) {
+        return NetUtil.isInnerIP(StringUtils.trim(ipaddr));
+    }
+}
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsExternalIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsExternalIpAddress.java
@@ -1,17 +1,13 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-import static com.zdjizhi.utils.IPUtil.isIPAddress;
-
-public class IsExternalIpAddress extends ScalarFunction {
+public class IsExternalIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String ipaddr) {
-        if (ipaddr == null || !isIPAddress(ipaddr)) {
+        if (ipaddr == null || !isIpAddress(ipaddr)) {
            return false;
        }
-        return !IPUtil.internalIp(ipaddr);
+        return !isInternalIpAddress(ipaddr);
    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsInternalIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsInternalIpAddress.java
@@ -1,17 +1,13 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-import static com.zdjizhi.utils.IPUtil.isIPAddress;
-
-public class IsInternalIpAddress extends ScalarFunction {
+public class IsInternalIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String ipaddr) {
-        if (!isIPAddress(ipaddr)) {
+        if (!isIpAddress(ipaddr)) {
            return false;
        }
-        return IPUtil.internalIp(ipaddr);
+        return isInternalIpAddress(ipaddr);
    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsIpAddress.java
@@ -1,15 +1,13 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-public class IsIpAddress extends ScalarFunction {
+public class IsIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String ipaddr) {
        if (null == ipaddr) {
            return false;
        }
-        return IPUtil.isIPAddress(ipaddr);
+        return isIpAddress(ipaddr);
    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/SortAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/SortAddress.java
@@ -1,12 +1,14 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.google.common.collect.Lists;
-import com.zdjizhi.utils.IPUtil;
+import cn.hutool.core.net.NetUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-public class SortAddress extends ScalarFunction {
+import java.util.ArrayList;
+import java.util.List;
+
+public class SortAddress extends IpAddressScalarFunction {

    public @DataTypeHint("STRING")
    String eval(
@@ -16,11 +18,14 @@ public class SortAddress extends ScalarFunction {

    public static String of(
            Tuple2<String, Integer> a1, Tuple2<String, Integer> a2) {
-        var list = Lists.newArrayList(a1, a2);
+        var list = new ArrayList<>(List.of(a1, a2));
+        if (a1.f1 == null || a2.f1 == null || StringUtils.isAnyEmpty(a1.f0, a2.f0)
+                || !isIpAddress(a1.f0) || !isIpAddress(a2.f0)) {
+            return a1.f0 + ":" + a1.f1 + "," + a2.f0 + ":" + a2.f1;
+        }
        list.sort((a, b) -> {
            if (a.f1.equals(b.f1)) {
-                return Long.compare(
-                        IPUtil.getIpDesimal(a.f0), IPUtil.getIpDesimal(b.f0));
+                return compareAddress(a.f0, b.f0);
            } else {
                return a.f1.compareTo(b.f1);
            }
@@ -28,4 +33,16 @@ public class SortAddress extends ScalarFunction {
        return String.format("%s:%s,%s:%s",
                list.get(0).f0, list.get(0).f1, list.get(1).f0, list.get(1).f1);
    }
+
+    private static int compareAddress(String ip1, String ip2) {
+        try {
+            var v1 = isIpv4(ip1) ? NetUtil.ipv4ToLong(ip1) :
+                    NetUtil.ipv6ToBigInteger(ip1).longValue();
+            var v2 = isIpv4(ip2) ? NetUtil.ipv4ToLong(ip2) :
+                    NetUtil.ipv6ToBigInteger(ip2).longValue();
+            return Long.compare(v1, v2);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDir.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDir.java
@@ -18,9 +18,4 @@ public class StreamDir extends ScalarFunction {
        }
        return v;
    }
-
-    public static void main(String[] args) {
-        System.out.println(8192L + 16384L);
-        System.out.println(new StreamDir().eval(8192L + 16384L));
-    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDirSet.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDirSet.java
@@ -0,0 +1,22 @@
+package com.geedgenetworks.flink.easy.application.voip.udf;
+
+import org.apache.flink.table.annotation.DataTypeHint;
+import org.apache.flink.table.functions.ScalarFunction;
+
+public class StreamDirSet extends ScalarFunction {
+
+    public @DataTypeHint("BIGINT") Long eval(Long flags) {
+        if (flags == null) {
+            return 8192 + 16384L;
+        }
+        long r = 0;
+        if ((flags & 8192) == 0) {
+            r += 8192;
+        }
+        if ((flags & 16384) == 0) {
+            r += 16384;
+        }
+        return r;
+    }
+
+}
--- a/src/main/resources/jobs/job.yml
+++ b/src/main/resources/jobs/job.yml
--- a/src/site/markdown/download.md
+++ b/src/site/markdown/download.md
@@ -2,11 +2,65 @@

 ### ${project.version}

+- [TSG-23852](https://jira.geedge.net/browse/TSG-23852) 适配 VoIP Records 以及 Session Records 中 Client/Server 字段重命名。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| ${easy.stream.version}         | [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
+
+### 2.1.1
+
+- 当 VoIP 融合成功时，RTP 将不再输出；同时如果 SIP 关联成功过 RTP 也将不再输出。
+- VpIP 中的字节数，包数使用 RTP 侧的数据指标，不再累加计算。
+- 将 SIP 五元组，RTP 四元组中所有带有空值的数据判定为异常数据不再参与关联过程。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc2         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1.1/sip-rtp-correlation-2.1.1.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1.1/sip-rtp-correlation-2.1.1.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1.1/sip-rtp-correlation-2.1.1.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1.1/sip-rtp-correlation-2.1.1.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1.1/sip-rtp-correlation-2.1.1.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1.1/sip-rtp-correlation-2.1.1.tar.gz.sha1) ) |
+
+### 2.1
+
+- [TSG-23174](https://jira.geedge.net/browse/TSG-23174) 测试完成，升级为稳定版本。
+- 重复数据不再进行去重操作，未关联的全部输出。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc2         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1/sip-rtp-correlation-2.1.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1/sip-rtp-correlation-2.1.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1/sip-rtp-correlation-2.1.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1/sip-rtp-correlation-2.1.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1/sip-rtp-correlation-2.1.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.1/sip-rtp-correlation-2.1.tar.gz.sha1) ) |
+
+### 2.0-rc9
+
+- 修复 sip 双向关联模块的数据丢失问题。
+- [GAL-684](https://jira.geedge.net/browse/GAL-684) 调整融合后的字段映射，增加更加详细的监控指标。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1         | [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc9/${project.artifactId}-2.0-rc9.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc9/${project.artifactId}-2.0-rc9.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc9/${project.artifactId}-2.0-rc9.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc9/${project.artifactId}-2.0-rc9.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc9/${project.artifactId}-2.0-rc9.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc9/${project.artifactId}-2.0-rc9.tar.gz.sha1) ) |
+
+### 2.0-rc8
+
+- 修复 Extract Key 错误，由于 IpAddress 类型数据校验导致的空指针异常。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.tar.gz.sha1) ) |
+
+
+### 2.0-rc7
+
+- VoIP Record 增加字段: SIP `sip_bye_reason` 相关字段。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.tar.gz.sha1) ) |
+
+
+### 2.0-rc6
+
 - VoIP Record 增加字段: SIP， RTP `protocol` 相关字段。

 | Easy Stream | UDF Jar                                                      | Job                                                          |
 |-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| ${easy.stream.version}         | [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
+| 1.3-rc1         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz.sha1) ) |

 ### 2.0-rc5

--- a/src/test/bin/flink-per-job.sh
+++ b/src/test/bin/flink-per-job.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+flink run -t yarn-per-job -Djobmanager.memory.process.size=1024m -Dtaskmanager.memory.process.size=4G -Dtaskmanager.numberOfTaskSlots=1 -Dtaskmanager.memory.framework.off-heap.size=256m -Dtaskmanager.memory.jvm-metaspace.size=256m -Dtaskmanager.memory.network.max=256m -Dyarn.application.name=voip-fusion -Drest.flamegraph.enabled=true -p 1 -d -c com.geedgenetworks.flink.easy.core.Runner /home/tsg/olap/flink/topology/sip-rtp-correlation/sip-rtp-correlation-2.1.jar /home/tsg/olap/flink/topology/sip-rtp-correlation/job.yml
--- a/src/test/resources/data/M22-VOIP-RECORD.json
+++ b/src/test/resources/data/M22-VOIP-RECORD.json
--- a/tools/maven/spotbugs-exclude.xml
+++ b/tools/maven/spotbugs-exclude.xml
@@ -6,6 +6,9 @@
    <Match>
        <Bug pattern="EI_EXPOSE_REP2"/>
    </Match>
+    <Match>
+        <Bug pattern="REC_CATCH_EXCEPTION"/>
+    </Match>
    <Match>
        <Bug pattern="SE_NO_SERIALVERSIONID"/>
    </Match>
Author	SHA1	Message	Date
梁超	dfc8718da2	Merge branch 'hotfix/field-rename' into 'master' [TSG-23852] feat: adapt to field renaming See merge request galaxy/tsg_olap/sip-rtp-correlation!41	2024-11-26 07:56:36 +00:00
chaochaoc	fc98fa1d64	docs: update docs	2024-11-25 16:27:45 +08:00
chaochaoc	4992cb1899	[TSG-23852] feat: adapt to field renaming	2024-11-25 16:02:41 +08:00
梁超	39338f7955	Merge branch 'hotfix/duplicate-data' into 'master' hotfix: delete duplicate data See merge request galaxy/tsg_olap/sip-rtp-correlation!40	2024-11-19 01:43:21 +00:00
chaochaoc	62515f5dff	docs: update docs	2024-11-18 17:06:23 +08:00
chaochaoc	2735b8e93e	[TSG-23814] fix: fix some bugs	2024-11-18 15:00:49 +08:00
梁超	c7fe7ca1cd	Merge branch 'hotfix/duplicate-data' into 'master' hotfix: handle duplicate data See merge request galaxy/tsg_olap/sip-rtp-correlation!39	2024-11-18 03:04:24 +00:00
chaochaoc	557c6f23eb	test: add test dataset	2024-11-16 17:17:33 +08:00
chaochaoc	7838493fff	fix: remove duplicate sip and rtp	2024-11-16 17:16:47 +08:00
chaochaoc	170f495a11	fix: remove duplicate sip and rtp	2024-11-16 16:07:06 +08:00
梁超	b3b233172f	docs: update docs	2024-11-05 02:36:08 +00:00
梁超	c02a87beee	Merge branch 'hotfix/update-versions' into 'master' feat: update default conf See merge request galaxy/tsg_olap/sip-rtp-correlation!38	2024-11-05 02:30:25 +00:00
chaochaoc	8490d955f0	feat: update default conf	2024-11-05 10:28:54 +08:00
梁超	0d375e89d0	Merge branch 'hotfix/update-versions' into 'master' chore: update versions See merge request galaxy/tsg_olap/sip-rtp-correlation!37	2024-11-05 02:24:10 +00:00
chaochaoc	b73382262c	chore: update versions	2024-11-05 10:21:16 +08:00
梁超	5b5de41632	Merge branch 'bugfix/eval-error' into 'master' feat: add job without distinct See merge request galaxy/tsg_olap/sip-rtp-correlation!36	2024-10-31 04:25:07 +00:00
chaochaoc	33a42066cf	feat: add job without distinct	2024-10-31 12:21:57 +08:00
梁超	a9c1d40fdc	Merge branch 'bugfix/eval-error' into 'master' [GAL-684] fix some bugs and update field mapping values See merge request galaxy/tsg_olap/sip-rtp-correlation!35	2024-10-31 02:33:28 +00:00
chaochaoc	ff5aa245bb	chore: update easystream version and docs	2024-10-31 09:50:43 +08:00
chaochaoc	45dafb9dbe	[GAL-684] fix some bugs and update field mapping values	2024-10-30 18:39:38 +08:00
梁超	2954275dd3	Merge branch 'bugfix/eval-error' into 'master' [TSG-22767] fix: fix function exception See merge request galaxy/tsg_olap/sip-rtp-correlation!34	2024-10-21 06:43:13 +00:00
chaochaoc	728e3407e8	fix: init value	2024-10-21 14:41:43 +08:00
chaochaoc	16d71addda	[TSG-22767] fix: fix function exception	2024-10-21 14:37:26 +08:00
梁超	4ef6c25e69	Merge branch 'bugfix/addsipfield' into 'master' bugfix: add sip field "sip_bye_reason" See merge request galaxy/tsg_olap/sip-rtp-correlation!33	2024-08-21 07:46:09 +00:00
wangshuo	2d5f20362b	bugfix: add sip field "sip_bye_reason"	2024-08-21 15:42:46 +08:00
wangshuo	515a0ab312	bugfix: add sip field "sip_bye_reason"	2024-08-21 15:29:27 +08:00
wangshuo	9d0085a57c	bugfix: add sip field "sip_bye_reason"	2024-08-21 14:24:17 +08:00