You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/03/25 12:53:10 UTC
[incubator-inlong] branch master updated: [INLONG-2408][Audit] Upgrade audit pb version to 3.19.4 (#3366)
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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new fe19013 [INLONG-2408][Audit] Upgrade audit pb version to 3.19.4 (#3366)
fe19013 is described below
commit fe19013bc91d4cedc99af788088fa8a87e647b81
Author: doleyzi <43...@users.noreply.github.com>
AuthorDate: Fri Mar 25 20:53:05 2022 +0800
[INLONG-2408][Audit] Upgrade audit pb version to 3.19.4 (#3366)
Co-authored-by: doleyzi <do...@tencent.com>
---
inlong-audit/audit-common/pom.xml | 2 +-
.../audit-common/src/main/proto/AuditApi.proto | 46 +++++++++++-----------
inlong-audit/audit-sdk/pom.xml | 6 ---
inlong-audit/pom.xml | 6 +--
4 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/inlong-audit/audit-common/pom.xml b/inlong-audit/audit-common/pom.xml
index 80a1a65..01cf908 100644
--- a/inlong-audit/audit-common/pom.xml
+++ b/inlong-audit/audit-common/pom.xml
@@ -54,7 +54,7 @@
<extensions>true</extensions>
<configuration>
<protoSourceRoot>${project.basedir}/src/main/proto</protoSourceRoot>
- <protocArtifact>com.google.protobuf:protoc:2.5.0:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf-version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
diff --git a/inlong-audit/audit-common/src/main/proto/AuditApi.proto b/inlong-audit/audit-common/src/main/proto/AuditApi.proto
index e46b70e..ce98fcd 100644
--- a/inlong-audit/audit-common/src/main/proto/AuditApi.proto
+++ b/inlong-audit/audit-common/src/main/proto/AuditApi.proto
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-syntax = "proto2";
+syntax = "proto3";
package org.apache.inlong.audit.protocol;
@@ -26,11 +26,11 @@ message BaseCommand {
AUDITREQUEST = 2;
AUDITREPLY = 3;
}
- optional Type type = 1;
- optional AuditRequest audit_request = 2;
- optional AuditReply audit_reply = 3;
- optional Ping ping = 4;
- optional Pong pong = 5;
+ Type type = 1;
+ AuditRequest audit_request = 2;
+ AuditReply audit_reply = 3;
+ Ping ping = 4;
+ Pong pong = 5;
}
message Ping {
@@ -40,27 +40,27 @@ message Pong {
}
message AuditRequest {
- optional uint64 request_id = 1;
- required AuditMessageHeader msg_header = 2;
+ uint64 request_id = 1;
+ AuditMessageHeader msg_header = 2;
repeated AuditMessageBody msg_body = 3;
}
message AuditMessageHeader {
- required string ip = 1;
- optional string docker_id = 2;
- optional string thread_id = 3;
- required uint64 sdk_ts = 4;
- required uint64 packet_id = 5;
+ string ip = 1;
+ string docker_id = 2;
+ string thread_id = 3;
+ uint64 sdk_ts = 4;
+ uint64 packet_id = 5;
}
message AuditMessageBody {
- required uint64 log_ts = 1;
- required string inlong_group_id= 2;
- required string inlong_stream_id= 3;
- required string audit_id = 4;
- required uint64 count = 5;
- required uint64 size = 6;
- required int64 delay = 7;
+ uint64 log_ts = 1;
+ string inlong_group_id= 2;
+ string inlong_stream_id= 3;
+ string audit_id = 4;
+ uint64 count = 5;
+ uint64 size = 6;
+ int64 delay = 7;
}
message AuditReply {
@@ -69,7 +69,7 @@ message AuditReply {
FAILED = 1;
DISASTER = 2;
}
- optional uint64 request_id = 1;
- required RSP_CODE rsp_code = 2;
- optional string message = 3;
+ uint64 request_id = 1;
+ RSP_CODE rsp_code = 2;
+ string message = 3;
}
diff --git a/inlong-audit/audit-sdk/pom.xml b/inlong-audit/audit-sdk/pom.xml
index 0ff6f9f..2c8d6558 100644
--- a/inlong-audit/audit-sdk/pom.xml
+++ b/inlong-audit/audit-sdk/pom.xml
@@ -36,7 +36,6 @@
<compiler.source>1.8</compiler.source>
<compiler.target>1.8</compiler.target>
<junit.version>4.13</junit.version>
- <protobuf.version>2.5.0</protobuf.version>
<commons.version>3.0</commons.version>
<skipTests>false</skipTests>
<slf4j.version>1.7.25</slf4j.version>
@@ -54,11 +53,6 @@
<version>${commons.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index 0062a13..feda75d 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -51,7 +51,7 @@
<inlong-common.version>1.3.4</inlong-common.version>
<pulsar.version>2.8.1</pulsar.version>
<testng.version>6.14.3</testng.version>
- <protobuf-version>3.19.1</protobuf-version>
+ <protobuf-version>3.19.4</protobuf-version>
<mybatis.starter.version>2.1.3</mybatis.starter.version>
<mysql.version>8.0.20</mysql.version>
<spring.boot.version>2.6.0</spring.boot.version>
@@ -65,10 +65,6 @@
<spring.plugin.version>2.6.3</spring.plugin.version>
</properties>
-
-
-
-
<dependencyManagement>
<dependencies>
<dependency>