[ISSUE #3973]log.error should be in try-catch() instead of log.warn (#3974)
* Mainly modify the Trace
* log.error should be in catch() block.
* Fix checkstyle error
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
index aadfb90..d74b69a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
@@ -37,8 +37,8 @@
import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.EventProcessor;
import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.HttpRequestProcessor;
import org.apache.eventmesh.runtime.metrics.http.HTTPMetricsServer;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.RemotingHelper;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.runtime.util.Utils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/HTTPTrace.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/HTTPTrace.java
index 0d8b130..f712aae 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/HTTPTrace.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/HTTPTrace.java
@@ -17,7 +17,7 @@
package org.apache.eventmesh.runtime.boot;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.runtime.util.Utils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java
index da66d36..31fd31b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java
@@ -41,8 +41,8 @@
import org.apache.eventmesh.runtime.core.protocol.http.producer.SendMessageContext;
import org.apache.eventmesh.runtime.core.protocol.http.push.HTTPMessageHandler;
import org.apache.eventmesh.runtime.core.protocol.http.push.MessageHandler;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
import org.apache.commons.collections4.MapUtils;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncMessageProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncMessageProcessor.java
index f90eace..6fceaa2 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncMessageProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncMessageProcessor.java
@@ -43,9 +43,9 @@
import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.HttpRequestProcessor;
import org.apache.eventmesh.runtime.core.protocol.http.producer.EventMeshProducer;
import org.apache.eventmesh.runtime.core.protocol.http.producer.SendMessageContext;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
import org.apache.eventmesh.runtime.util.RemotingHelper;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
import org.apache.commons.lang3.ObjectUtils;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPMessageHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPMessageHandler.java
index 0c33337..3972cf4 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPMessageHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPMessageHandler.java
@@ -20,8 +20,8 @@
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.runtime.core.protocol.http.consumer.EventMeshConsumer;
import org.apache.eventmesh.runtime.core.protocol.http.consumer.HandleMsgContext;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
import org.apache.commons.collections4.MapUtils;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java
index 5eaca39..9d63971 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java
@@ -35,8 +35,8 @@
import org.apache.eventmesh.runtime.core.protocol.tcp.client.task.RecommendTask;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.task.SubscribeTask;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.task.UnSubscribeTask;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
import java.util.concurrent.TimeUnit;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java
index 01725bd..ac45ca6 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java
@@ -39,9 +39,9 @@
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.retry.EventMeshTcpRetryer;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.send.UpStreamMsgContext;
import org.apache.eventmesh.runtime.metrics.tcp.EventMeshTcpMonitor;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
import org.apache.eventmesh.runtime.util.HttpTinyClient;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
import org.apache.commons.collections4.CollectionUtils;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/SessionPusher.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/SessionPusher.java
index 55fad4a..5826636 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/SessionPusher.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/SessionPusher.java
@@ -29,8 +29,8 @@
import org.apache.eventmesh.protocol.api.ProtocolPluginFactory;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
import org.apache.commons.collections4.CollectionUtils;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java
index 5bfda71..da61686 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java
@@ -29,8 +29,8 @@
import org.apache.eventmesh.protocol.api.ProtocolPluginFactory;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.runtime.util.Utils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
index 815aae9..8d00a99 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
@@ -38,8 +38,8 @@
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.send.UpStreamMsgContext;
import org.apache.eventmesh.runtime.trace.AttributeKeys;
import org.apache.eventmesh.runtime.trace.SpanKey;
-import org.apache.eventmesh.runtime.trace.TraceUtils;
import org.apache.eventmesh.runtime.util.RemotingHelper;
+import org.apache.eventmesh.runtime.util.TraceUtils;
import org.apache.eventmesh.runtime.util.Utils;
import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/Trace.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/Trace.java
index cefe5da..ad1f9f7 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/Trace.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/Trace.java
@@ -112,17 +112,7 @@
}
Context context = ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).get();
Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
-
- if (span == null) {
- log.warn("span is null when finishSpan");
- return null;
- }
-
- //add trace info
- for (String entry : cloudEvent.getExtensionNames()) {
- span.setAttribute(entry, cloudEvent.getExtension(entry) == null ? "" : cloudEvent.getExtension(entry).toString());
- }
- return span;
+ return addTraceInfoToSpan(span, cloudEvent);
}
public Span addTraceInfoToSpan(Span span, CloudEvent cloudEvent) {
@@ -139,6 +129,7 @@
return span;
}
+ //add trace info
for (String entry : cloudEvent.getExtensionNames()) {
span.setAttribute(entry, cloudEvent.getExtension(entry) == null ? "" : cloudEvent.getExtension(entry).toString());
}
@@ -166,22 +157,10 @@
}
public void finishSpan(ChannelHandlerContext ctx, StatusCode statusCode) {
- try {
- if (useTrace) {
- Context context = ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).get();
- Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
-
- if (span == null) {
- log.warn("span is null when finishSpan");
- return;
- }
- if (statusCode != null) {
- span.setStatus(statusCode);
- }
- span.end();
- }
- } catch (Exception e) {
- log.warn("finishSpan occur exception,", e);
+ if (useTrace) {
+ Context context = ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).get();
+ Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
+ finishSpan(span, statusCode);
}
}
@@ -198,7 +177,7 @@
span.end();
}
} catch (Exception e) {
- log.warn("finishSpan occur exception,", e);
+ log.error("finishSpan occur exception,", e);
}
}
@@ -218,30 +197,15 @@
span.end();
}
} catch (Exception e) {
- log.warn("finishSpan occur exception,", e);
+ log.error("finishSpan occur exception,", e);
}
}
public void finishSpan(ChannelHandlerContext ctx, StatusCode statusCode, String errMsg, Throwable throwable) {
- try {
- if (useTrace) {
- Context context = ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).get();
- Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
-
- if (span == null) {
- log.warn("span is null when finishSpan");
- return;
- }
- if (statusCode != null) {
- span.setStatus(statusCode, errMsg);
- }
- if (throwable != null) {
- span.recordException(throwable);
- }
- span.end();
- }
- } catch (Exception e) {
- log.warn("finishSpan occur exception,", e);
+ if (useTrace) {
+ Context context = ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).get();
+ Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
+ finishSpan(span, statusCode, errMsg, throwable);
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/TraceUtils.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/TraceUtils.java
similarity index 89%
rename from eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/TraceUtils.java
rename to eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/TraceUtils.java
index 210d71a..0dc2b36 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/TraceUtils.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/TraceUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.runtime.trace;
+package org.apache.eventmesh.runtime.util;
import org.apache.eventmesh.runtime.boot.EventMeshServer;
@@ -43,7 +43,7 @@
spanName, SpanKind.CLIENT, Context.current(), isSpanFinishInOtherThread);
EventMeshServer.getTrace().inject(Context.current(), map);
} catch (Exception ex) {
- log.warn("upload trace fail when prepareSpan", ex);
+ log.error("upload trace fail when prepareSpan", ex);
}
return span;
}
@@ -56,7 +56,7 @@
span = EventMeshServer.getTrace()
.createSpan(spanName, SpanKind.SERVER, traceContext, isSpanFinishInOtherThread);
} catch (Exception ex) {
- log.warn("upload trace fail when prepareSpan", ex);
+ log.error("upload trace fail when prepareSpan", ex);
}
return span;
}
@@ -75,7 +75,7 @@
.createSpan(spanName, SpanKind.SERVER, traceContext, isSpanFinishInOtherThread);
}
} catch (Exception ex) {
- log.warn("upload trace fail when prepareSpan", ex);
+ log.error("upload trace fail when prepareSpan", ex);
}
return span;
}
@@ -87,7 +87,7 @@
EventMeshServer.getTrace().addTraceInfoToSpan(span, event);
EventMeshServer.getTrace().finishSpan(span, StatusCode.OK);
} catch (Throwable ex) {
- log.warn("upload trace fail when finishSpan", ex);
+ log.error("upload trace fail when finishSpan", ex);
}
}
@@ -98,7 +98,7 @@
EventMeshServer.getTrace().addTraceInfoToSpan(ctx, event);
EventMeshServer.getTrace().finishSpan(ctx, StatusCode.OK);
} catch (Throwable ex) {
- log.warn("upload trace fail when finishSpan", ex);
+ log.error("upload trace fail when finishSpan", ex);
}
}
@@ -110,7 +110,7 @@
EventMeshServer.getTrace().addTraceInfoToSpan(ctx, event);
EventMeshServer.getTrace().finishSpan(ctx, StatusCode.ERROR, errMsg, e);
} catch (Throwable ex) {
- log.warn("upload trace fail when finishSpanWithException", ex);
+ log.error("upload trace fail when finishSpanWithException", ex);
}
}
@@ -121,7 +121,7 @@
EventMeshServer.getTrace().addTraceInfoToSpan(span, map);
EventMeshServer.getTrace().finishSpan(span, StatusCode.ERROR, errMsg, e);
} catch (Throwable ex) {
- log.warn("upload trace fail when finishSpanWithException", ex);
+ log.error("upload trace fail when finishSpanWithException", ex);
}
}
}
