[incubator-eventmesh] branch master updated: fix CI error: trace

[mi...@apache.org]

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

mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git


The following commit(s) were added to refs/heads/master by this push:
     new 722f93cb fix CI error: trace
     new 7896f1ca Merge pull request #2111 from horoc/fix-ci-error-trace
722f93cb is described below

commit 722f93cba0d8693085e122a900d3a9ca014bd9b5
Author: horoc <ho...@gmail.com>
AuthorDate: Thu Nov 3 20:04:15 2022 +0800

    fix CI error: trace
---
 .../eventmesh/trace/pinpoint/config/PinpointConfiguration.java   | 3 ++-
 .../eventmesh/trace/pinpoint/exporter/PinpointSpanExporter.java  | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/config/PinpointConfiguration.java b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/config/PinpointConfiguration.java
index b2f01799..5b0dd666 100644
--- a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/config/PinpointConfiguration.java
+++ b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/config/PinpointConfiguration.java
@@ -17,13 +17,14 @@
 
 package org.apache.eventmesh.trace.pinpoint.config;
 
-import static java.util.Objects.requireNonNull;
 import static org.apache.eventmesh.trace.pinpoint.common.PinpointConstants.AGENT_ID_KEY;
 import static org.apache.eventmesh.trace.pinpoint.common.PinpointConstants.AGENT_NAME_KEY;
 import static org.apache.eventmesh.trace.pinpoint.common.PinpointConstants.APPLICATION_NAME;
 import static org.apache.eventmesh.trace.pinpoint.common.PinpointConstants.APPLICATION_NAME_KEY;
 import static org.apache.eventmesh.trace.pinpoint.common.PinpointConstants.PROPERTY_KEY_PREFIX;
 
+import static java.util.Objects.requireNonNull;
+
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.exception.JsonException;
 import org.apache.eventmesh.common.utils.PropertiesUtils;
diff --git a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/exporter/PinpointSpanExporter.java b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/exporter/PinpointSpanExporter.java
index d8f7acdd..24fe9c14 100644
--- a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/exporter/PinpointSpanExporter.java
+++ b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/exporter/PinpointSpanExporter.java
@@ -17,10 +17,11 @@
 
 package org.apache.eventmesh.trace.pinpoint.exporter;
 
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static org.apache.eventmesh.trace.pinpoint.common.PinpointConstants.REQ_IP;
 import static org.apache.eventmesh.trace.pinpoint.common.PinpointConstants.UNKNOWN_REQ_IP;
 
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.IPUtils;
 import org.apache.eventmesh.common.utils.JsonUtils;
@@ -284,7 +285,6 @@ public final class PinpointSpanExporter implements SpanExporter {
 
     private Span toSpan(SpanData spanData) {
         long startTimestamp = toMillis(spanData.getStartEpochNanos());
-        long endTimestamp = toMillis(spanData.getEndEpochNanos());
         long transactionId = hex32StringToLong(spanData.getTraceId());
         long spanId = hex16StringToLong(spanData.getSpanId());
         final long[] parentSpanId = {SpanId.NULL};
@@ -315,6 +315,7 @@ public final class PinpointSpanExporter implements SpanExporter {
         }
 
         span.setStartTime(startTimestamp);
+        long endTimestamp = toMillis(spanData.getEndEpochNanos());
         span.setElapsedTime((int) (endTimestamp - startTimestamp));
         span.setServiceType(ServiceType.STAND_ALONE.getCode());
         span.setRemoteAddr(UNKNOWN_REQ_IP);
@@ -373,6 +374,10 @@ public final class PinpointSpanExporter implements SpanExporter {
     }
 
     private static String getEndpoint(Resource resource) {
+        if (resource == null) {
+            return null;
+        }
+
         Attributes resourceAttributes = resource.getAttributes();
 
         String serviceNameValue = resourceAttributes.get(ResourceAttributes.SERVICE_NAME);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org