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/02/10 11:03:18 UTC
[incubator-inlong] 02/02: [INLONG-2441] [Inlong-Audit] Modify the version of audit protobuf (#2444)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch release-1.0.0
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
commit 7355452acef7ffe00540baa966f0ee2b6435ad90
Author: doleyzi <43...@users.noreply.github.com>
AuthorDate: Thu Feb 10 19:00:25 2022 +0800
[INLONG-2441] [Inlong-Audit] Modify the version of audit protobuf (#2444)
---
inlong-agent/agent-common/pom.xml | 6 ---
inlong-audit/audit-common/pom.xml | 2 +-
.../audit-common/src/main/proto/AuditApi.proto | 46 +++++++++++-----------
inlong-audit/audit-sdk/pom.xml | 2 +-
.../apache/inlong/audit/util/AuditDataTest.java | 20 ++++++++--
5 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/inlong-agent/agent-common/pom.xml b/inlong-agent/agent-common/pom.xml
index 067fd1d..3ba08a3 100755
--- a/inlong-agent/agent-common/pom.xml
+++ b/inlong-agent/agent-common/pom.xml
@@ -106,12 +106,6 @@
<groupId>org.apache.inlong</groupId>
<artifactId>audit-sdk</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/inlong-audit/audit-common/pom.xml b/inlong-audit/audit-common/pom.xml
index 17364d6..001d8e0 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:3.2.0:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:2.5.0: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 ce98fcd..b5aa6a6 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 = "proto3";
+syntax = "proto2";
package org.apache.inlong.audit.protocol;
@@ -26,11 +26,11 @@ message BaseCommand {
AUDITREQUEST = 2;
AUDITREPLY = 3;
}
- Type type = 1;
- AuditRequest audit_request = 2;
- AuditReply audit_reply = 3;
- Ping ping = 4;
- Pong pong = 5;
+ optional Type type = 1;
+ required AuditRequest audit_request = 2;
+ optional AuditReply audit_reply = 3;
+ optional Ping ping = 4;
+ optional Pong pong = 5;
}
message Ping {
@@ -40,27 +40,27 @@ message Pong {
}
message AuditRequest {
- uint64 request_id = 1;
- AuditMessageHeader msg_header = 2;
+ optional uint64 request_id = 1;
+ required AuditMessageHeader msg_header = 2;
repeated AuditMessageBody msg_body = 3;
}
message AuditMessageHeader {
- string ip = 1;
- string docker_id = 2;
- string thread_id = 3;
- uint64 sdk_ts = 4;
- uint64 packet_id = 5;
+ required string ip = 1;
+ optional string docker_id = 2;
+ optional string thread_id = 3;
+ required uint64 sdk_ts = 4;
+ required uint64 packet_id = 5;
}
message AuditMessageBody {
- 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;
+ 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;
}
message AuditReply {
@@ -69,7 +69,7 @@ message AuditReply {
FAILED = 1;
DISASTER = 2;
}
- uint64 request_id = 1;
- RSP_CODE rsp_code = 2;
- string message = 3;
+ optional uint64 request_id = 1;
+ required RSP_CODE rsp_code = 2;
+ optional string message = 3;
}
diff --git a/inlong-audit/audit-sdk/pom.xml b/inlong-audit/audit-sdk/pom.xml
index c30f206..767eb51 100644
--- a/inlong-audit/audit-sdk/pom.xml
+++ b/inlong-audit/audit-sdk/pom.xml
@@ -37,7 +37,7 @@
<compiler.target>1.8</compiler.target>
<netty.version>3.8.0.Final</netty.version>
<junit.version>4.13</junit.version>
- <protobuf.version>3.19.1</protobuf.version>
+ <protobuf.version>2.5.0</protobuf.version>
<commons.version>3.0</commons.version>
<skipTests>false</skipTests>
<slf4j.version>1.7.25</slf4j.version>
diff --git a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/AuditDataTest.java b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/AuditDataTest.java
index 1d4d688..82babec 100644
--- a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/AuditDataTest.java
+++ b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/AuditDataTest.java
@@ -37,10 +37,22 @@ public class AuditDataTest {
@Test
public void getDataByte() {
- AuditApi.AuditMessageHeader header = AuditApi.AuditMessageHeader.newBuilder().setIp("127.0.0.1").build();
- AuditApi.AuditMessageBody body = AuditApi.AuditMessageBody.newBuilder().setAuditId("1").build();
- AuditApi.AuditRequest request = AuditApi.AuditRequest.newBuilder().setMsgHeader(header)
- .addMsgBody(body).build();
+ AuditApi.AuditMessageHeader.Builder headerBuilder = AuditApi.AuditMessageHeader.newBuilder();
+ headerBuilder.setPacketId(1)
+ .setSdkTs(0)
+ .setThreadId("")
+ .setIp("")
+ .setDockerId("");
+ AuditApi.AuditMessageBody.Builder bodyBuilder = AuditApi.AuditMessageBody.newBuilder();
+ bodyBuilder.setAuditId("")
+ .setInlongGroupId("")
+ .setInlongStreamId("")
+ .setLogTs(0)
+ .setCount(0)
+ .setSize(0)
+ .setDelay(0);
+ AuditApi.AuditRequest request = AuditApi.AuditRequest.newBuilder().setMsgHeader(headerBuilder.build())
+ .addMsgBody(bodyBuilder.build()).build();
AuditApi.BaseCommand baseCommand = AuditApi.BaseCommand.newBuilder().setAuditRequest(request).build();
AuditData test = new AuditData(System.currentTimeMillis(), baseCommand);
byte[] data = test.getDataByte();