Skip to content

Commit 217f2d5

Browse files
authored
fix: Envoy logs conversion error (#13019)
1 parent 2cc6db9 commit 217f2d5

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

docs/en/changes/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
* Add Baseline module for support alarm module query baseline data.
6868
* BaseLine: Support query baseline metrics names.
6969
* Add `Get Node List in the Cluster` API.
70+
* Add type descriptor when converting Envoy logs to JSON for persistence, to avoid conversion error.
7071

7172
#### UI
7273

oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ProtoBufJsonUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import com.google.protobuf.BytesValue;
2222
import com.google.protobuf.Message;
23+
import com.google.protobuf.Struct;
2324
import com.google.protobuf.util.JsonFormat;
2425
import java.io.IOException;
2526

@@ -32,6 +33,7 @@ public static String toJSON(Message sourceMessage) throws IOException {
3233
.TypeRegistry
3334
.newBuilder()
3435
.add(BytesValue.getDescriptor())
36+
.add(Struct.getDescriptor())
3537
.build()
3638
)
3739
.print(sourceMessage);

0 commit comments

Comments
 (0)