This is an automated email from the ASF dual-hosted git repository.
wusheng 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 eca67d42d8 Fix otlp log handler reponse error and otlp span convert
error (#13468)
eca67d42d8 is described below
commit eca67d42d82eab99cdf0979431648d2fd54fd29e
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Fri Sep 5 12:08:04 2025 +0800
Fix otlp log handler reponse error and otlp span convert error (#13468)
---
docs/en/changes/changes.md | 1 +
.../oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java | 4 ++--
.../oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java | 2 +-
.../skywalking/oap/server/receiver/zipkin/trace/SpanForward.java | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index cc8ae2e6ef..9b5241e4d2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -91,6 +91,7 @@
* BanyanDB: fix the `BanyanDBMetricsDAO.multiGet` not work properly in
`IndexMode`.
* BanyanDB: remove `@StoreIDAsTag`, and automatically create a virtual String
tag `id` for the SeriesID in `IndexMode`.
* Remove method `appendMutant` from StorageID.
+* Fix otlp log handler reponse error and otlp span convert error.
#### UI
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
index a98839445c..cc1d75e025 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
@@ -114,9 +114,9 @@ public class OpenTelemetryLogHandler
doAnalysisQuietly(service, layer, serviceInstance,
logRecord);
}
});
-
responseObserver.onNext(ExportLogsServiceResponse.getDefaultInstance());
- responseObserver.onCompleted();
});
+
responseObserver.onNext(ExportLogsServiceResponse.getDefaultInstance());
+ responseObserver.onCompleted();
}
private void doAnalysisQuietly(String service, String layer, String
serviceInstance, LogRecord logRecord) {
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
index 73377286d6..f11df308cd 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
@@ -375,7 +375,7 @@ public class OpenTelemetryTraceHandler
return String.valueOf(value.getIntValue());
} else if (value.hasKvlistValue()) {
final JsonObject kvObj =
convertToString(value.getKvlistValue().getValuesList());
- return kvObj.getAsString();
+ return kvObj.toString();
} else if (value.hasBytesValue()) {
return new
String(Base64.getEncoder().encode(value.getBytesValue().toByteArray()),
StandardCharsets.UTF_8);
}
diff --git
a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java
b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java
index 0500bf35bd..3f598547ff 100644
---
a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java
+++
b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java
@@ -79,7 +79,7 @@ public class SpanForward implements SpanForwardService {
zipkinSpan.setSpanId(span.id());
zipkinSpan.setParentId(span.parentId());
zipkinSpan.setName(getNamingControl().formatEndpointName(serviceName,
span.name()));
- zipkinSpan.setDuration(span.duration());
+ zipkinSpan.setDuration(span.duration() == null ? 0 :
span.duration());
if (span.kind() != null) {
zipkinSpan.setKind(span.kind().name());
}
