(skywalking) branch master updated: fix: Envoy logs conversion error (#13019)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 217f2d55c3 fix: Envoy logs conversion error (#13019)
217f2d55c3 is described below

commit 217f2d55c3254086ebae036e7987d1b3ffd75a5a
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Feb 5 15:58:36 2025 +0800

    fix: Envoy logs conversion error (#13019)
---
 docs/en/changes/changes.md                                              | 1 +
 .../apache/skywalking/oap/server/library/util/ProtoBufJsonUtils.java    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 8f1cadb660..ebc26c6c9c 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -67,6 +67,7 @@
 * Add Baseline module for support alarm module query baseline data.
 * BaseLine: Support query baseline metrics names.
 * Add `Get Node List in the Cluster` API.
+* Add type descriptor when converting Envoy logs to JSON for persistence, to avoid conversion error.
 
 #### UI
 
diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ProtoBufJsonUtils.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ProtoBufJsonUtils.java
index 0bb837f8bc..56e4a368ce 100644
--- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ProtoBufJsonUtils.java
+++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ProtoBufJsonUtils.java
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.library.util;
 
 import com.google.protobuf.BytesValue;
 import com.google.protobuf.Message;
+import com.google.protobuf.Struct;
 import com.google.protobuf.util.JsonFormat;
 import java.io.IOException;
 
@@ -32,6 +33,7 @@ public class ProtoBufJsonUtils {
                                  .TypeRegistry
                                  .newBuilder()
                                  .add(BytesValue.getDescriptor())
+                                 .add(Struct.getDescriptor())
                                  .build()
                          )
                          .print(sourceMessage);