Re: [PR] [INLONG-10152][Sort] Refactor MetricOption code structure. [inlong]

2024-05-09 Thread via GitHub


EMsnap commented on code in PR #10156:
URL: https://github.com/apache/inlong/pull/10156#discussion_r1595063675


##
inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java:
##
@@ -57,62 +58,38 @@ public class MetricOption implements Serializable {
 private List inlongAuditKeys;
 
 private MetricOption(
-String inlongLabels,
+Map labels,
 @Nullable String inlongAudit,
 RegisteredMetric registeredMetric,
 long initRecords,
 long initBytes,
 Long initDirtyRecords,
 Long initDirtyBytes,
 Long readPhase,
-String inlongAuditKeys) {
-
Preconditions.checkArgument(!StringUtils.isNullOrWhitespaceOnly(inlongLabels),
-"Inlong labels must be set for register metric.");
-
+List inlongAuditKeys,
+Set ipPortSet) {
 this.initRecords = initRecords;
 this.initBytes = initBytes;
 this.initDirtyRecords = initDirtyRecords;
 this.initDirtyBytes = initDirtyBytes;
 this.readPhase = readPhase;
-this.labels = new LinkedHashMap<>();
-String[] inLongLabelArray = inlongLabels.split(DELIMITER);
-Preconditions.checkArgument(Stream.of(inLongLabelArray).allMatch(label 
-> label.contains("=")),
-"InLong metric label format must be xxx=xxx");
-Stream.of(inLongLabelArray).forEach(label -> {
-String key = label.substring(0, label.indexOf('='));
-String value = label.substring(label.indexOf('=') + 1);
-labels.put(key, value);
-});
-
+this.labels = labels;
 this.ipPorts = inlongAudit;
-
-if (ipPorts != null) {
-
-Preconditions.checkArgument(labels.containsKey(GROUP_ID) && 
labels.containsKey(STREAM_ID),
-"groupId and streamId must be set when enable inlong audit 
collect.");
-
-if (inlongAuditKeys == null) {
-LOG.warn("should set inlongAuditKeys when enable inlong audit 
collect, "
-+ "fallback to use id {} as audit key", 
AUDIT_SORT_INPUT);
-inlongAuditKeys = AUDIT_SORT_INPUT;
-}
-
-this.inlongAuditKeys = 
AuditUtils.extractAuditKeys(inlongAuditKeys);
-this.ipPortList = AuditUtils.extractAuditIpPorts(ipPorts);
-
-}
-
-if (registeredMetric != null) {
-this.registeredMetric = registeredMetric;
-}
+this.inlongAuditKeys = inlongAuditKeys;
+this.ipPortSet = ipPortSet;
+this.registeredMetric = registeredMetric;
 }
 
 public Map getLabels() {
 return labels;
 }
 
-public HashSet getIpPortList() {
-return ipPortList;
+public Set getIpPortSet() {

Review Comment:
   method is never used 



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] [INLONG-10152][Sort] Refactor MetricOption code structure. [inlong]

2024-05-09 Thread via GitHub


EMsnap commented on code in PR #10156:
URL: https://github.com/apache/inlong/pull/10156#discussion_r1595069109


##
inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java:
##
@@ -57,62 +58,38 @@ public class MetricOption implements Serializable {
 private List inlongAuditKeys;
 
 private MetricOption(
-String inlongLabels,
+Map labels,
 @Nullable String inlongAudit,
 RegisteredMetric registeredMetric,
 long initRecords,
 long initBytes,
 Long initDirtyRecords,
 Long initDirtyBytes,
 Long readPhase,
-String inlongAuditKeys) {
-
Preconditions.checkArgument(!StringUtils.isNullOrWhitespaceOnly(inlongLabels),
-"Inlong labels must be set for register metric.");
-
+List inlongAuditKeys,
+Set ipPortSet) {
 this.initRecords = initRecords;
 this.initBytes = initBytes;
 this.initDirtyRecords = initDirtyRecords;
 this.initDirtyBytes = initDirtyBytes;
 this.readPhase = readPhase;
-this.labels = new LinkedHashMap<>();
-String[] inLongLabelArray = inlongLabels.split(DELIMITER);
-Preconditions.checkArgument(Stream.of(inLongLabelArray).allMatch(label 
-> label.contains("=")),
-"InLong metric label format must be xxx=xxx");
-Stream.of(inLongLabelArray).forEach(label -> {
-String key = label.substring(0, label.indexOf('='));
-String value = label.substring(label.indexOf('=') + 1);
-labels.put(key, value);
-});
-
+this.labels = labels;
 this.ipPorts = inlongAudit;
-
-if (ipPorts != null) {
-
-Preconditions.checkArgument(labels.containsKey(GROUP_ID) && 
labels.containsKey(STREAM_ID),
-"groupId and streamId must be set when enable inlong audit 
collect.");
-
-if (inlongAuditKeys == null) {
-LOG.warn("should set inlongAuditKeys when enable inlong audit 
collect, "
-+ "fallback to use id {} as audit key", 
AUDIT_SORT_INPUT);
-inlongAuditKeys = AUDIT_SORT_INPUT;
-}
-
-this.inlongAuditKeys = 
AuditUtils.extractAuditKeys(inlongAuditKeys);
-this.ipPortList = AuditUtils.extractAuditIpPorts(ipPorts);
-
-}
-
-if (registeredMetric != null) {
-this.registeredMetric = registeredMetric;
-}
+this.inlongAuditKeys = inlongAuditKeys;
+this.ipPortSet = ipPortSet;
+this.registeredMetric = registeredMetric;
 }
 
 public Map getLabels() {
 return labels;
 }
 
-public HashSet getIpPortList() {
-return ipPortList;
+public Set getIpPortSet() {
+return ipPortSet;
+}
+
+public HashSet getIpPortSetAsHashSet() {

Review Comment:
   getIpPorts() is enough for method name



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] [INLONG-10152][Sort] Refactor MetricOption code structure. [inlong]

2024-05-09 Thread via GitHub


XiaoYou201 commented on code in PR #10156:
URL: https://github.com/apache/inlong/pull/10156#discussion_r1595078185


##
inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java:
##
@@ -57,62 +58,38 @@ public class MetricOption implements Serializable {
 private List inlongAuditKeys;
 
 private MetricOption(
-String inlongLabels,
+Map labels,
 @Nullable String inlongAudit,
 RegisteredMetric registeredMetric,
 long initRecords,
 long initBytes,
 Long initDirtyRecords,
 Long initDirtyBytes,
 Long readPhase,
-String inlongAuditKeys) {
-
Preconditions.checkArgument(!StringUtils.isNullOrWhitespaceOnly(inlongLabels),
-"Inlong labels must be set for register metric.");
-
+List inlongAuditKeys,
+Set ipPortSet) {
 this.initRecords = initRecords;
 this.initBytes = initBytes;
 this.initDirtyRecords = initDirtyRecords;
 this.initDirtyBytes = initDirtyBytes;
 this.readPhase = readPhase;
-this.labels = new LinkedHashMap<>();
-String[] inLongLabelArray = inlongLabels.split(DELIMITER);
-Preconditions.checkArgument(Stream.of(inLongLabelArray).allMatch(label 
-> label.contains("=")),
-"InLong metric label format must be xxx=xxx");
-Stream.of(inLongLabelArray).forEach(label -> {
-String key = label.substring(0, label.indexOf('='));
-String value = label.substring(label.indexOf('=') + 1);
-labels.put(key, value);
-});
-
+this.labels = labels;
 this.ipPorts = inlongAudit;
-
-if (ipPorts != null) {
-
-Preconditions.checkArgument(labels.containsKey(GROUP_ID) && 
labels.containsKey(STREAM_ID),
-"groupId and streamId must be set when enable inlong audit 
collect.");
-
-if (inlongAuditKeys == null) {
-LOG.warn("should set inlongAuditKeys when enable inlong audit 
collect, "
-+ "fallback to use id {} as audit key", 
AUDIT_SORT_INPUT);
-inlongAuditKeys = AUDIT_SORT_INPUT;
-}
-
-this.inlongAuditKeys = 
AuditUtils.extractAuditKeys(inlongAuditKeys);
-this.ipPortList = AuditUtils.extractAuditIpPorts(ipPorts);
-
-}
-
-if (registeredMetric != null) {
-this.registeredMetric = registeredMetric;
-}
+this.inlongAuditKeys = inlongAuditKeys;
+this.ipPortSet = ipPortSet;
+this.registeredMetric = registeredMetric;
 }
 
 public Map getLabels() {
 return labels;
 }
 
-public HashSet getIpPortList() {
-return ipPortList;
+public Set getIpPortSet() {

Review Comment:
   This method was originally provided for the Audit module, but the Audit 
module uses HashSet, and this method returns Set, so a getIpPortSetAsHashSet 
method was added to be compatible with Audit.
   
![企业微信截图_4bb0f4fd-016f-4228-9231-f8a1cffa1825](https://github.com/apache/inlong/assets/58425449/ac1e93c2-0b2d-4d53-aafe-b55a2cebd3de)
   



##
inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java:
##
@@ -57,62 +58,38 @@ public class MetricOption implements Serializable {
 private List inlongAuditKeys;
 
 private MetricOption(
-String inlongLabels,
+Map labels,
 @Nullable String inlongAudit,
 RegisteredMetric registeredMetric,
 long initRecords,
 long initBytes,
 Long initDirtyRecords,
 Long initDirtyBytes,
 Long readPhase,
-String inlongAuditKeys) {
-
Preconditions.checkArgument(!StringUtils.isNullOrWhitespaceOnly(inlongLabels),
-"Inlong labels must be set for register metric.");
-
+List inlongAuditKeys,
+Set ipPortSet) {
 this.initRecords = initRecords;
 this.initBytes = initBytes;
 this.initDirtyRecords = initDirtyRecords;
 this.initDirtyBytes = initDirtyBytes;
 this.readPhase = readPhase;
-this.labels = new LinkedHashMap<>();
-String[] inLongLabelArray = inlongLabels.split(DELIMITER);
-Preconditions.checkArgument(Stream.of(inLongLabelArray).allMatch(label 
-> label.contains("=")),
-"InLong metric label format must be xxx=xxx");
-Stream.of(inLongLabelArray).forEach(label -> {
-String key = label.substring(0, label.indexOf('='));
-String value = label.substring(label.indexOf('=') + 1);
-labels.put(key, value);
-});
-
+this.labels = labels;
 this.ipPorts = inlongAudit;
-
-if (ipPorts != null) {
-
-Preconditions.checkArgument(labels.containsKey(GROUP_ID) && 
labels.containsKey(STREAM_ID)

Re: [I] [Bug][[Manager] Data type 'doris' not support [inlong]

2024-05-09 Thread via GitHub


haifxu commented on issue #10076:
URL: https://github.com/apache/inlong/issues/10076#issuecomment-2102138730

   Test connections are temporarily not supported here, but it does not affect 
saving and using the `Doris` data nodes.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[PR] [INLONG-10162][DataProxy] Upgrade golang.org/x/net to version 0.23.0. [inlong]

2024-05-09 Thread via GitHub


XiaoYou201 opened a new pull request, #10163:
URL: https://github.com/apache/inlong/pull/10163

   ### Prepare a Pull Request
   
   - [INLONG-10162][DataProxy] Upgrade golang.org/x/net to version 0.23.0
   
   - Fixes #10162 
   
   ### Motivation
   
   An attacker may cause an HTTP/2 endpoint to read arbitrary amounts of header 
data by sending an excessive number of CONTINUATION frames. Maintaining HPACK 
state requires parsing and processing all HEADERS and CONTINUATION frames on a 
connection. When a request's headers exceed MaxHeaderBytes, no memory is 
allocated to store the excess headers, but they are still parsed. This permits 
an attacker to cause an HTTP/2 endpoint to read arbitrary amounts of header 
data, all associated with a request which is going to be rejected. These 
headers can include Huffman-encoded data which is significantly more expensive 
for the receiver to decode than for an attacker to send. The fix sets a limit 
on the amount of excess header frames we will process before closing a 
connection.
   
CVE-2023-45288
   
   ### Modifications
   
   golang.org/x/net is bumped to v0.23.0 to address CVE-2023-45288
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [I] [Improve][CVE] net/http, x/net/http2: close connections when receiving too many headers [inlong]

2024-05-09 Thread via GitHub


XiaoYou201 commented on issue #10162:
URL: https://github.com/apache/inlong/issues/10162#issuecomment-2102265481

   I submit a pr #10163, PTAL, thx~


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] [INLONG-10162][DataProxy] Upgrade golang.org/x/net to version 0.23.0. [inlong]

2024-05-09 Thread via GitHub


gunli commented on PR #10163:
URL: https://github.com/apache/inlong/pull/10163#issuecomment-2102320533

   Well done, thanks!


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



(inlong) branch master updated: [INLONG-10152][Sort] Refactor MetricOption code structure. (#10156)

2024-05-09 Thread dockerzhang
This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
 new 011e96ba95 [INLONG-10152][Sort] Refactor MetricOption code structure. 
(#10156)
011e96ba95 is described below

commit 011e96ba95a777b52183bbf6124df8f3578f530b
Author: XiaoYou201 <58425449+xiaoyou...@users.noreply.github.com>
AuthorDate: Thu May 9 18:18:49 2024 +0800

[INLONG-10152][Sort] Refactor MetricOption code structure. (#10156)

Co-authored-by: vinnerzhang 
---
 .../inlong/sort/base/metric/MetricOption.java  | 87 --
 .../inlong/sort/base/metric/SinkMetricData.java|  2 +-
 .../inlong/sort/base/metric/SourceMetricData.java  |  4 +-
 3 files changed, 49 insertions(+), 44 deletions(-)

diff --git 
a/inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java
 
b/inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java
index a649c963ba..eb01d9f165 100644
--- 
a/inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java
+++ 
b/inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java
@@ -32,6 +32,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import static org.apache.inlong.sort.base.Constants.AUDIT_SORT_INPUT;
@@ -46,7 +47,7 @@ public class MetricOption implements Serializable {
 private static final long serialVersionUID = 1L;
 
 private Map labels;
-private HashSet ipPortList;
+private Set ipPortSet;
 private String ipPorts;
 private RegisteredMetric registeredMetric;
 private long initRecords;
@@ -57,7 +58,7 @@ public class MetricOption implements Serializable {
 private List inlongAuditKeys;
 
 private MetricOption(
-String inlongLabels,
+Map labels,
 @Nullable String inlongAudit,
 RegisteredMetric registeredMetric,
 long initRecords,
@@ -65,54 +66,26 @@ public class MetricOption implements Serializable {
 Long initDirtyRecords,
 Long initDirtyBytes,
 Long readPhase,
-String inlongAuditKeys) {
-
Preconditions.checkArgument(!StringUtils.isNullOrWhitespaceOnly(inlongLabels),
-"Inlong labels must be set for register metric.");
-
+List inlongAuditKeys,
+Set ipPortSet) {
 this.initRecords = initRecords;
 this.initBytes = initBytes;
 this.initDirtyRecords = initDirtyRecords;
 this.initDirtyBytes = initDirtyBytes;
 this.readPhase = readPhase;
-this.labels = new LinkedHashMap<>();
-String[] inLongLabelArray = inlongLabels.split(DELIMITER);
-Preconditions.checkArgument(Stream.of(inLongLabelArray).allMatch(label 
-> label.contains("=")),
-"InLong metric label format must be xxx=xxx");
-Stream.of(inLongLabelArray).forEach(label -> {
-String key = label.substring(0, label.indexOf('='));
-String value = label.substring(label.indexOf('=') + 1);
-labels.put(key, value);
-});
-
+this.labels = labels;
 this.ipPorts = inlongAudit;
-
-if (ipPorts != null) {
-
-Preconditions.checkArgument(labels.containsKey(GROUP_ID) && 
labels.containsKey(STREAM_ID),
-"groupId and streamId must be set when enable inlong audit 
collect.");
-
-if (inlongAuditKeys == null) {
-LOG.warn("should set inlongAuditKeys when enable inlong audit 
collect, "
-+ "fallback to use id {} as audit key", 
AUDIT_SORT_INPUT);
-inlongAuditKeys = AUDIT_SORT_INPUT;
-}
-
-this.inlongAuditKeys = 
AuditUtils.extractAuditKeys(inlongAuditKeys);
-this.ipPortList = AuditUtils.extractAuditIpPorts(ipPorts);
-
-}
-
-if (registeredMetric != null) {
-this.registeredMetric = registeredMetric;
-}
+this.inlongAuditKeys = inlongAuditKeys;
+this.ipPortSet = ipPortSet;
+this.registeredMetric = registeredMetric;
 }
 
 public Map getLabels() {
 return labels;
 }
 
-public HashSet getIpPortList() {
-return ipPortList;
+public HashSet getIpPortSet() {
+return new HashSet<>(ipPortSet);
 }
 
 public Optional getIpPorts() {
@@ -238,11 +211,43 @@ public class MetricOption implements Serializable {
 }
 
 public MetricOption build() {
-if (inlongLabels == null && inlongAudit == null) {
+if (inlongAudit == null && inlongLabels == null) {
+LOG.warn("The property 'metrics.audit.proxy.hosts and 
i

Re: [PR] [INLONG-10152][Sort] Refactor MetricOption code structure. [inlong]

2024-05-09 Thread via GitHub


dockerzhang merged PR #10156:
URL: https://github.com/apache/inlong/pull/10156


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[I] [Improve][Doc] Update agent overview [inlong-website]

2024-05-09 Thread via GitHub


justinwwhuang opened a new issue, #951:
URL: https://github.com/apache/inlong-website/issues/951

   ### Description
   
   The agent has undergone refactoring and needs to be updated with the 
introduction document
   
   ### Are you willing to submit PR?
   
   - [X] Yes, I am willing to submit a PR!
   
   ### Code of Conduct
   
   - [X] I agree to follow this project's [Code of 
Conduct](https://www.apache.org/foundation/policies/conduct)
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] [INLONG-10162][DataProxy] Upgrade golang.org/x/net to version 0.23.0. [inlong]

2024-05-09 Thread via GitHub


EMsnap merged PR #10163:
URL: https://github.com/apache/inlong/pull/10163


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



(inlong) branch master updated: [INLONG-10162][DataProxy] Upgrade golang.org/x/net to version 0.23.0. (#10163)

2024-05-09 Thread zirui
This is an automated email from the ASF dual-hosted git repository.

zirui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
 new 0fd55f85b5 [INLONG-10162][DataProxy] Upgrade golang.org/x/net to 
version 0.23.0. (#10163)
0fd55f85b5 is described below

commit 0fd55f85b53525ea3744551f7ff398f53b1d34cf
Author: XiaoYou201 <58425449+xiaoyou...@users.noreply.github.com>
AuthorDate: Thu May 9 19:20:43 2024 +0800

[INLONG-10162][DataProxy] Upgrade golang.org/x/net to version 0.23.0. 
(#10163)
---
 inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod | 2 +-
 inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod 
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod
index 6d63ebc75b..bf49c18172 100755
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod
@@ -37,7 +37,7 @@ require (
github.com/prometheus/procfs v0.12.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
-   golang.org/x/net v0.20.0 // indirect
+   golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.16.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum 
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum
index d88998ee30..5ef08edd91 100755
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum
@@ -71,6 +71,7 @@ golang.org/x/net v0.17.0 
h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod 
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod 
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=



[PR] [INLONG-951][Doc] Update agent overview [inlong-website]

2024-05-09 Thread via GitHub


justinwwhuang opened a new pull request, #952:
URL: https://github.com/apache/inlong-website/pull/952

   Fixes #951 
   
   ### Motivation
   
   The agent has undergone refactoring and needs to update the relevant 
documents
   
   ### Modifications
   
   Update document
   
   ### Verifying this change
   
   - [ ] Make sure that the change passes the CI checks.
   
   *(Please pick either of the following options)*
   
   - [ ] This change is a trivial rework/code cleanup without any test coverage.
   
   - [ ] This change is already covered by existing tests, such as:
 *(please describe tests)*
   
   - [ ] This change added tests and can be verified as follows:
   
 *(example:)*
   - *Added integration tests for end-to-end deployment with large payloads 
(10MB)*
   - *Extended integration test for recovery after broker failure*
   
   ### Documentation
   
   No doc needed
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[PR] [INLONG-10161][DataProxy] upgrade protobuf version [inlong]

2024-05-09 Thread via GitHub


nicklaus-dev opened a new pull request, #10165:
URL: https://github.com/apache/inlong/pull/10165

   
   
   
   
   Fixes #10161 
   
   ### Motivation
   
   
   Upgrade google.golang.org/protobuf to fix severity issues
   
   ### Modifications
   
   
   1. Upgrade google.golang.org/protobuf v1.32.0 to v1.34.1
   2. Execute `go mod tidy` cmd to clear useless dependencies


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[PR] [INLONG-10160][Sort] Upgrade elasticsearch version 7.9.2 to 7.17.13 [inlong]

2024-05-09 Thread via GitHub


nicklaus-dev opened a new pull request, #10166:
URL: https://github.com/apache/inlong/pull/10166

   
   
   
   
   Fixes #10160 
   
   ### Motivation
   
   
   Dependency maven:org.elasticsearch:elasticsearch:7.9.2 is vulnerable
   
   ### Modifications
   
   
   Upgrade elasticsearch version 7.9.2 to 7.17.13


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] [INLONG-10161][DataProxy] Upgrade google.golang.org/protobuf v1.32.0 to v1.34.1 [inlong]

2024-05-09 Thread via GitHub


dockerzhang merged PR #10165:
URL: https://github.com/apache/inlong/pull/10165


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



(inlong) branch master updated: [INLONG-10161][DataProxy] Upgrade google.golang.org/protobuf v1.32.0 to v1.34.1 (#10165)

2024-05-09 Thread dockerzhang
This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
 new d34dcc0bc6 [INLONG-10161][DataProxy] Upgrade 
google.golang.org/protobuf v1.32.0 to v1.34.1 (#10165)
d34dcc0bc6 is described below

commit d34dcc0bc605710867238951d5c3446ea3b8695f
Author: nicklaus-dev <118952483+nicklaus-...@users.noreply.github.com>
AuthorDate: Fri May 10 09:32:36 2024 +0800

[INLONG-10161][DataProxy] Upgrade google.golang.org/protobuf v1.32.0 to 
v1.34.1 (#10165)
---
 .../dataproxy-sdk-golang/go.mod|  5 ++--
 .../dataproxy-sdk-golang/go.sum| 33 --
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod 
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod
index bf49c18172..96ac6e6053 100755
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.mod
@@ -31,7 +31,6 @@ require (
 require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
-   github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
@@ -39,8 +38,8 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.6.0 // indirect
-   golang.org/x/sys v0.16.0 // indirect
-   google.golang.org/protobuf v1.32.0 // indirect
+   golang.org/x/sys v0.18.0 // indirect
+   google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )
 
diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum 
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum
index 5ef08edd91..f4eb64ea3a 100755
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/go.sum
@@ -6,38 +6,24 @@ github.com/cespare/xxhash/v2 v2.2.0 
h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj
 github.com/cespare/xxhash/v2 v2.2.0/go.mod 
h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/davecgh/go-spew v1.1.0/go.mod 
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/go-resty/resty/v2 v2.10.0 
h1:Qla4W/+TMmv0fOeeRqzEpXPLfTUnR5HZ1+lGs+CkiCo=
-github.com/go-resty/resty/v2 v2.10.0/go.mod 
h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/go-resty/resty/v2 v2.11.0 
h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
 github.com/go-resty/resty/v2 v2.11.0/go.mod 
h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/gofrs/uuid v4.4.0+incompatible 
h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
 github.com/gofrs/uuid v4.4.0+incompatible/go.mod 
h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/golang/protobuf v1.5.0/go.mod 
h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5/go.mod 
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/klauspost/compress v1.17.2 
h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
-github.com/klauspost/compress v1.17.2/go.mod 
h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/compress v1.17.5 
h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E=
 github.com/klauspost/compress v1.17.5/go.mod 
h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 
h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod 
h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c 
h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod 
h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 github.com/panjf2000/ants/v2 v2.8.2 
h1:D1wfANttg8uXhC9149gRt1PDQ+dLVFjNXkCEycMcvQQ=
-github.com/panjf2000/gnet/v2 v2.3.3 
h1:VZ0kBj75qWuuZEy819SJn4EZDO6+XLRwejHklFuRMgM=
-github.com/panjf2000/gnet/v2 v2.3.3/go.mod 
h1:SNbgqxd7Umz+V9xhokLduzmkH+ZusfDQWABHnnoWcgk=
 github.com/panjf2000/gnet/v2 v2.3.4 
h1:+ASHt+Wxr0KIzlk5FsLBbegCc4US7iVCdZ1QbUyw17g=
 github.com/panjf2000/gnet/v2 v2.3.4/go.mod 
h1:0mTLWq4zMEXyQ35BY094dNWYnXfIdDg0mOlmZJflaXE=
 github.com/pmezard/go-difflib v1.0.0 
h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod 
h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.17.0 
h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=

Re: [PR] [INLONG-10160][Sort] Upgrade elasticsearch version 7.9.2 to 7.17.13 [inlong]

2024-05-09 Thread via GitHub


dockerzhang commented on PR #10166:
URL: https://github.com/apache/inlong/pull/10166#issuecomment-2103692837

   please update the version in the license files.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [I] [Improve][CVE] Golang protojson.Unmarshal function infinite loop when unmarshaling certain forms of invalid JSON [inlong]

2024-05-09 Thread via GitHub


github-actions[bot] commented on issue #10167:
URL: https://github.com/apache/inlong/issues/10167#issuecomment-2103778951

   Hello @nicklaus-dev, thank you for opening your first issue in InLong 🧡 We 
will respond as soon as possible ⏳
   If this is a bug report, please provide screenshots or error logs for us to 
reproduce your issue, so we can do our best to fix it.
   If you have any questions in the meantime, you can also ask us on the 
[InLong Discussions](https://github.com/apache/inlong/discussions) 🔍


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[PR] [INLONG-10167][TubeMQ] Upgrade google.golang.org/protobuf v1.23.0 to v1.34.1 [inlong]

2024-05-09 Thread via GitHub


nicklaus-dev opened a new pull request, #10168:
URL: https://github.com/apache/inlong/pull/10168

   
   
   
   
   Fixes #10167 
   
   ### Motivation
   
   
   Upgrade google.golang.org/protobuf to fix severity issues
   
   ### Modifications
   
   
   1. Upgrade google.golang.org/protobuf v1.32.0 to v1.34.1
   2. Execute `go mod tidy` cmd to clear useless dependencies


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[PR] [INLONG-10169][Manager] Support configure sort cluster for kafka [inlong]

2024-05-09 Thread via GitHub


fuweng11 opened a new pull request, #10170:
URL: https://github.com/apache/inlong/pull/10170

   
   
   
   
   - Fixes #10169 
   
   ### Motivation
   
   Support configure sort cluster for kafka.
   ### Modifications
   
   Support configure sort cluster for kafka.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org