You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by mi...@apache.org on 2023/02/17 01:44:21 UTC
[incubator-eventmesh] branch master updated: [ISSUE #3146]Replace LoggerFactory#getLogger with lombok @Slf4j
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 7e08a4ecb [ISSUE #3146]Replace LoggerFactory#getLogger with lombok @Slf4j
new e836a54b3 Merge pull request #3174 from mxsm/eventmesh-3146
7e08a4ecb is described below
commit 7e08a4ecb86717834c77690af1f1fccc4f74e79c
Author: mxsm <lj...@gmail.com>
AuthorDate: Fri Feb 17 00:07:41 2023 +0800
[ISSUE #3146]Replace LoggerFactory#getLogger with lombok @Slf4j
---
.../eventmesh-admin-rocketmq/build.gradle | 5 +-
.../admin/rocketmq/controller/AdminController.java | 9 ++--
.../admin/rocketmq/handler/TopicsHandler.java | 19 ++++---
.../common/config/convert/ConverterMap.java | 9 ++--
.../eventmesh/common/file/WatchFileManager.java | 21 ++++----
.../eventmesh/common/file/WatchFileTask.java | 19 ++++---
.../loadbalance/RandomLoadBalanceSelector.java | 9 ++--
.../WeightRoundRobinLoadBalanceSelector.java | 9 ++--
.../eventmesh/common/protocol/tcp/codec/Codec.java | 25 +++++----
.../org/apache/eventmesh/common/utils/IPUtils.java | 15 +++---
.../apache/eventmesh/common/utils/JsonUtils.java | 1 -
.../apache/eventmesh/common/utils/NetUtils.java | 3 --
.../loadbalance/RandomLoadBalanceSelectorTest.java | 12 ++---
.../WeightRandomLoadBalanceSelectorTest.java | 12 ++---
.../WeightRoundRobinLoadBalanceSelectorTest.java | 13 ++---
.../connector/kafka/consumer/ConsumerImpl.java | 12 ++---
.../kafka/consumer/KafkaConsumerRunner.java | 14 ++---
.../knative/consumer/DefaultConsumer.java | 6 +--
.../knative/consumer/KnativeConsumerImpl.java | 13 ++---
.../knative/consumer/PullConsumerImpl.java | 14 +++--
.../knative/producer/AbstractProducer.java | 8 +--
.../connector/rabbitmq/client/RabbitmqClient.java | 15 +++---
.../rabbitmq/consumer/RabbitmqConsumer.java | 9 ++--
.../rabbitmq/consumer/RabbitmqConsumerHandler.java | 11 ++--
.../rabbitmq/producer/RabbitmqProducer.java | 12 ++---
.../connector/redis/consumer/RedisConsumer.java | 8 +--
.../rocketmq/consumer/RocketMQConsumerImpl.java | 5 --
.../EventMeshMessageListenerConcurrently.java | 10 ++--
.../connector/rocketmq/utils/CloudEventUtils.java | 8 +--
.../eventmesh-connector-standalone/build.gradle | 3 ++
.../broker/task/HistoryMessageClearTask.java | 10 ++--
.../standalone/broker/task/SubScribeTask.java | 19 ++++---
.../standalone/producer/StandaloneProducer.java | 10 ++--
.../eventmesh-registry-consul/build.gradle | 3 ++
.../consul/service/ConsulRegistryService.java | 12 ++---
.../eventmesh-registry-etcd/build.gradle | 3 ++
.../registry/etcd/factory/EtcdClientFactory.java | 14 +++--
.../registry/etcd/factory/EtcdStreamObserver.java | 12 ++---
.../registry/etcd/service/EtcdRegistryService.java | 31 ++++++-----
.../eventmesh-registry-nacos/build.gradle | 3 ++
.../nacos/service/NacosRegistryService.java | 26 +++++----
.../service/ZookeeperRegistryService.java | 20 ++++---
eventmesh-runtime/build.gradle | 3 ++
.../java/org/apache/eventmesh/runtime/acl/Acl.java | 3 --
.../admin/controller/ClientManageController.java | 10 ++--
.../admin/handler/ConfigurationHandler.java | 6 +--
.../admin/handler/DeleteWebHookConfigHandler.java | 9 ++--
.../runtime/admin/handler/EventHandler.java | 13 +++--
.../runtime/admin/handler/GrpcClientHandler.java | 10 ++--
.../runtime/admin/handler/HTTPClientHandler.java | 10 ++--
.../admin/handler/InsertWebHookConfigHandler.java | 9 ++--
.../runtime/admin/handler/MetricsHandler.java | 8 +--
.../handler/QueryRecommendEventMeshHandler.java | 11 ++--
.../handler/QueryWebHookConfigByIdHandler.java | 9 ++--
.../QueryWebHookConfigByManufacturerHandler.java | 9 ++--
.../handler/RedirectClientByIpPortHandler.java | 13 +++--
.../admin/handler/RedirectClientByPathHandler.java | 13 +++--
.../handler/RedirectClientBySubSystemHandler.java | 15 +++---
.../runtime/admin/handler/RegistryHandler.java | 8 +--
.../admin/handler/RejectAllClientHandler.java | 15 +++---
.../admin/handler/RejectClientByIpPortHandler.java | 13 +++--
.../admin/handler/ShowClientBySystemHandler.java | 11 ++--
.../runtime/admin/handler/ShowClientHandler.java | 11 ++--
.../handler/ShowListenClientByTopicHandler.java | 11 ++--
.../runtime/admin/handler/TCPClientHandler.java | 10 ++--
.../runtime/admin/handler/TopicHandler.java | 14 ++---
.../admin/handler/UpdateWebHookConfigHandler.java | 10 ++--
.../runtime/boot/AbstractRemotingServer.java | 19 ++++---
.../runtime/boot/EventMeshGrpcServer.java | 23 ++++----
.../runtime/boot/EventMeshHTTPServer.java | 25 ++++-----
.../eventmesh/runtime/boot/EventMeshServer.java | 28 +++++-----
.../eventmesh/runtime/boot/EventMeshStartup.java | 19 ++++---
.../eventmesh/runtime/boot/EventMeshTCPServer.java | 35 ++++++------
.../runtime/connector/ConnectorResource.java | 8 +--
.../runtime/core/consumer/SubscriptionManager.java | 13 ++---
.../core/consumergroup/ConsumerGroupTopicConf.java | 5 --
.../runtime/core/plugin/MQAdminWrapper.java | 11 ++--
.../runtime/core/plugin/MQConsumerWrapper.java | 11 ++--
.../runtime/core/plugin/MQProducerWrapper.java | 11 ++--
.../protocol/grpc/consumer/ConsumerManager.java | 37 +++++++------
.../consumer/consumergroup/WebhookTopicConfig.java | 11 ++--
.../processor/BatchPublishMessageProcessor.java | 12 +++--
.../grpc/processor/ReplyMessageProcessor.java | 12 +++--
.../grpc/processor/RequestMessageProcessor.java | 14 ++---
.../grpc/processor/SendAsyncMessageProcessor.java | 12 +++--
.../grpc/processor/SubscribeStreamProcessor.java | 10 ++--
.../grpc/processor/UnsubscribeProcessor.java | 13 +++--
.../protocol/grpc/producer/EventMeshProducer.java | 12 ++---
.../protocol/grpc/producer/ProducerManager.java | 17 +++---
.../protocol/grpc/push/AbstractPushRequest.java | 16 +++---
.../core/protocol/grpc/push/MessageHandler.java | 9 ++--
.../core/protocol/grpc/push/StreamPushRequest.java | 19 ++++---
.../core/protocol/grpc/service/EventEmitter.java | 14 ++---
.../protocol/grpc/service/HeartbeatService.java | 13 +++--
.../protocol/grpc/service/ProducerService.java | 14 ++---
.../protocol/http/consumer/ConsumerManager.java | 29 +++++-----
.../protocol/http/consumer/EventMeshConsumer.java | 16 +++---
.../protocol/http/consumer/HandleMsgContext.java | 13 +++--
.../http/consumer/HttpClientGroupMapping.java | 62 +++++++++++-----------
.../http/processor/AdminMetricsProcessor.java | 9 ++--
.../protocol/http/processor/HandlerService.java | 14 ++---
.../http/processor/SubscribeProcessor.java | 35 ++++++------
.../http/processor/UnSubscribeProcessor.java | 25 +++++----
.../protocol/http/producer/EventMeshProducer.java | 13 +++--
.../protocol/http/producer/ProducerManager.java | 15 +++---
.../protocol/http/producer/SendMessageContext.java | 11 ++--
.../protocol/http/push/AsyncHTTPPushRequest.java | 1 -
.../core/protocol/http/push/HTTPClientPool.java | 9 ++--
.../protocol/http/push/HTTPMessageHandler.java | 12 ++---
.../core/protocol/http/retry/HttpRetryer.java | 14 ++---
.../protocol/tcp/client/EventMeshTcp2Client.java | 27 +++++-----
.../tcp/client/EventMeshTcpConnectionHandler.java | 20 +++----
.../tcp/client/EventMeshTcpExceptionHandler.java | 10 ++--
.../tcp/client/EventMeshTcpMessageDispatcher.java | 15 +++---
.../dispatch/FreePriorityDispatchStrategy.java | 18 +++----
.../rebalance/EventMeshRebalanceService.java | 14 ++---
.../client/rebalance/EventmeshRebalanceImpl.java | 49 +++++++++--------
.../core/protocol/tcp/client/session/Session.java | 18 ++++---
.../tcp/client/session/push/ClientAckContext.java | 13 +++--
.../client/session/push/DownStreamMsgContext.java | 25 +++++----
.../tcp/client/session/push/PushContext.java | 9 ++--
.../tcp/client/session/push/SessionPusher.java | 18 ++++---
.../client/session/retry/EventMeshTcpRetryer.java | 21 ++++----
.../tcp/client/session/send/SessionSender.java | 9 ++--
.../client/session/send/UpStreamMsgContext.java | 19 ++++---
.../core/protocol/tcp/client/task/GoodbyeTask.java | 13 +++--
.../protocol/tcp/client/task/HeartBeatTask.java | 11 ++--
.../core/protocol/tcp/client/task/HelloTask.java | 10 ++--
.../core/protocol/tcp/client/task/ListenTask.java | 11 ++--
.../protocol/tcp/client/task/MessageAckTask.java | 10 ++--
.../tcp/client/task/MessageTransferTask.java | 15 +++---
.../protocol/tcp/client/task/RecommendTask.java | 8 +--
.../protocol/tcp/client/task/SubscribeTask.java | 15 +++---
.../protocol/tcp/client/task/UnSubscribeTask.java | 6 ++-
.../runtime/metrics/http/HTTPMetricsServer.java | 52 +++++++++---------
.../eventmesh/runtime/registry/Registry.java | 8 +--
.../eventmesh/runtime/trace/LogExporter.java | 10 ++--
.../org/apache/eventmesh/runtime/trace/Trace.java | 30 +++++------
.../apache/eventmesh/runtime/trace/TraceUtils.java | 30 +++++------
.../eventmesh/runtime/util/EventMeshUtil.java | 25 ++++-----
.../org/apache/eventmesh/runtime/util/Utils.java | 8 ++-
.../runtime/client/common/ClientGlobal.java | 8 ++-
.../eventmesh/runtime/client/common/Codec.java | 14 ++---
.../runtime/client/common/RequestContext.java | 11 ++--
.../eventmesh/runtime/client/common/TCPClient.java | 19 ++++---
.../runtime/client/impl/PubClientImpl.java | 38 ++++++-------
.../runtime/client/impl/SubClientImpl.java | 30 +++++------
.../eventmesh/runtime/demo/AsyncPubClient.java | 13 +++--
.../eventmesh/runtime/demo/AsyncSubClient.java | 13 +++--
.../eventmesh/runtime/demo/BroadCastSubClient.java | 13 +++--
.../apache/eventmesh/runtime/demo/CCSubClient.java | 13 +++--
.../apache/eventmesh/runtime/demo/CClientDemo.java | 13 +++--
.../eventmesh/runtime/demo/SyncPubClient.java | 10 ++--
.../eventmesh/runtime/demo/SyncSubClient.java | 13 +++--
.../client/http/demo/AsyncSyncRequestInstance.java | 15 +++---
.../client/http/demo/SyncRequestInstance.java | 15 +++---
eventmesh-spi/build.gradle | 3 ++
.../eventmesh/spi/EventMeshExtensionFactory.java | 15 +++---
.../spi/loader/JarExtensionClassLoader.java | 2 -
.../spi/loader/MetaInfExtensionClassLoader.java | 3 --
.../eventmesh/spi/example/PrototypeExtension.java | 9 ++--
.../eventmesh/spi/example/SingletonExtension.java | 9 ++--
162 files changed, 1107 insertions(+), 1186 deletions(-)
diff --git a/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle b/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle
index 1217b3381..4819d15ca 100644
--- a/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle
+++ b/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle
@@ -26,5 +26,8 @@ dependencies {
implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
- testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
+ compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
+
+ testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
}
diff --git a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/controller/AdminController.java b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/controller/AdminController.java
index 9b85b4521..573a0c366 100644
--- a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/controller/AdminController.java
+++ b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/controller/AdminController.java
@@ -23,14 +23,13 @@ import org.apache.eventmesh.admin.rocketmq.handler.TopicsHandler;
import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpServer;
-public class AdminController {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger logger = LoggerFactory.getLogger(AdminController.class);
+@Slf4j
+public class AdminController {
public AdminController() {
}
@@ -39,6 +38,6 @@ public class AdminController {
server.createContext(TOPIC_MANAGE_PATH, new TopicsHandler());
- logger.info("EventMesh-Admin Controller server context created successfully");
+ log.info("EventMesh-Admin Controller server context created successfully");
}
}
diff --git a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java
index 9913f4fc8..c0aa2c7c1 100644
--- a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java
+++ b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java
@@ -34,14 +34,13 @@ import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.io.OutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class TopicsHandler implements HttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(TopicsHandler.class);
@Override
public void handle(HttpExchange httpExchange) throws IOException {
@@ -55,7 +54,7 @@ public class TopicsHandler implements HttpHandler {
OutputStream out = httpExchange.getResponseBody();
httpExchange.sendResponseHeaders(500, 0);
String result = String.format("Please check your request url: %s", httpExchange.getRequestURI());
- logger.error(result);
+ log.error(result);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
}
@@ -69,7 +68,7 @@ public class TopicsHandler implements HttpHandler {
if (StringUtils.isBlank(topic)) {
result = "Create topic failed. Parameter topic not found.";
- logger.error(result);
+ log.error(result);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
@@ -77,23 +76,23 @@ public class TopicsHandler implements HttpHandler {
//TBD: A new rocketmq service will be implemented for creating topics
TopicResponse topicResponse = null;
if (topicResponse != null) {
- logger.info("create a new topic: {}", topic);
+ log.info("create a new topic: {}", topic);
httpExchange.getResponseHeaders().add(CONTENT_TYPE, APPLICATION_JSON);
NetUtils.sendSuccessResponseHeaders(httpExchange);
result = JsonUtils.toJSONString(topicResponse);
- logger.info(result);
+ log.info(result);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} else {
httpExchange.sendResponseHeaders(500, 0);
result = TOPIC_ERROR;
- logger.error(result);
+ log.error(result);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
}
} catch (Exception e) {
httpExchange.getResponseHeaders().add(CONTENT_TYPE, APPLICATION_JSON);
httpExchange.sendResponseHeaders(500, 0);
result = TOPIC_ERROR;
- logger.error(result, e);
+ log.error(result, e);
}
}
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/convert/ConverterMap.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/convert/ConverterMap.java
index 47ee0534d..3f59730c9 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/convert/ConverterMap.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/convert/ConverterMap.java
@@ -47,18 +47,17 @@ import java.util.Properties;
import java.util.TreeMap;
import java.util.Vector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import lombok.extern.slf4j.Slf4j;
import inet.ipaddr.IPAddress;
/**
* Use to map the field clazz and the converter for the field clazz
*/
+@Slf4j
public class ConverterMap {
- public static final Logger LOGGER = LoggerFactory.getLogger(ConverterMap.class);
-
private static final ObjectConverter objectConverter = new ObjectConverter();
private static final Map<Class<?>, ConvertValue<?>> classToConverter = new HashMap<>();
@@ -107,7 +106,7 @@ public class ConverterMap {
ConvertValue<?> convertValue = (ConvertValue<?>) converter1.newInstance();
register(convertValue, converter1);
} catch (Exception e) {
- LOGGER.error("The converter failed to register.", e);
+ log.error("The converter failed to register.", e);
}
}
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileManager.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileManager.java
index 86e960eed..1944da432 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileManager.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileManager.java
@@ -21,12 +21,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class WatchFileManager {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger LOGGER = LoggerFactory.getLogger(WatchFileManager.class);
+@Slf4j
+public class WatchFileManager {
private static final AtomicBoolean CLOSED = new AtomicBoolean(false);
@@ -34,7 +33,7 @@ public class WatchFileManager {
static {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
- LOGGER.warn("[WatchFileManager] WatchFileManager closed");
+ log.warn("[WatchFileManager] WatchFileManager closed");
shutdown();
}));
}
@@ -63,22 +62,22 @@ public class WatchFileManager {
return;
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[WatchFileManager] start close");
+ if (log.isInfoEnabled()) {
+ log.info("[WatchFileManager] start close");
}
for (Map.Entry<String, WatchFileTask> entry : WATCH_FILE_TASK_MAP.entrySet()) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[WatchFileManager] start to shutdown : {}", entry.getKey());
+ if (log.isInfoEnabled()) {
+ log.info("[WatchFileManager] start to shutdown : {}", entry.getKey());
}
try {
entry.getValue().shutdown();
} catch (Exception ex) {
- LOGGER.error("[WatchFileManager] shutdown has error : ", ex);
+ log.error("[WatchFileManager] shutdown has error : ", ex);
}
}
WATCH_FILE_TASK_MAP.clear();
- LOGGER.warn("[WatchFileManager] already closed");
+ log.warn("[WatchFileManager] already closed");
}
}
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileTask.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileTask.java
index a585ee2f5..ecbf7951e 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileTask.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileTask.java
@@ -28,12 +28,11 @@ import java.nio.file.WatchService;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class WatchFileTask extends Thread {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger LOGGER = LoggerFactory.getLogger(WatchFileTask.class);
+@Slf4j
+public class WatchFileTask extends Thread {
private static final FileSystem FILE_SYSTEM = FileSystems.getDefault();
@@ -89,8 +88,8 @@ public class WatchFileTask extends Thread {
for (WatchEvent<?> event : events) {
WatchEvent.Kind<?> kind = event.kind();
if (kind.equals(StandardWatchEventKinds.OVERFLOW)) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("[WatchFileTask] file overflow: {}", event.context());
+ if (log.isWarnEnabled()) {
+ log.warn("[WatchFileTask] file overflow: {}", event.context());
}
continue;
}
@@ -99,12 +98,12 @@ public class WatchFileTask extends Thread {
} catch (InterruptedException ex) {
boolean interrupted = Thread.interrupted();
if (interrupted) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("[WatchFileTask] file watch is interrupted");
+ if (log.isDebugEnabled()) {
+ log.debug("[WatchFileTask] file watch is interrupted");
}
}
} catch (Exception ex) {
- LOGGER.error("[WatchFileTask] an exception occurred during file listening : ", ex);
+ log.error("[WatchFileTask] an exception occurred during file listening : ", ex);
}
}
}
@@ -121,7 +120,7 @@ public class WatchFileTask extends Thread {
}
}
} catch (Exception ex) {
- LOGGER.error("[WatchFileTask] file change event callback error : ", ex);
+ log.error("[WatchFileTask] file change event callback error : ", ex);
}
}
}
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelector.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelector.java
index df26897e0..22889499f 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelector.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelector.java
@@ -22,8 +22,8 @@ import org.apache.commons.collections4.CollectionUtils;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import lombok.extern.slf4j.Slf4j;
/**
* This selector use random strategy.
@@ -31,10 +31,9 @@ import org.slf4j.LoggerFactory;
*
* @param <T> Target type
*/
+@Slf4j
public class RandomLoadBalanceSelector<T> implements LoadBalanceSelector<T> {
- private static final Logger LOG = LoggerFactory.getLogger(RandomLoadBalanceSelector.class);
-
private final transient List<T> clusterGroup;
public RandomLoadBalanceSelector(List<T> clusterGroup) {
@@ -44,7 +43,7 @@ public class RandomLoadBalanceSelector<T> implements LoadBalanceSelector<T> {
@Override
public T select() {
if (CollectionUtils.isEmpty(clusterGroup)) {
- LOG.warn("No servers available");
+ log.warn("No servers available");
return null;
}
return clusterGroup.get(ThreadLocalRandom.current().nextInt(clusterGroup.size()));
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelector.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelector.java
index ec90f46b4..3bb4b6d59 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelector.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelector.java
@@ -21,8 +21,8 @@ import org.apache.commons.collections4.CollectionUtils;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import lombok.extern.slf4j.Slf4j;
/**
* This selector use the weighted round robin strategy to select from list.
@@ -30,10 +30,9 @@ import org.slf4j.LoggerFactory;
*
* @param <T> Target type
*/
+@Slf4j
public class WeightRoundRobinLoadBalanceSelector<T> implements LoadBalanceSelector<T> {
- private static final Logger LOG = LoggerFactory.getLogger(WeightRoundRobinLoadBalanceSelector.class);
-
private final transient List<Weight<T>> clusterGroup;
private final transient int totalWeight;
@@ -52,7 +51,7 @@ public class WeightRoundRobinLoadBalanceSelector<T> implements LoadBalanceSelect
@SuppressWarnings("ConstantConditions")
public T select() {
if (CollectionUtils.isEmpty(clusterGroup)) {
- LOG.warn("No servers available");
+ log.warn("No servers available");
return null;
}
Weight<T> targetWeight = null;
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
index b42bd7269..e11a8f24e 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
@@ -33,9 +33,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.TimeZone;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
@@ -48,8 +45,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.google.common.base.Preconditions;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class Codec {
- private static final Logger LOG = LoggerFactory.getLogger(Codec.class);
private static final int FRAME_MAX_LENGTH = 1024 * 1024 * 4;
@@ -78,8 +77,8 @@ public class Codec {
Preconditions.checkNotNull(pkg, "TcpPackage cannot be null");
final Header header = pkg.getHeader();
Preconditions.checkNotNull(header, "TcpPackage header cannot be null", header);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Encoder pkg={}", JsonUtils.toJSONString(pkg));
+ if (log.isDebugEnabled()) {
+ log.debug("Encoder pkg={}", JsonUtils.toJSONString(pkg));
}
final byte[] headerData = serializeBytes(OBJECT_MAPPER.writeValueAsString(header));
@@ -134,7 +133,7 @@ public class Codec {
Package pkg = new Package(header, body);
out.add(pkg);
} catch (Exception e) {
- LOG.error(String.format("decode error| receive: %s.", deserializeBytes(in.array())), e);
+ log.error(String.format("decode error| receive: %s.", deserializeBytes(in.array())), e);
throw e;
}
}
@@ -157,8 +156,8 @@ public class Codec {
}
final byte[] headerData = new byte[headerLength];
in.readBytes(headerData);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Decode headerJson={}", deserializeBytes(headerData));
+ if (log.isDebugEnabled()) {
+ log.debug("Decode headerJson={}", deserializeBytes(headerData));
}
return OBJECT_MAPPER.readValue(deserializeBytes(headerData), Header.class);
}
@@ -169,8 +168,8 @@ public class Codec {
}
final byte[] bodyData = new byte[bodyLength];
in.readBytes(bodyData);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Decode bodyJson={}", deserializeBytes(bodyData));
+ if (log.isDebugEnabled()) {
+ log.debug("Decode bodyJson={}", deserializeBytes(bodyData));
}
return deserializeBody(deserializeBytes(bodyData), header);
}
@@ -211,8 +210,8 @@ public class Codec {
case REDIRECT_TO_CLIENT:
return OBJECT_MAPPER.readValue(bodyJsonString, RedirectInfo.class);
default:
- if (LOG.isWarnEnabled()) {
- LOG.warn("Invalidate TCP command: {}", command);
+ if (log.isWarnEnabled()) {
+ log.warn("Invalidate TCP command: {}", command);
}
return null;
}
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java
index 4976655be..4676d92cb 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java
@@ -34,19 +34,18 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.Channel;
+
+import lombok.extern.slf4j.Slf4j;
+
import inet.ipaddr.HostName;
import inet.ipaddr.IPAddress;
import inet.ipaddr.IPAddressString;
+@Slf4j
public class IPUtils {
- private static final Logger LOG = LoggerFactory.getLogger(IPUtils.class);
-
public static String getLocalAddress() {
// if the progress works under docker environment
// return the host ip about this docker located from environment value
@@ -105,7 +104,7 @@ public class IPUtils {
final InetAddress localHost = InetAddress.getLocalHost();
return normalizeHostAddress(localHost);
} catch (SocketException | UnknownHostException e) {
- LOG.error("socket or unknown host exception:", e);
+ log.error("socket or unknown host exception:", e);
}
return null;
}
@@ -205,7 +204,7 @@ public class IPUtils {
return new IPAddressString(new URL(url).getHost()).isValid();
}
} catch (Exception e) {
- LOG.warn("Invalid URL format url={}", url, e);
+ log.warn("Invalid URL format url={}", url, e);
return false;
}
return true;
@@ -220,7 +219,7 @@ public class IPUtils {
String host = new URL(url).getHost();
return new HostName(host).getAddress();
} catch (MalformedURLException e) {
- LOG.error("Invalid URL format url={}", url, e);
+ log.error("Invalid URL format url={}", url, e);
return null;
}
}
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/JsonUtils.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/JsonUtils.java
index 310bf9250..58a0571ee 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/JsonUtils.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/JsonUtils.java
@@ -25,7 +25,6 @@ import org.apache.eventmesh.common.exception.JsonException;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
-import java.text.SimpleDateFormat;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java
index f6b3ae9d4..0aae29c4e 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java
@@ -23,10 +23,7 @@ import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.enums.HttpMethod;
import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Consts;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelectorTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelectorTest.java
index 728244117..f01a13646 100644
--- a/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelectorTest.java
+++ b/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/RandomLoadBalanceSelectorTest.java
@@ -25,15 +25,15 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class RandomLoadBalanceSelectorTest {
private RandomLoadBalanceSelector<String> randomLoadBalanceSelector;
- private Logger logger = LoggerFactory.getLogger(RandomLoadBalanceSelectorTest.class);
-
@Before
public void befor() {
List<String> address = new ArrayList<>();
@@ -51,7 +51,7 @@ public class RandomLoadBalanceSelectorTest {
String select = randomLoadBalanceSelector.select();
addressToNum.put(select, addressToNum.getOrDefault(select, 0) + 1);
}
- addressToNum.forEach((key, value) -> logger.info("{} : {}", key, value));
+ addressToNum.forEach((key, value) -> log.info("{} : {}", key, value));
// just assert success if no exception
Assert.assertTrue(true);
}
@@ -60,4 +60,4 @@ public class RandomLoadBalanceSelectorTest {
public void testGetType() {
Assert.assertEquals(LoadBalanceType.RANDOM, randomLoadBalanceSelector.getType());
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRandomLoadBalanceSelectorTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRandomLoadBalanceSelectorTest.java
index beb5e659e..93b50ddf8 100644
--- a/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRandomLoadBalanceSelectorTest.java
+++ b/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRandomLoadBalanceSelectorTest.java
@@ -29,12 +29,12 @@ import java.util.stream.IntStream;
import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class WeightRandomLoadBalanceSelectorTest {
- private Logger logger = LoggerFactory.getLogger(WeightRandomLoadBalanceSelectorTest.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class WeightRandomLoadBalanceSelectorTest {
@Test
public void testSelect() throws Exception {
@@ -50,7 +50,7 @@ public class WeightRandomLoadBalanceSelectorTest {
.collect(groupingBy(Function.identity(), summingInt(i -> 1)));
addressToNum.forEach((key, value) -> {
- logger.info("{}: {}", key, value);
+ log.info("{}: {}", key, value);
});
System.out.printf(addressToNum.toString());
// the error less than 5%
@@ -78,7 +78,7 @@ public class WeightRandomLoadBalanceSelectorTest {
Assert.assertTrue(sameWeightGroup);
addressToNum.forEach((key, value) -> {
- logger.info("{}: {}", key, value);
+ log.info("{}: {}", key, value);
});
// the error less than 5%
Assert.assertTrue(Math.abs(addressToNum.get("192.168.0.3") - addressToNum.get("192.168.0.2")) < testRange / 20);
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelectorTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelectorTest.java
index cf43ee48e..e7c3d3f6e 100644
--- a/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelectorTest.java
+++ b/eventmesh-common/src/test/java/org/apache/eventmesh/common/loadbalance/WeightRoundRobinLoadBalanceSelectorTest.java
@@ -25,12 +25,13 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class WeightRoundRobinLoadBalanceSelectorTest {
- private Logger logger = LoggerFactory.getLogger(WeightRoundRobinLoadBalanceSelectorTest.class);
+import lombok.extern.slf4j.Slf4j;
+
+
+@Slf4j
+public class WeightRoundRobinLoadBalanceSelectorTest {
private WeightRoundRobinLoadBalanceSelector<String> weightRoundRobinLoadBalanceSelector;
@@ -51,7 +52,7 @@ public class WeightRoundRobinLoadBalanceSelectorTest {
addressToNum.put(select, addressToNum.getOrDefault(select, 0) + 1);
}
addressToNum.forEach((key, value) -> {
- logger.info("{}: {}", key, value);
+ log.info("{}: {}", key, value);
});
Assert.assertTrue(addressToNum.get("B") > addressToNum.get("A"));
Assert.assertTrue(addressToNum.get("C") > addressToNum.get("B"));
@@ -61,4 +62,4 @@ public class WeightRoundRobinLoadBalanceSelectorTest {
public void testGetType() {
Assert.assertEquals(LoadBalanceType.WEIGHT_ROUND_ROBIN, weightRoundRobinLoadBalanceSelector.getType());
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/ConsumerImpl.java b/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/ConsumerImpl.java
index 0301f0915..421221e81 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/ConsumerImpl.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/ConsumerImpl.java
@@ -35,14 +35,14 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import io.cloudevents.kafka.CloudEventDeserializer;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class ConsumerImpl {
- public static final Logger logger = LoggerFactory.getLogger(ConsumerImpl.class);
private final KafkaConsumer<String, CloudEvent> kafkaConsumer;
private final Properties properties;
private AtomicBoolean started = new AtomicBoolean(false);
@@ -106,7 +106,7 @@ public class ConsumerImpl {
List<String> topics = new ArrayList<>(topicsSet);
this.kafkaConsumer.subscribe(topics);
} catch (Exception e) {
- logger.error("Error while subscribing the Kafka consumer to topic: ", e);
+ log.error("Error while subscribing the Kafka consumer to topic: ", e);
throw new ConnectorRuntimeException(
String.format("Kafka consumer can't attach to %s.", topic));
}
@@ -120,7 +120,7 @@ public class ConsumerImpl {
List<String> topics = new ArrayList<>(topicsSet);
this.kafkaConsumer.subscribe(topics);
} catch (Exception e) {
- logger.error("Error while unsubscribing the Kafka consumer: ", e);
+ log.error("Error while unsubscribing the Kafka consumer: ", e);
throw new ConnectorRuntimeException(String.format("kafka push consumer fails to unsubscribe topic: %s", topic));
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerRunner.java b/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerRunner.java
index 300289254..eea95b1c0 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerRunner.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerRunner.java
@@ -30,13 +30,15 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class KafkaConsumerRunner implements Runnable {
- private final Logger logger = LoggerFactory.getLogger(KafkaConsumerRunner.class);
+
private final AtomicBoolean closed = new AtomicBoolean(false);
private final KafkaConsumer<String, CloudEvent> consumer;
private ConcurrentHashMap<CloudEvent, Long> cloudEventToOffset;
@@ -72,7 +74,7 @@ public class KafkaConsumerRunner implements Runnable {
switch (action) {
case CommitMessage:
// update offset
- logger.info("message commit, topic: {}, current offset:{}", topicName,
+ log.info("message commit, topic: {}, current offset:{}", topicName,
rec.offset());
break;
case ReconsumeLater:
@@ -80,7 +82,7 @@ public class KafkaConsumerRunner implements Runnable {
break;
case ManualAck:
// update offset
- logger
+ log
.info("message ack, topic: {}, current offset:{}", topicName, rec.offset());
break;
default:
@@ -92,7 +94,7 @@ public class KafkaConsumerRunner implements Runnable {
listener.consume(cloudEvent, eventMeshAsyncConsumeContext);
}
} catch (Exception e) {
- logger.info("Error parsing cloudevents: {}", e.getMessage());
+ log.info("Error parsing cloudevents: {}", e.getMessage());
}
});
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/DefaultConsumer.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/DefaultConsumer.java
index 9ab853f50..afd542c36 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/DefaultConsumer.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/DefaultConsumer.java
@@ -27,8 +27,6 @@ import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.ListenableFuture;
import org.asynchttpclient.Response;
import org.asynchttpclient.util.HttpConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
@@ -37,8 +35,6 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class DefaultConsumer {
- private static final Logger LOG = LoggerFactory.getLogger(DefaultConsumer.class);
-
private transient AsyncHttpClient asyncHttpClient;
@@ -63,7 +59,7 @@ public class DefaultConsumer {
if (response.getStatusCode() == HttpConstants.ResponseStatusCodes.OK_200) {
responseBody = response.getResponseBody();
- LOG.info(responseBody);
+ log.info(responseBody);
return responseBody;
}
throw new IllegalStateException("HTTP response code error: " + response.getStatusCode());
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
index cc41ae448..891f9b47f 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
@@ -26,16 +26,15 @@ import org.apache.eventmesh.connector.knative.config.ClientConfiguration;
import java.util.List;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
+
+import lombok.extern.slf4j.Slf4j;
+
@Config(field = "clientConfiguration")
+@Slf4j
public class KnativeConsumerImpl implements Consumer {
- private static final Logger LOG = LoggerFactory.getLogger(KnativeConsumerImpl.class);
-
private transient PullConsumerImpl pullConsumer;
@@ -44,8 +43,6 @@ public class KnativeConsumerImpl implements Consumer {
*/
private ClientConfiguration clientConfiguration;
- private static final Logger logger = LoggerFactory.getLogger(KnativeConsumerImpl.class);
-
@Override
public synchronized void init(Properties properties) throws Exception {
// Load parameters from properties file:
@@ -65,7 +62,7 @@ public class KnativeConsumerImpl implements Consumer {
try {
pullConsumer.unsubscribe(topic);
} catch (Exception e) {
- LOG.error("unsubscribe error", e);
+ log.error("unsubscribe error", e);
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/PullConsumerImpl.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/PullConsumerImpl.java
index 23e2d92ff..937831648 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/PullConsumerImpl.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/PullConsumerImpl.java
@@ -36,17 +36,15 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
import com.google.common.collect.Lists;
-public class PullConsumerImpl {
-
- private static final Logger LOG = LoggerFactory.getLogger(PullConsumerImpl.class);
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
+public class PullConsumerImpl {
private final transient DefaultConsumer defaultConsumer;
// Topics to subscribe:
@@ -84,12 +82,12 @@ public class PullConsumerImpl {
subscriptionInner.put(item.getTopic(),
defaultConsumer.pullMessage(item.getTopic(), properties.getProperty("serviceAddr")));
} catch (Exception e) {
- LOG.error("store received message error", e);
+ log.error("store received message error", e);
}
}
);
} catch (Exception e) {
- LOG.error("other error", e);
+ log.error("other error", e);
}
}
@@ -98,7 +96,7 @@ public class PullConsumerImpl {
// Unsubscribe topic:
topicList.remove(topic);
} catch (Exception e) {
- LOG.error("unsubscribe topic error", e);
+ log.error("unsubscribe topic error", e);
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/AbstractProducer.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/AbstractProducer.java
index 93eb82a08..02eba59c6 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/AbstractProducer.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/AbstractProducer.java
@@ -26,14 +26,14 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import org.asynchttpclient.AsyncHttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
-public abstract class AbstractProducer implements Producer {
- protected static final Logger LOG = LoggerFactory.getLogger(AbstractProducer.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public abstract class AbstractProducer implements Producer {
protected final transient AtomicBoolean started = new AtomicBoolean(false);
protected final transient Properties properties;
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java
index d4a2f128c..85ccca208 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java
@@ -19,17 +19,16 @@ package org.apache.eventmesh.connector.rabbitmq.client;
import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.rabbitmq.client.BuiltinExchangeType;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class RabbitmqClient {
- private static final Logger logger = LoggerFactory.getLogger(RabbitmqClient.class);
private final RabbitmqConnectionFactory rabbitmqConnectionFactory;
@@ -97,7 +96,7 @@ public class RabbitmqClient {
routingKey = builtinExchangeType.getType().equals(BuiltinExchangeType.FANOUT.getType()) ? "" : routingKey;
channel.queueBind(queueName, exchangeName, routingKey);
} catch (Exception ex) {
- logger.error("[RabbitmqClient] binding happen exception.", ex);
+ log.error("[RabbitmqClient] binding happen exception.", ex);
}
}
@@ -113,7 +112,7 @@ public class RabbitmqClient {
try {
channel.queueUnbind(queueName, exchangeName, routingKey);
} catch (Exception ex) {
- logger.error("[RabbitmqClient] unbinding happen exception.", ex);
+ log.error("[RabbitmqClient] unbinding happen exception.", ex);
}
}
@@ -127,7 +126,7 @@ public class RabbitmqClient {
try {
connection.close();
} catch (Exception ex) {
- logger.error("[RabbitmqClient] connection close happen exception.", ex);
+ log.error("[RabbitmqClient] connection close happen exception.", ex);
}
}
}
@@ -142,7 +141,7 @@ public class RabbitmqClient {
try {
channel.close();
} catch (Exception ex) {
- logger.error("[RabbitmqClient] channel close happen exception.", ex);
+ log.error("[RabbitmqClient] channel close happen exception.", ex);
}
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumer.java b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumer.java
index 6e1a77d60..e3d248718 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumer.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumer.java
@@ -30,18 +30,19 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.ThreadPoolExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
+import lombok.extern.slf4j.Slf4j;
+
@Config(field = "configurationHolder")
+
+@Slf4j
public class RabbitmqConsumer implements Consumer {
- private static final Logger logger = LoggerFactory.getLogger(RabbitmqConsumer.class);
private RabbitmqConnectionFactory rabbitmqConnectionFactory = new RabbitmqConnectionFactory();
@@ -123,7 +124,7 @@ public class RabbitmqConsumer implements Consumer {
configurationHolder.getRoutingKey(), configurationHolder.getQueueName());
rabbitmqConsumerHandler.stop();
} catch (Exception ex) {
- logger.error("[RabbitmqConsumer] unsubscribe happen exception.", ex);
+ log.error("[RabbitmqConsumer] unsubscribe happen exception.", ex);
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerHandler.java b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerHandler.java
index 0d53bb1b3..c22624be2 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerHandler.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerHandler.java
@@ -25,17 +25,16 @@ import org.apache.eventmesh.connector.rabbitmq.config.ConfigurationHolder;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.GetResponse;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class RabbitmqConsumerHandler implements Runnable {
- private static final Logger logger = LoggerFactory.getLogger(RabbitmqConsumerHandler.class);
private final Channel channel;
private final ConfigurationHolder configurationHolder;
@@ -58,7 +57,7 @@ public class RabbitmqConsumerHandler implements Runnable {
final EventMeshAsyncConsumeContext consumeContext = new EventMeshAsyncConsumeContext() {
@Override
public void commit(EventMeshAction action) {
- logger.info("[RabbitmqConsumerHandler] Rabbitmq consumer context commit.");
+ log.info("[RabbitmqConsumerHandler] Rabbitmq consumer context commit.");
}
};
if (eventListener != null) {
@@ -69,7 +68,7 @@ public class RabbitmqConsumerHandler implements Runnable {
}
}
} catch (Exception ex) {
- logger.error("[RabbitmqConsumerHandler] thread run happen exception.", ex);
+ log.error("[RabbitmqConsumerHandler] thread run happen exception.", ex);
}
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducer.java b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducer.java
index f6e4e0041..2833aec4d 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducer.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducer.java
@@ -34,19 +34,17 @@ import org.apache.eventmesh.connector.rabbitmq.utils.ByteArrayUtils;
import java.util.Optional;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
+import lombok.extern.slf4j.Slf4j;
+
@Config(field = "configurationHolder")
+@Slf4j
public class RabbitmqProducer implements Producer {
- private static final Logger logger = LoggerFactory.getLogger(RabbitmqProducer.class);
-
private RabbitmqConnectionFactory rabbitmqConnectionFactory = new RabbitmqConnectionFactory();
private RabbitmqClient rabbitmqClient;
@@ -114,7 +112,7 @@ public class RabbitmqProducer implements Producer {
sendCallback.onSuccess(sendResult);
}
} catch (Exception ex) {
- logger.error("[RabbitmqProducer] publish happen exception.", ex);
+ log.error("[RabbitmqProducer] publish happen exception.", ex);
sendCallback.onException(
OnExceptionContext.builder()
.topic(cloudEvent.getSubject())
@@ -135,7 +133,7 @@ public class RabbitmqProducer implements Producer {
configurationHolder.getRoutingKey(), data);
}
} catch (Exception ex) {
- logger.error("[RabbitmqProducer] sendOneway happen exception.", ex);
+ log.error("[RabbitmqProducer] sendOneway happen exception.", ex);
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumer.java b/eventmesh-connector-plugin/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumer.java
index 511b0339b..2abd68e52 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumer.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumer.java
@@ -29,16 +29,16 @@ import java.util.Properties;
import org.redisson.Redisson;
import org.redisson.api.listener.MessageListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
import com.google.common.base.Preconditions;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class RedisConsumer implements Consumer {
- private static final Logger logger = LoggerFactory.getLogger(RedisConsumer.class);
private Redisson redisson;
@@ -120,7 +120,7 @@ public class RedisConsumer implements Consumer {
final EventMeshAsyncConsumeContext consumeContext = new EventMeshAsyncConsumeContext() {
@Override
public void commit(EventMeshAction action) {
- logger.info("channel: {} consumer event: {} finish action: {}",
+ log.info("channel: {} consumer event: {} finish action: {}",
channel, msg.getId(), action);
}
};
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java
index 245694924..db6e1632a 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java
@@ -29,9 +29,6 @@ import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
import java.util.List;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import lombok.extern.slf4j.Slf4j;
@@ -40,8 +37,6 @@ import lombok.extern.slf4j.Slf4j;
@Config(field = "clientConfiguration")
public class RocketMQConsumerImpl implements Consumer {
- public Logger messageLogger = LoggerFactory.getLogger("message");
-
private PushConsumerImpl pushConsumer;
private ClientConfiguration clientConfiguration;
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java
index 0d32ba27d..9a7190a48 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java
@@ -25,13 +25,11 @@ import org.apache.rocketmq.common.message.MessageExt;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public abstract class EventMeshMessageListenerConcurrently implements MessageListenerConcurrently {
- private static final Logger LOG = LoggerFactory.getLogger(EventMeshMessageListenerConcurrently.class);
-
@Override
public ConsumeConcurrentlyStatus consumeMessage(final List<MessageExt> msgs,
final ConsumeConcurrentlyContext context) {
@@ -58,11 +56,11 @@ public abstract class EventMeshMessageListenerConcurrently implements MessageLis
return status;
}
} catch (Throwable e) {
- LOG.info("handleMessage fail", e);
+ log.info("handleMessage fail", e);
return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
}
} catch (Throwable e) {
- LOG.info("handleMessage fail", e);
+ log.info("handleMessage fail", e);
return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
}
//return status;
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/CloudEventUtils.java b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/CloudEventUtils.java
index 02ce264b1..c3e84bb6b 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/CloudEventUtils.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/CloudEventUtils.java
@@ -30,12 +30,12 @@ import java.util.Objects;
import java.util.function.BiConsumer;
import java.util.function.Function;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class CloudEventUtils {
- private static final Logger LOGGER = LoggerFactory.getLogger(CloudEventUtils.class);
public static SendResult convertSendResult(
org.apache.rocketmq.client.producer.SendResult rmqResult) {
@@ -125,7 +125,7 @@ public class CloudEventUtils {
message.getProperties().forEach((k, v) -> MessageAccessor.putProperty(rmqMessageExt, k, v));
} catch (Exception e) {
- LOGGER.error("Error with msgConvertExt", e);
+ log.error("Error with msgConvertExt", e);
e.printStackTrace();
}
return rmqMessageExt;
diff --git a/eventmesh-connector-plugin/eventmesh-connector-standalone/build.gradle b/eventmesh-connector-plugin/eventmesh-connector-standalone/build.gradle
index 51510087f..952192579 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-standalone/build.gradle
+++ b/eventmesh-connector-plugin/eventmesh-connector-standalone/build.gradle
@@ -18,4 +18,7 @@
dependencies {
implementation project(":eventmesh-common")
implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
+
+ compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/HistoryMessageClearTask.java b/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/HistoryMessageClearTask.java
index f8aece4b3..9b1b33df5 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/HistoryMessageClearTask.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/HistoryMessageClearTask.java
@@ -25,17 +25,15 @@ import org.apache.eventmesh.connector.standalone.broker.model.TopicMetadata;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import lombok.extern.slf4j.Slf4j;
/**
* This task used to clear the history message, the element in message queue can only be cleaned by this task.
*/
+@Slf4j
public class HistoryMessageClearTask implements Runnable {
-
- private final Logger logger = LoggerFactory.getLogger(HistoryMessageClearTask.class);
-
private final ConcurrentHashMap<TopicMetadata, MessageQueue> messageContainer;
/**
@@ -63,7 +61,7 @@ public class HistoryMessageClearTask implements Runnable {
try {
ThreadUtils.sleepWithThrowException(1, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- logger.error("Thread is interrupted, thread name: {}", Thread.currentThread().getName(), e);
+ log.error("Thread is interrupted, thread name: {}", Thread.currentThread().getName(), e);
Thread.currentThread().interrupt();
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/SubScribeTask.java b/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/SubScribeTask.java
index 5e9dcfd70..9e3715b68 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/SubScribeTask.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/SubScribeTask.java
@@ -26,11 +26,12 @@ import org.apache.eventmesh.connector.standalone.broker.StandaloneBroker;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class SubScribeTask implements Runnable {
private String topicName;
@@ -40,8 +41,6 @@ public class SubScribeTask implements Runnable {
private AtomicInteger offset;
- private final Logger logger = LoggerFactory.getLogger(SubScribeTask.class);
-
public SubScribeTask(String topicName,
StandaloneBroker standaloneBroker,
EventListener listener) {
@@ -55,7 +54,7 @@ public class SubScribeTask implements Runnable {
public void run() {
while (isRunning) {
try {
- logger.debug("execute subscribe task, topic: {}, offset: {}", topicName, offset);
+ log.debug("execute subscribe task, topic: {}, offset: {}", topicName, offset);
if (offset == null) {
CloudEvent message = standaloneBroker.getMessage(topicName);
if (message != null) {
@@ -77,7 +76,7 @@ public class SubScribeTask implements Runnable {
switch (action) {
case CommitMessage:
// update offset
- logger.info("message commit, topic: {}, current offset:{}", topicName,
+ log.info("message commit, topic: {}, current offset:{}", topicName,
offset.get());
break;
case ReconsumeLater:
@@ -86,7 +85,7 @@ public class SubScribeTask implements Runnable {
case ManualAck:
// update offset
offset.incrementAndGet();
- logger
+ log
.info("message ack, topic: {}, current offset:{}", topicName, offset.get());
break;
default:
@@ -99,13 +98,13 @@ public class SubScribeTask implements Runnable {
}
} catch (Exception ex) {
- logger.error("consumer error, topic: {}, offset: {}", topicName, offset == null ? null : offset.get(),
+ log.error("consumer error, topic: {}, offset: {}", topicName, offset == null ? null : offset.get(),
ex);
}
try {
ThreadUtils.sleepWithThrowException(1, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- logger.error("Thread is interrupted, topic: {}, offset: {} thread name: {}",
+ log.error("Thread is interrupted, topic: {}, offset: {} thread name: {}",
topicName, offset == null ? null : offset.get(), Thread.currentThread().getName(), e);
Thread.currentThread().interrupt();
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducer.java b/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducer.java
index 4998338a6..b09c8ba24 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducer.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducer.java
@@ -28,16 +28,14 @@ import org.apache.eventmesh.connector.standalone.broker.model.MessageEntity;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import com.google.common.base.Preconditions;
-public class StandaloneProducer {
+import lombok.extern.slf4j.Slf4j;
- private Logger logger = LoggerFactory.getLogger(StandaloneProducer.class);
+@Slf4j
+public class StandaloneProducer {
private StandaloneBroker standaloneBroker;
@@ -77,7 +75,7 @@ public class StandaloneProducer {
sendResult.setMessageId(String.valueOf(messageEntity.getOffset()));
return sendResult;
} catch (Exception e) {
- logger.error("send message error, topic: {}", cloudEvent.getSubject(), e);
+ log.error("send message error, topic: {}", cloudEvent.getSubject(), e);
throw new ConnectorRuntimeException(
String.format("Send message error, topic: %s", cloudEvent.getSubject()));
}
diff --git a/eventmesh-registry-plugin/eventmesh-registry-consul/build.gradle b/eventmesh-registry-plugin/eventmesh-registry-consul/build.gradle
index 53d7f67b4..2fde24856 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-consul/build.gradle
+++ b/eventmesh-registry-plugin/eventmesh-registry-consul/build.gradle
@@ -21,4 +21,7 @@ dependencies {
implementation project(":eventmesh-registry-plugin:eventmesh-registry-api")
implementation project(":eventmesh-common")
testImplementation "org.mockito:mockito-core"
+
+ compileOnly 'org.projectlombok:lombok:1.18.22'
+ annotationProcessor 'org.projectlombok:lombok:1.18.22'
}
diff --git a/eventmesh-registry-plugin/eventmesh-registry-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulRegistryService.java b/eventmesh-registry-plugin/eventmesh-registry-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulRegistryService.java
index f975cbabd..61f6450f1 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulRegistryService.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulRegistryService.java
@@ -33,9 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.ecwid.consul.v1.ConsulClient;
import com.ecwid.consul.v1.ConsulRawClient;
import com.ecwid.consul.v1.agent.model.NewService;
@@ -43,12 +40,13 @@ import com.ecwid.consul.v1.agent.model.Service;
import com.ecwid.consul.v1.health.HealthServicesRequest;
import com.ecwid.consul.v1.health.model.HealthService;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class ConsulRegistryService implements RegistryService {
public static final String IP_PORT_SEPARATOR = ":";
- private static final Logger logger = LoggerFactory.getLogger(ConsulRegistryService.class);
-
private static final AtomicBoolean INIT_STATUS = new AtomicBoolean(false);
private static final AtomicBoolean START_STATUS = new AtomicBoolean(false);
@@ -108,7 +106,7 @@ public class ConsulRegistryService implements RegistryService {
} catch (Exception e) {
throw new RegistryException(e.getMessage());
}
- logger.info("EventMesh successfully registered to consul");
+ log.info("EventMesh successfully registered to consul");
return true;
}
@@ -120,7 +118,7 @@ public class ConsulRegistryService implements RegistryService {
} catch (Exception e) {
throw new RegistryException(e.getMessage());
}
- logger.info("EventMesh successfully unregistered to consul");
+ log.info("EventMesh successfully unregistered to consul");
return true;
}
diff --git a/eventmesh-registry-plugin/eventmesh-registry-etcd/build.gradle b/eventmesh-registry-plugin/eventmesh-registry-etcd/build.gradle
index 153c7555b..e44cbab11 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-etcd/build.gradle
+++ b/eventmesh-registry-plugin/eventmesh-registry-etcd/build.gradle
@@ -20,4 +20,7 @@ dependencies {
implementation project(":eventmesh-registry-plugin:eventmesh-registry-api")
implementation project(":eventmesh-common")
testImplementation "org.mockito:mockito-core"
+
+ compileOnly 'org.projectlombok:lombok:1.18.22'
+ annotationProcessor 'org.projectlombok:lombok:1.18.22'
}
diff --git a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
index 38a297df7..2870cd039 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
@@ -28,18 +28,16 @@ import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.ClientBuilder;
import io.etcd.jetcd.options.LeaseOption;
-public class EtcdClientFactory {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger logger = LoggerFactory.getLogger(EtcdClientFactory.class);
+@Slf4j
+public class EtcdClientFactory {
private static final Map<String, EtcdLeaseId> etcdLeaseIdMap = new ConcurrentHashMap<>();
@@ -82,7 +80,7 @@ public class EtcdClientFactory {
etcdLeaseIdMap.put(serverAddr, etcdLeaseId);
} catch (Throwable e) {
- logger.error("createClient failed, address: {}", serverAddr, e);
+ log.error("createClient failed, address: {}", serverAddr, e);
throw new RegistryException("createClient failed", e);
}
return etcdLeaseId.getClientWrapper();
@@ -90,7 +88,7 @@ public class EtcdClientFactory {
public static void renewalLeaseId(EtcdLeaseId etcdLeaseId) {
- logger.info("renewal of contract. server url: {}", etcdLeaseId.getUrl());
+ log.info("renewal of contract. server url: {}", etcdLeaseId.getUrl());
Client client = etcdLeaseId.getClientWrapper();
try {
long ttl = client.getLeaseClient().timeToLive(etcdLeaseId.getLeaseId(), LeaseOption.DEFAULT).get().getTTl();
@@ -100,7 +98,7 @@ public class EtcdClientFactory {
etcdLeaseId.setLeaseId(leaseId);
}
} catch (Throwable e) {
- logger.error("renewal error, server url: {}", etcdLeaseId.getUrl(), e);
+ log.error("renewal error, server url: {}", etcdLeaseId.getUrl(), e);
client.getLeaseClient().keepAlive(System.currentTimeMillis(), etcdLeaseId.getEtcdStreamObserver());
}
}
diff --git a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdStreamObserver.java b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdStreamObserver.java
index 6b5efc79e..91a403397 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdStreamObserver.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdStreamObserver.java
@@ -17,16 +17,14 @@
package org.apache.eventmesh.registry.etcd.factory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.etcd.jetcd.lease.LeaseKeepAliveResponse;
import io.grpc.stub.StreamObserver;
-public class EtcdStreamObserver implements StreamObserver<LeaseKeepAliveResponse> {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger logger = LoggerFactory.getLogger(EtcdStreamObserver.class);
+@Slf4j
+public class EtcdStreamObserver implements StreamObserver<LeaseKeepAliveResponse> {
private EtcdLeaseId etcdLeaseId;
@@ -36,12 +34,12 @@ public class EtcdStreamObserver implements StreamObserver<LeaseKeepAliveResponse
@Override
public void onError(Throwable t) {
- logger.debug("EtcdStreamObserver lease renewal Exception", t);
+ log.debug("EtcdStreamObserver lease renewal Exception", t);
}
@Override
public void onCompleted() {
- logger.info("EtcdStreamObserver completed");
+ log.info("EtcdStreamObserver completed");
}
public void setEtcdLeaseId(EtcdLeaseId etcdLeaseId) {
diff --git a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java
index cb0952ac6..57622a15f 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java
@@ -43,18 +43,17 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.KeyValue;
import io.etcd.jetcd.options.GetOption;
import io.etcd.jetcd.options.PutOption;
-public class EtcdRegistryService implements RegistryService {
- private static final Logger logger = LoggerFactory.getLogger(EtcdRegistryService.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class EtcdRegistryService implements RegistryService {
private static final AtomicBoolean INIT_STATUS = new AtomicBoolean(false);
@@ -116,7 +115,7 @@ public class EtcdRegistryService implements RegistryService {
etcdRegistryMonitorExecutorService.scheduleAtFixedRate(new EventMeshEtcdRegisterMonitor(),
15000L, 15000L, TimeUnit.MILLISECONDS);
} catch (Exception e) {
- logger.error("[EtcdRegistryService][start] error", e);
+ log.error("[EtcdRegistryService][start] error", e);
throw new RegistryException(e.getMessage());
}
}
@@ -133,10 +132,10 @@ public class EtcdRegistryService implements RegistryService {
etcdRegistryMonitorExecutorService.shutdown();
}
} catch (Exception e) {
- logger.error("[EtcdRegistryService][shutdown] error", e);
+ log.error("[EtcdRegistryService][shutdown] error", e);
throw new RegistryException(e.getMessage());
}
- logger.info("EtcdRegistryService closed");
+ log.info("EtcdRegistryService closed");
}
@Override
@@ -157,7 +156,7 @@ public class EtcdRegistryService implements RegistryService {
}
}
} catch (Exception e) {
- logger.error("[EtcdRegistryService][findEventMeshInfoByCluster] error, clusterName: {}", clusterName, e);
+ log.error("[EtcdRegistryService][findEventMeshInfoByCluster] error, clusterName: {}", clusterName, e);
throw new RegistryException(e.getMessage());
}
return eventMeshDataInfoList;
@@ -168,7 +167,7 @@ public class EtcdRegistryService implements RegistryService {
try {
return findEventMeshInfoByCluster(null);
} catch (Exception e) {
- logger.error("[EtcdRegistryService][findEventMeshInfoByCluster] error", e);
+ log.error("[EtcdRegistryService][findEventMeshInfoByCluster] error", e);
throw new RegistryException(e.getMessage());
}
}
@@ -203,11 +202,11 @@ public class EtcdRegistryService implements RegistryService {
etcdClient.getKVClient().put(etcdKey, etcdValue, PutOption.newBuilder().withLeaseId(getLeaseId()).build());
eventMeshRegisterInfoMap.put(eventMeshName, eventMeshRegisterInfo);
- logger.info("EventMesh successfully registered to etcd, eventMeshClusterName: {}, eventMeshName: {}",
+ log.info("EventMesh successfully registered to etcd, eventMeshClusterName: {}, eventMeshName: {}",
eventMeshClusterName, eventMeshName);
return true;
} catch (Exception e) {
- logger.error("[EtcdRegistryService][register] error, eventMeshClusterName: {}, eventMeshName: {}",
+ log.error("[EtcdRegistryService][register] error, eventMeshClusterName: {}, eventMeshName: {}",
eventMeshClusterName, eventMeshName, e);
throw new RegistryException(e.getMessage());
}
@@ -222,11 +221,11 @@ public class EtcdRegistryService implements RegistryService {
eventMeshUnRegisterInfo.getEndPoint());
etcdClient.getKVClient().delete(etcdKey);
eventMeshRegisterInfoMap.remove(eventMeshName);
- logger.info("EventMesh successfully logout to etcd, eventMeshClusterName: {}, eventMeshName: {}",
+ log.info("EventMesh successfully logout to etcd, eventMeshClusterName: {}, eventMeshName: {}",
eventMeshClusterName, eventMeshName);
return true;
} catch (Exception e) {
- logger.error("[EtcdRegistryService][unRegister] error, eventMeshClusterName: {}, eventMeshName: {}",
+ log.error("[EtcdRegistryService][unRegister] error, eventMeshClusterName: {}, eventMeshName: {}",
eventMeshClusterName, eventMeshName, e);
throw new RegistryException(e.getMessage());
}
@@ -267,10 +266,10 @@ public class EtcdRegistryService implements RegistryService {
try {
keyValues = etcdClient.getKVClient().get(etcdKey).get().getKvs();
} catch (InterruptedException | ExecutionException e) {
- logger.error("get etcdKey[{}] failed", etcdKey, e);
+ log.error("get etcdKey[{}] failed", etcdKey, e);
}
if (CollectionUtils.isEmpty(keyValues)) {
- logger.warn("eventMeshRegisterInfo [{}] is not matched in Etcd , try to register again",
+ log.warn("eventMeshRegisterInfo [{}] is not matched in Etcd , try to register again",
eventMeshRegisterInfo.getEventMeshName());
EtcdClientFactory.renewalLeaseId(EtcdClientFactory.getEtcdLeaseId(serverAddr));
register(eventMeshRegisterInfo);
diff --git a/eventmesh-registry-plugin/eventmesh-registry-nacos/build.gradle b/eventmesh-registry-plugin/eventmesh-registry-nacos/build.gradle
index 21efe6ec6..5c190c473 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-nacos/build.gradle
+++ b/eventmesh-registry-plugin/eventmesh-registry-nacos/build.gradle
@@ -20,4 +20,7 @@ dependencies {
implementation project(":eventmesh-registry-plugin:eventmesh-registry-api")
implementation project(":eventmesh-common")
testImplementation "org.mockito:mockito-core"
+
+ compileOnly 'org.projectlombok:lombok:1.18.22'
+ annotationProcessor 'org.projectlombok:lombok:1.18.22'
}
diff --git a/eventmesh-registry-plugin/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosRegistryService.java b/eventmesh-registry-plugin/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosRegistryService.java
index 428400f94..b8b60d78e 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosRegistryService.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosRegistryService.java
@@ -37,18 +37,16 @@ import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.NacosNamingService;
import com.alibaba.nacos.common.utils.CollectionUtils;
-public class NacosRegistryService implements RegistryService {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger logger = LoggerFactory.getLogger(NacosRegistryService.class);
+@Slf4j
+public class NacosRegistryService implements RegistryService {
private static final AtomicBoolean INIT_STATUS = new AtomicBoolean(false);
@@ -100,7 +98,7 @@ public class NacosRegistryService implements RegistryService {
properties.setProperty(NacosConstant.PASSWORD, password);
namingService = new NacosNamingService(properties);
} catch (NacosException e) {
- logger.error("[NacosRegistryService][start] error", e);
+ log.error("[NacosRegistryService][start] error", e);
throw new RegistryException(e.getMessage());
}
}
@@ -112,10 +110,10 @@ public class NacosRegistryService implements RegistryService {
try {
namingService.shutDown();
} catch (NacosException e) {
- logger.error("[NacosRegistryService][shutdown] error", e);
+ log.error("[NacosRegistryService][shutdown] error", e);
throw new RegistryException(e.getMessage());
}
- logger.info("NacosRegistryService close");
+ log.info("NacosRegistryService close");
}
@Override
@@ -143,7 +141,7 @@ public class NacosRegistryService implements RegistryService {
eventMeshDataInfoList.add(eventMeshDataInfo);
}
} catch (NacosException e) {
- logger.error("[NacosRegistryService][findEventMeshInfoByCluster] error", e);
+ log.error("[NacosRegistryService][findEventMeshInfoByCluster] error", e);
throw new RegistryException(e.getMessage());
}
@@ -176,7 +174,7 @@ public class NacosRegistryService implements RegistryService {
eventMeshDataInfoList.add(eventMeshDataInfo);
}
} catch (NacosException e) {
- logger.error("[NacosRegistryService][findEventMeshInfoByCluster] error", e);
+ log.error("[NacosRegistryService][findEventMeshInfoByCluster] error", e);
throw new RegistryException(e.getMessage());
}
@@ -221,10 +219,10 @@ public class NacosRegistryService implements RegistryService {
+ NacosConstant.GROUP, instance);
eventMeshRegisterInfoMap.put(eventMeshName, eventMeshRegisterInfo);
} catch (NacosException e) {
- logger.error("[NacosRegistryService][register] error", e);
+ log.error("[NacosRegistryService][register] error", e);
throw new RegistryException(e.getMessage());
}
- logger.info("EventMesh successfully registered to nacos");
+ log.info("EventMesh successfully registered to nacos");
return true;
}
@@ -241,10 +239,10 @@ public class NacosRegistryService implements RegistryService {
namingService.deregisterInstance(eventMeshName, eventMeshUnRegisterInfo.getProtocolType()
+ "-" + NacosConstant.GROUP, instance);
} catch (NacosException e) {
- logger.error("[NacosRegistryService][unRegister] error", e);
+ log.error("[NacosRegistryService][unRegister] error", e);
throw new RegistryException(e.getMessage());
}
- logger.info("EventMesh successfully logout to nacos");
+ log.info("EventMesh successfully logout to nacos");
return true;
}
diff --git a/eventmesh-registry-plugin/eventmesh-registry-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java b/eventmesh-registry-plugin/eventmesh-registry-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java
index 28f526a95..e4f9d33aa 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java
@@ -46,14 +46,12 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class ZookeeperRegistryService implements RegistryService {
- private static final Logger logger = LoggerFactory.getLogger(ZookeeperRegistryService.class);
-
private static final AtomicBoolean INIT_STATUS = new AtomicBoolean(false);
private static final AtomicBoolean START_STATUS = new AtomicBoolean(false);
@@ -68,7 +66,7 @@ public class ZookeeperRegistryService implements RegistryService {
public void init() throws RegistryException {
boolean update = INIT_STATUS.compareAndSet(false, true);
if (!update) {
- logger.warn("[ZookeeperRegistryService] has been init");
+ log.warn("[ZookeeperRegistryService] has been init");
return;
}
eventMeshRegisterInfoMap = new HashMap<>(ConfigurationContextUtil.KEYS.size());
@@ -89,7 +87,7 @@ public class ZookeeperRegistryService implements RegistryService {
public void start() throws RegistryException {
boolean update = START_STATUS.compareAndSet(false, true);
if (!update) {
- logger.warn("[ZookeeperRegistryService] has been start");
+ log.warn("[ZookeeperRegistryService] has been start");
return;
}
try {
@@ -115,7 +113,7 @@ public class ZookeeperRegistryService implements RegistryService {
} catch (Exception e) {
throw new RegistryException("ZookeeperRegistry shutdown failed", e);
}
- logger.info("ZookeeperRegistryService closed");
+ log.info("ZookeeperRegistryService closed");
}
@Override
@@ -148,7 +146,7 @@ public class ZookeeperRegistryService implements RegistryService {
.storingStatIn(stat)
.forPath(instancePath);
} catch (Exception e) {
- logger.warn("[ZookeeperRegistryService][findEventMeshInfoByCluster] failed for path: {}", instancePath, e);
+ log.warn("[ZookeeperRegistryService][findEventMeshInfoByCluster] failed for path: {}", instancePath, e);
continue;
}
@@ -197,7 +195,7 @@ public class ZookeeperRegistryService implements RegistryService {
.storingStatIn(stat)
.forPath(instancePath);
} catch (Exception e) {
- logger.warn("[ZookeeperRegistryService][findAllEventMeshInfo] failed for path: {}", instancePath, e);
+ log.warn("[ZookeeperRegistryService][findAllEventMeshInfo] failed for path: {}", instancePath, e);
continue;
}
@@ -265,7 +263,7 @@ public class ZookeeperRegistryService implements RegistryService {
} catch (Exception e) {
throw new RegistryException("ZookeeperRegistry register failed", e);
}
- logger.info("EventMesh successfully registered to zookeeper");
+ log.info("EventMesh successfully registered to zookeeper");
return true;
}
@@ -282,7 +280,7 @@ public class ZookeeperRegistryService implements RegistryService {
} catch (Exception e) {
throw new RegistryException("ZookeeperRegistry unRegister failed", e);
}
- logger.info("EventMesh successfully logout to zookeeper");
+ log.info("EventMesh successfully logout to zookeeper");
return true;
}
diff --git a/eventmesh-runtime/build.gradle b/eventmesh-runtime/build.gradle
index 9685f1ca5..684102e60 100644
--- a/eventmesh-runtime/build.gradle
+++ b/eventmesh-runtime/build.gradle
@@ -82,4 +82,7 @@ dependencies {
testImplementation "org.powermock:powermock-module-junit4"
testImplementation "org.powermock:powermock-api-mockito2"
testImplementation "commons-io:commons-io"
+
+ testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/acl/Acl.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/acl/Acl.java
index c7facea48..a194d245b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/acl/Acl.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/acl/Acl.java
@@ -30,9 +30,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import lombok.extern.slf4j.Slf4j;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java
index 4b04c9200..aa9fc9571 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java
@@ -52,18 +52,16 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpServer;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
@SuppressWarnings("restriction")
+@Slf4j
public class ClientManageController {
- private static final Logger logger = LoggerFactory.getLogger(ClientManageController.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
private final transient EventMeshHTTPServer eventMeshHTTPServer;
@@ -102,7 +100,7 @@ public class ClientManageController {
adminController.run(server);
server.start();
- logger.info("ClientManageController start success, port:{}", port);
+ log.info("ClientManageController start success, port:{}", port);
}
private void initClientHandler(EventMeshTCPServer eventMeshTCPServer,
@@ -143,4 +141,4 @@ public class ClientManageController {
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
index 01510e8d3..f8262f4e2 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
@@ -31,17 +31,17 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The config handler
*/
+@Slf4j
@EventHttpHandler(path = "/configuration")
public class ConfigurationHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(ConfigurationHandler.class);
private final EventMeshTCPConfiguration eventMeshTCPConfiguration;
private final EventMeshHTTPConfiguration eventMeshHTTPConfiguration;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java
index fa5dd0ac8..b43df2fcf 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java
@@ -28,17 +28,16 @@ import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
import java.io.IOException;
import java.io.OutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
@SuppressWarnings("restriction")
+@Slf4j
@EventHttpHandler(path = "/webhook/deleteWebHookConfig")
public class DeleteWebHookConfigHandler extends AbstractHttpHandler {
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
private final WebHookConfigOperation operation;
public DeleteWebHookConfigHandler(WebHookConfigOperation operation, HttpHandlerManager httpHandlerManager) {
@@ -61,7 +60,7 @@ public class DeleteWebHookConfigHandler extends AbstractHttpHandler {
String result = 1 == code ? "deleteWebHookConfig Succeed!" : "deleteWebHookConfig Failed!";
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("get WebHookConfigOperation implementation Failed.", e);
+ log.error("get WebHookConfigOperation implementation Failed.", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java
index 65c3d0d27..238d1e329 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java
@@ -35,21 +35,20 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import io.cloudevents.core.provider.EventFormatProvider;
import io.cloudevents.jackson.JsonFormat;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The event handler
*/
+@Slf4j
@EventHttpHandler(path = "/event")
public class EventHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(ConfigurationHandler.class);
private final MQAdminWrapper admin;
@@ -62,7 +61,7 @@ public class EventHandler extends AbstractHttpHandler {
try {
admin.init(null);
} catch (Exception ignored) {
- logger.info("failed to initialize MQAdminWrapper");
+ log.info("failed to initialize MQAdminWrapper");
}
}
@@ -141,7 +140,7 @@ public class EventHandler extends AbstractHttpHandler {
httpExchange.sendResponseHeaders(500, Objects.requireNonNull(result).getBytes().length);
out.write(result.getBytes());
} catch (IOException ioe) {
- logger.warn("out close failed...", ioe);
+ log.warn("out close failed...", ioe);
}
}
}
@@ -175,7 +174,7 @@ public class EventHandler extends AbstractHttpHandler {
httpExchange.sendResponseHeaders(500, Objects.requireNonNull(result).getBytes().length);
out.write(result.getBytes());
} catch (IOException ioe) {
- logger.warn("out close failed...", ioe);
+ log.warn("out close failed...", ioe);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/GrpcClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/GrpcClientHandler.java
index 8a0821a0b..ceccb951a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/GrpcClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/GrpcClientHandler.java
@@ -38,17 +38,17 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The client handler
*/
+@Slf4j
@EventHttpHandler(path = "/client/grpc")
public class GrpcClientHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(TCPClientHandler.class);
private final EventMeshGrpcServer eventMeshGrpcServer;
@@ -110,7 +110,7 @@ public class GrpcClientHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
@@ -176,7 +176,7 @@ public class GrpcClientHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java
index e312dd056..f5fa713ac 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java
@@ -36,17 +36,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The client handler
*/
+@Slf4j
@EventHttpHandler(path = "/client/http")
public class HTTPClientHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(HTTPClientHandler.class);
private final EventMeshHTTPServer eventMeshHTTPServer;
@@ -102,7 +102,7 @@ public class HTTPClientHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
@@ -167,7 +167,7 @@ public class HTTPClientHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java
index ecf173ea0..dfbfd9f26 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java
@@ -28,17 +28,16 @@ import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
import java.io.IOException;
import java.io.OutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
@SuppressWarnings("restriction")
+@Slf4j
@EventHttpHandler(path = "/webhook/insertWebHookConfig")
public class InsertWebHookConfigHandler extends AbstractHttpHandler {
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
private final WebHookConfigOperation operation;
public InsertWebHookConfigHandler(WebHookConfigOperation operation, HttpHandlerManager httpHandlerManager) {
@@ -59,7 +58,7 @@ public class InsertWebHookConfigHandler extends AbstractHttpHandler {
String result = 1 == code ? "insertWebHookConfig Succeed!" : "insertWebHookConfig Failed!";
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("get WebHookConfigOperation implementation Failed.", e);
+ log.error("get WebHookConfigOperation implementation Failed.", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java
index 28e57d21d..238d5c0c2 100755
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java
@@ -34,15 +34,15 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@EventHttpHandler(path = "/metrics")
public class MetricsHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(ConfigurationHandler.class);
private final HttpSummaryMetrics httpSummaryMetrics;
private final TcpSummaryMetrics tcpSummaryMetrics;
@@ -141,7 +141,7 @@ public class MetricsHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java
index fe9d2cb86..18741c7e5 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java
@@ -32,19 +32,18 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* query recommend eventmesh
*/
+@Slf4j
@EventHttpHandler(path = "/eventMesh/recommend")
public class QueryRecommendEventMeshHandler extends AbstractHttpHandler {
- private final Logger logger = LoggerFactory.getLogger(QueryRecommendEventMeshHandler.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
public QueryRecommendEventMeshHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
@@ -73,11 +72,11 @@ public class QueryRecommendEventMeshHandler extends AbstractHttpHandler {
EventMeshRecommendStrategy eventMeshRecommendStrategy = new EventMeshRecommendImpl(eventMeshTCPServer);
String recommendEventMeshResult = eventMeshRecommendStrategy.calculateRecommendEventMesh(group, purpose);
result = (recommendEventMeshResult == null) ? "null" : recommendEventMeshResult;
- logger.info("recommend eventmesh:{},group:{},purpose:{}", result, group, purpose);
+ log.info("recommend eventmesh:{},group:{},purpose:{}", result, group, purpose);
NetUtils.sendSuccessResponseHeaders(httpExchange);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("QueryRecommendEventMeshHandler fail...", e);
+ log.error("QueryRecommendEventMeshHandler fail...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java
index 7f612b3df..55e726e45 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java
@@ -31,17 +31,16 @@ import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
import java.io.IOException;
import java.io.OutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
@SuppressWarnings("restriction")
+@Slf4j
@EventHttpHandler(path = "/webhook/queryWebHookConfigById")
public class QueryWebHookConfigByIdHandler extends AbstractHttpHandler {
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
private final WebHookConfigOperation operation;
public QueryWebHookConfigByIdHandler(WebHookConfigOperation operation, HttpHandlerManager httpHandlerManager) {
@@ -63,7 +62,7 @@ public class QueryWebHookConfigByIdHandler extends AbstractHttpHandler {
WebHookConfig result = operation.queryWebHookConfigById(webHookConfig); // operating result
out.write(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("get WebHookConfigOperation implementation Failed.", e);
+ log.error("get WebHookConfigOperation implementation Failed.", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java
index e00097612..7290c6996 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java
@@ -33,18 +33,17 @@ import java.io.OutputStream;
import java.util.List;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
@SuppressWarnings("restriction")
+@Slf4j
@EventHttpHandler(path = "/webhook/queryWebHookConfigByManufacturer")
public class QueryWebHookConfigByManufacturerHandler extends AbstractHttpHandler {
- public static final Logger LOGGER = LoggerFactory.getLogger(QueryWebHookConfigByManufacturerHandler.class);
-
private final transient WebHookConfigOperation operation;
public QueryWebHookConfigByManufacturerHandler(WebHookConfigOperation operation,
@@ -76,7 +75,7 @@ public class QueryWebHookConfigByManufacturerHandler extends AbstractHttpHandler
List<WebHookConfig> result = operation.queryWebHookConfigByManufacturer(webHookConfig, pageNum, pageSize); // operating result
out.write(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- LOGGER.error("get WebHookConfigOperation implementation Failed.", e);
+ log.error("get WebHookConfigOperation implementation Failed.", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java
index 49e92b4d8..a7998c94a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java
@@ -35,16 +35,15 @@ import java.net.InetSocketAddress;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@EventHttpHandler(path = "/clientManage/redirectClientByIpPort")
public class RedirectClientByIpPortHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(RedirectClientByIpPortHandler.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
public RedirectClientByIpPortHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
@@ -71,7 +70,7 @@ public class RedirectClientByIpPortHandler extends AbstractHttpHandler {
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
- logger.info("redirectClientByIpPort in admin,ip:{},port:{},destIp:{},destPort:{}====================", ip,
+ log.info("redirectClientByIpPort in admin,ip:{},port:{},destIp:{},destPort:{}====================", ip,
port, destEventMeshIp, destEventMeshPort);
ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
ConcurrentHashMap<InetSocketAddress, Session> sessionMap = clientSessionGroupMapping.getSessionMap();
@@ -90,7 +89,7 @@ public class RedirectClientByIpPortHandler extends AbstractHttpHandler {
}
}
} catch (Exception e) {
- logger.error("clientManage|redirectClientByIpPort|fail|ip={}|port={}|destEventMeshIp"
+ log.error("clientManage|redirectClientByIpPort|fail|ip={}|port={}|destEventMeshIp"
+
"={}|destEventMeshPort={},errMsg={}", ip, port, destEventMeshIp, destEventMeshPort, e);
result = String.format("redirectClientByIpPort fail! sessionMap size {%d}, {clientIp=%s clientPort=%s "
@@ -111,7 +110,7 @@ public class RedirectClientByIpPortHandler extends AbstractHttpHandler {
NetUtils.sendSuccessResponseHeaders(httpExchange);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("redirectClientByIpPort fail...", e);
+ log.error("redirectClientByIpPort fail...", e);
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java
index d6b97aa10..640713e74 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java
@@ -35,19 +35,18 @@ import java.net.InetSocketAddress;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* redirect subsystem for path
*/
+@Slf4j
@EventHttpHandler(path = "/clientManage/redirectClientByPath")
public class RedirectClientByPathHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(RedirectClientByPathHandler.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
public RedirectClientByPathHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
@@ -73,7 +72,7 @@ public class RedirectClientByPathHandler extends AbstractHttpHandler {
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
- logger.info("redirectClientByPath in admin,path:{},destIp:{},destPort:{}====================", path,
+ log.info("redirectClientByPath in admin,path:{},destIp:{},destPort:{}====================", path,
destEventMeshIp, destEventMeshPort);
ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
ConcurrentHashMap<InetSocketAddress, Session> sessionMap = clientSessionGroupMapping.getSessionMap();
@@ -90,7 +89,7 @@ public class RedirectClientByPathHandler extends AbstractHttpHandler {
}
}
} catch (Exception e) {
- logger.error("clientManage|redirectClientByPath|fail|path={}|destEventMeshIp"
+ log.error("clientManage|redirectClientByPath|fail|path={}|destEventMeshIp"
+
"={}|destEventMeshPort={},errMsg={}", path, destEventMeshIp, destEventMeshPort, e);
result = String.format("redirectClientByPath fail! sessionMap size {%d}, {path=%s "
@@ -109,7 +108,7 @@ public class RedirectClientByPathHandler extends AbstractHttpHandler {
NetUtils.sendSuccessResponseHeaders(httpExchange);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("redirectClientByPath fail...", e);
+ log.error("redirectClientByPath fail...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java
index 1b467b3ba..df23ef077 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java
@@ -36,19 +36,18 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* redirect subsystem for subsys and dcn
*/
+@Slf4j
@EventHttpHandler(path = "/clientManage/redirectClientBySubSystem")
public class RedirectClientBySubSystemHandler extends AbstractHttpHandler {
- private static final Logger LOGGER = LoggerFactory.getLogger(RedirectClientBySubSystemHandler.class);
-
private final transient EventMeshTCPServer eventMeshTCPServer;
public RedirectClientBySubSystemHandler(final EventMeshTCPServer eventMeshTCPServer,
@@ -74,8 +73,8 @@ public class RedirectClientBySubSystemHandler extends AbstractHttpHandler {
out.write("params illegal!".getBytes(Constants.DEFAULT_CHARSET));
return;
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("redirectClientBySubSystem in admin,subsys:{},destIp:{},destPort:{}====================",
+ if (log.isInfoEnabled()) {
+ log.info("redirectClientBySubSystem in admin,subsys:{},destIp:{},destPort:{}====================",
subSystem, destEventMeshIp, destEventMeshPort);
}
@@ -94,7 +93,7 @@ public class RedirectClientBySubSystemHandler extends AbstractHttpHandler {
}
}
} catch (Exception e) {
- LOGGER.error("clientManage|redirectClientBySubSystem|fail|subSystem={}|destEventMeshIp"
+ log.error("clientManage|redirectClientBySubSystem|fail|subSystem={}|destEventMeshIp"
+
"={}|destEventMeshPort={},errMsg={}", subSystem, destEventMeshIp, destEventMeshPort, e);
@@ -113,7 +112,7 @@ public class RedirectClientBySubSystemHandler extends AbstractHttpHandler {
sessionMap.size(), subSystem, destEventMeshIp, destEventMeshPort, redirectResult)
.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- LOGGER.error("redirectClientBySubSystem fail...", e);
+ log.error("redirectClientBySubSystem fail...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RegistryHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RegistryHandler.java
index aad37cab8..2def6c16d 100755
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RegistryHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RegistryHandler.java
@@ -33,15 +33,15 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@EventHttpHandler(path = "/registry")
public class RegistryHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(ConfigurationHandler.class);
private final Registry eventMeshRegistry;
public RegistryHandler(Registry eventMeshRegistry,
@@ -110,7 +110,7 @@ public class RegistryHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
index e9ebc0cb7..482349dde 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
@@ -34,16 +34,15 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@EventHttpHandler(path = "/clientManage/rejectAllClient")
public class RejectAllClientHandler extends AbstractHttpHandler {
- private static final Logger LOGGER = LoggerFactory.getLogger(RejectAllClientHandler.class);
-
private final transient EventMeshTCPServer eventMeshTCPServer;
public RejectAllClientHandler(final EventMeshTCPServer eventMeshTCPServer,
@@ -65,8 +64,8 @@ public class RejectAllClientHandler extends AbstractHttpHandler {
final ConcurrentHashMap<InetSocketAddress, Session> sessionMap = clientSessionGroupMapping.getSessionMap();
final List<InetSocketAddress> successRemoteAddrs = new ArrayList<>();
try {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("rejectAllClient in admin====================");
+ if (log.isInfoEnabled()) {
+ log.info("rejectAllClient in admin====================");
}
if (!sessionMap.isEmpty()) {
for (final Map.Entry<InetSocketAddress, Session> entry : sessionMap.entrySet()) {
@@ -78,7 +77,7 @@ public class RejectAllClientHandler extends AbstractHttpHandler {
}
}
} catch (Exception e) {
- LOGGER.error("clientManage rejectAllClient fail", e);
+ log.error("clientManage rejectAllClient fail", e);
NetUtils.sendSuccessResponseHeaders(httpExchange);
out.write(String.format("rejectAllClient fail! sessionMap size {%d}, had reject {%s}, errorMsg : %s",
sessionMap.size(), NetUtils.addressToString(successRemoteAddrs), e.getMessage())
@@ -89,7 +88,7 @@ public class RejectAllClientHandler extends AbstractHttpHandler {
out.write(String.format("rejectAllClient success! sessionMap size {%d}, had reject {%s}", sessionMap.size(),
NetUtils.addressToString(successRemoteAddrs)).getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- LOGGER.error("rejectAllClient fail.", e);
+ log.error("rejectAllClient fail.", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java
index addef382c..40be21bb0 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java
@@ -37,16 +37,15 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@EventHttpHandler(path = "/clientManage/rejectClientByIpPort")
public class RejectClientByIpPortHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(RejectClientByIpPortHandler.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
public RejectClientByIpPortHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
@@ -69,7 +68,7 @@ public class RejectClientByIpPortHandler extends AbstractHttpHandler {
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
- logger.info("rejectClientByIpPort in admin,ip:{},port:{}====================", ip, port);
+ log.info("rejectClientByIpPort in admin,ip:{},port:{}====================", ip, port);
ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
ConcurrentHashMap<InetSocketAddress, Session> sessionMap = clientSessionGroupMapping.getSessionMap();
final List<InetSocketAddress> successRemoteAddrs = new ArrayList<InetSocketAddress>();
@@ -86,7 +85,7 @@ public class RejectClientByIpPortHandler extends AbstractHttpHandler {
}
}
} catch (Exception e) {
- logger.error("clientManage|rejectClientByIpPort|fail|ip={}|port={},errMsg={}", ip, port, e);
+ log.error("clientManage|rejectClientByIpPort|fail|ip={}|port={},errMsg={}", ip, port, e);
result = String.format("rejectClientByIpPort fail! {ip=%s port=%s}, had reject {%s}, errorMsg : %s", ip,
port, NetUtils.addressToString(successRemoteAddrs), e.getMessage());
NetUtils.sendSuccessResponseHeaders(httpExchange);
@@ -99,7 +98,7 @@ public class RejectClientByIpPortHandler extends AbstractHttpHandler {
NetUtils.sendSuccessResponseHeaders(httpExchange);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("rejectClientByIpPort fail...", e);
+ log.error("rejectClientByIpPort fail...", e);
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java
index 46f1eb25a..1963fe9f4 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java
@@ -33,16 +33,15 @@ import java.net.InetSocketAddress;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@EventHttpHandler(path = "/clientManage/showClientBySystem")
public class ShowClientBySystemHandler extends AbstractHttpHandler {
- private static final Logger LOGGER = LoggerFactory.getLogger(ShowClientBySystemHandler.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
public ShowClientBySystemHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
@@ -65,8 +64,8 @@ public class ShowClientBySystemHandler extends AbstractHttpHandler {
String subSystem = queryStringInfo.get(EventMeshConstants.MANAGE_SUBSYSTEM);
String newLine = System.getProperty("line.separator");
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("showClientBySubsys,subsys:{}", subSystem);
+ if (log.isInfoEnabled()) {
+ log.info("showClientBySubsys,subsys:{}", subSystem);
}
ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
ConcurrentHashMap<InetSocketAddress, Session> sessionMap = clientSessionGroupMapping.getSessionMap();
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java
index 10824fb13..cbfa2a2bf 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java
@@ -32,19 +32,18 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* This handler used to print the total client info
*/
+@Slf4j
@EventHttpHandler(path = "/clientManage/showClient")
public class ShowClientHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(ShowClientHandler.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
public ShowClientHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
@@ -57,7 +56,7 @@ public class ShowClientHandler extends AbstractHttpHandler {
StringBuilder result = new StringBuilder();
try (OutputStream out = httpExchange.getResponseBody()) {
String newLine = System.getProperty("line.separator");
- logger.info("showAllClient=================");
+ log.info("showAllClient=================");
ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
HashMap<String, AtomicInteger> statMap = new HashMap<String, AtomicInteger>();
@@ -81,7 +80,7 @@ public class ShowClientHandler extends AbstractHttpHandler {
NetUtils.sendSuccessResponseHeaders(httpExchange);
out.write(result.toString().getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("ShowClientHandler fail...", e);
+ log.error("ShowClientHandler fail...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
index 2d5fc037c..23403ee7c 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
@@ -34,19 +34,18 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* query client subscription by topic
*/
+@Slf4j
@EventHttpHandler(path = "/clientManage/showListenClientByTopic")
public class ShowListenClientByTopicHandler extends AbstractHttpHandler {
- private final Logger logger = LoggerFactory.getLogger(ShowListenClientByTopicHandler.class);
-
private final EventMeshTCPServer eventMeshTCPServer;
public ShowListenClientByTopicHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
@@ -63,7 +62,7 @@ public class ShowListenClientByTopicHandler extends AbstractHttpHandler {
String topic = queryStringInfo.get(EventMeshConstants.MANAGE_TOPIC);
String newLine = System.getProperty("line.separator");
- logger.info("showListeningClientByTopic,topic:{}=================", topic);
+ log.info("showListeningClientByTopic,topic:{}=================", topic);
ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
ConcurrentHashMap<String, ClientGroupWrapper> clientGroupMap = clientSessionGroupMapping.getClientGroupMap();
if (!clientGroupMap.isEmpty()) {
@@ -83,7 +82,7 @@ public class ShowListenClientByTopicHandler extends AbstractHttpHandler {
NetUtils.sendSuccessResponseHeaders(httpExchange);
out.write(result.toString().getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("ShowListenClientByTopicHandler fail...", e);
+ log.error("ShowListenClientByTopicHandler fail...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TCPClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TCPClientHandler.java
index 4f3566cbe..130c2be8d 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TCPClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TCPClientHandler.java
@@ -41,17 +41,17 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The client handler
*/
+@Slf4j
@EventHttpHandler(path = "/client/tcp")
public class TCPClientHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(TCPClientHandler.class);
private final EventMeshTCPServer eventMeshTCPServer;
@@ -118,7 +118,7 @@ public class TCPClientHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
@@ -182,7 +182,7 @@ public class TCPClientHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TopicHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TopicHandler.java
index 61659a21b..5f1189cad 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TopicHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TopicHandler.java
@@ -34,17 +34,17 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The topic handler
*/
+@Slf4j
@EventHttpHandler(path = "/topic")
public class TopicHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(ConfigurationHandler.class);
private final MQAdminWrapper admin;
@@ -57,7 +57,7 @@ public class TopicHandler extends AbstractHttpHandler {
try {
admin.init(null);
} catch (Exception ignored) {
- logger.info("failed to initialize MQAdminWrapper");
+ log.info("failed to initialize MQAdminWrapper");
}
}
@@ -104,7 +104,7 @@ public class TopicHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
@@ -141,7 +141,7 @@ public class TopicHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
@@ -178,7 +178,7 @@ public class TopicHandler extends AbstractHttpHandler {
try {
out.close();
} catch (IOException e) {
- logger.warn("out close failed...", e);
+ log.warn("out close failed...", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java
index 3553c4ed3..2990cd9ba 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java
@@ -28,18 +28,16 @@ import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
import java.io.IOException;
import java.io.OutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.sun.net.httpserver.HttpExchange;
+import lombok.extern.slf4j.Slf4j;
+
@SuppressWarnings("restriction")
+@Slf4j
@EventHttpHandler(path = "/webhook/updateWebHookConfig")
public class UpdateWebHookConfigHandler extends AbstractHttpHandler {
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
-
private final WebHookConfigOperation operation;
public UpdateWebHookConfigHandler(WebHookConfigOperation operation, HttpHandlerManager httpHandlerManager) {
@@ -60,7 +58,7 @@ public class UpdateWebHookConfigHandler extends AbstractHttpHandler {
String result = 1 == code ? "updateWebHookConfig Succeed!" : "updateWebHookConfig Failed!";
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("get WebHookConfigOperation implementation Failed.", e);
+ log.error("get WebHookConfigOperation implementation Failed.", e);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractRemotingServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractRemotingServer.java
index 18427fe6b..1d84fcb9c 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractRemotingServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractRemotingServer.java
@@ -22,15 +22,14 @@ import org.apache.eventmesh.common.utils.ThreadUtils;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public abstract class AbstractRemotingServer {
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRemotingServer.class);
private static final int DEFAULT_SLEEP_SECONDS = 30;
@@ -100,8 +99,8 @@ public abstract class AbstractRemotingServer {
public void shutdown() throws Exception {
if (bossGroup != null) {
bossGroup.shutdownGracefully();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("shutdown bossGroup");
+ if (log.isInfoEnabled()) {
+ log.info("shutdown bossGroup");
}
}
@@ -109,15 +108,15 @@ public abstract class AbstractRemotingServer {
if (ioGroup != null) {
ioGroup.shutdownGracefully();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("shutdown ioGroup");
+ if (log.isInfoEnabled()) {
+ log.info("shutdown ioGroup");
}
}
if (workerGroup != null) {
workerGroup.shutdownGracefully();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("shutdown workerGroup");
+ if (log.isInfoEnabled()) {
+ log.info("shutdown workerGroup");
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java
index 5494d9f72..1c1daddfe 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java
@@ -50,17 +50,16 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import org.assertj.core.util.Lists;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.grpc.Server;
import io.grpc.ServerBuilder;
import com.google.common.util.concurrent.RateLimiter;
-public class EventMeshGrpcServer {
+import lombok.extern.slf4j.Slf4j;
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
+@Slf4j
+public class EventMeshGrpcServer {
private final EventMeshGrpcConfiguration eventMeshGrpcConfiguration;
@@ -104,7 +103,7 @@ public class EventMeshGrpcServer {
}
public void init() throws Exception {
- logger.info("==================EventMeshGRPCServer Initializing==================");
+ log.info("==================EventMeshGRPCServer Initializing==================");
initThreadPool();
@@ -131,12 +130,12 @@ public class EventMeshGrpcServer {
initMetricsMonitor();
- logger.info("GRPCServer[port={}] started", serverPort);
- logger.info("-----------------EventMeshGRPCServer initialized");
+ log.info("GRPCServer[port={}] started", serverPort);
+ log.info("-----------------EventMeshGRPCServer initialized");
}
public void start() throws Exception {
- logger.info("---------------EventMeshGRPCServer starting-------------------");
+ log.info("---------------EventMeshGRPCServer starting-------------------");
producerManager.start();
consumerManager.start();
@@ -148,11 +147,11 @@ public class EventMeshGrpcServer {
}
eventMeshGrpcMonitor.start();
- logger.info("---------------EventMeshGRPCServer running-------------------");
+ log.info("---------------EventMeshGRPCServer running-------------------");
}
public void shutdown() throws Exception {
- logger.info("---------------EventMeshGRPCServer stopping-------------------");
+ log.info("---------------EventMeshGRPCServer stopping-------------------");
producerManager.shutdown();
consumerManager.shutdown();
@@ -168,7 +167,7 @@ public class EventMeshGrpcServer {
}
eventMeshGrpcMonitor.shutdown();
- logger.info("---------------EventMeshGRPCServer stopped-------------------");
+ log.info("---------------EventMeshGRPCServer stopped-------------------");
}
public boolean register() {
@@ -184,7 +183,7 @@ public class EventMeshGrpcServer {
eventMeshRegisterInfo.setProtocolType(ConfigurationContextUtil.GRPC);
registerResult = registry.register(eventMeshRegisterInfo);
} catch (Exception e) {
- logger.warn("eventMesh register to registry failed", e);
+ log.warn("eventMesh register to registry failed", e);
}
return registerResult;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
index 7bf624f32..666371d04 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
@@ -64,14 +64,15 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import org.assertj.core.util.Lists;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
import com.google.common.eventbus.EventBus;
import com.google.common.util.concurrent.RateLimiter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventMeshHTTPServer extends AbstractHTTPServer {
- private static final Logger LOGGER = LoggerFactory.getLogger(EventMeshHTTPServer.class);
private final transient EventMeshServer eventMeshServer;
@@ -223,8 +224,8 @@ public class EventMeshHTTPServer extends AbstractHTTPServer {
}
private void init() throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("==================EventMeshHTTPServer Initialing==================");
+ if (log.isInfoEnabled()) {
+ log.info("==================EventMeshHTTPServer Initialing==================");
}
super.init("eventMesh-http");
@@ -268,8 +269,8 @@ public class EventMeshHTTPServer extends AbstractHTTPServer {
registerHTTPRequestProcessor();
this.initWebhook();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("--------EventMeshHTTPServer inited------------------");
+ if (log.isInfoEnabled()) {
+ log.info("--------EventMeshHTTPServer inited------------------");
}
}
@@ -284,8 +285,8 @@ public class EventMeshHTTPServer extends AbstractHTTPServer {
if (eventMeshHttpConfiguration.isEventMeshServerRegistryEnable()) {
this.register();
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("--------EventMeshHTTPServer started------------------");
+ if (log.isInfoEnabled()) {
+ log.info("--------EventMeshHTTPServer started------------------");
}
}
@@ -309,8 +310,8 @@ public class EventMeshHTTPServer extends AbstractHTTPServer {
if (eventMeshHttpConfiguration.isEventMeshServerRegistryEnable()) {
this.unRegister();
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("-------------EventMeshHTTPServer shutdown-------------");
+ if (log.isInfoEnabled()) {
+ log.info("-------------EventMeshHTTPServer shutdown-------------");
}
}
@@ -327,7 +328,7 @@ public class EventMeshHTTPServer extends AbstractHTTPServer {
eventMeshRegisterInfo.setProtocolType(ConfigurationContextUtil.HTTP);
registerResult = registry.register(eventMeshRegisterInfo);
} catch (Exception e) {
- LOGGER.error("eventMesh register to registry failed", e);
+ log.error("eventMesh register to registry failed", e);
}
return registerResult;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
index f6d0d026c..6c4900c3d 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
@@ -32,14 +32,12 @@ import java.util.List;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class EventMeshServer {
- public static final Logger LOGGER = LoggerFactory.getLogger(EventMeshServer.class);
-
- private Acl acl;
+ private final Acl acl;
private Registry registry;
@@ -127,14 +125,14 @@ public class EventMeshServer {
final String eventStore = System.getProperty(EventMeshConstants.EVENT_STORE_PROPERTIES, System.getenv(EventMeshConstants.EVENT_STORE_ENV));
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("eventStore : {}", eventStore);
+ if (log.isInfoEnabled()) {
+ log.info("eventStore : {}", eventStore);
}
serviceState = ServiceState.INITED;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info(SERVER_STATE_MSG, serviceState);
+ if (log.isInfoEnabled()) {
+ log.info(SERVER_STATE_MSG, serviceState);
}
}
@@ -158,16 +156,16 @@ public class EventMeshServer {
}
serviceState = ServiceState.RUNNING;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info(SERVER_STATE_MSG, serviceState);
+ if (log.isInfoEnabled()) {
+ log.info(SERVER_STATE_MSG, serviceState);
}
}
public void shutdown() throws Exception {
serviceState = ServiceState.STOPING;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info(SERVER_STATE_MSG, serviceState);
+ if (log.isInfoEnabled()) {
+ log.info(SERVER_STATE_MSG, serviceState);
}
for (final EventMeshBootstrap eventMeshBootstrap : BOOTSTRAP_LIST) {
@@ -191,8 +189,8 @@ public class EventMeshServer {
ConfigurationContextUtil.clear();
serviceState = ServiceState.STOPED;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info(SERVER_STATE_MSG, serviceState);
+ if (log.isInfoEnabled()) {
+ log.info(SERVER_STATE_MSG, serviceState);
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshStartup.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshStartup.java
index ca56c052e..f693e5884 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshStartup.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshStartup.java
@@ -22,12 +22,11 @@ import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import java.io.File;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class EventMeshStartup {
+import lombok.extern.slf4j.Slf4j;
- public static final Logger LOGGER = LoggerFactory.getLogger(EventMeshStartup.class);
+@Slf4j
+public class EventMeshStartup {
public static void main(String[] args) throws Exception {
try {
@@ -40,21 +39,21 @@ public class EventMeshStartup {
server.start();
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
try {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("eventMesh shutting down hook begin.");
+ if (log.isInfoEnabled()) {
+ log.info("eventMesh shutting down hook begin.");
}
long start = System.currentTimeMillis();
server.shutdown();
long end = System.currentTimeMillis();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("eventMesh shutdown cost {}ms", end - start);
+ if (log.isInfoEnabled()) {
+ log.info("eventMesh shutdown cost {}ms", end - start);
}
} catch (Exception e) {
- LOGGER.error("exception when shutdown.", e);
+ log.error("exception when shutdown.", e);
}
}));
} catch (Throwable e) {
- LOGGER.error("EventMesh start fail.", e);
+ log.error("EventMesh start fail.", e);
System.exit(-1);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
index da08004e8..750b65588 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
@@ -50,8 +50,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.assertj.core.util.Lists;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.PooledByteBufAllocator;
@@ -67,9 +65,10 @@ import io.netty.handler.traffic.GlobalTrafficShapingHandler;
import com.google.common.util.concurrent.RateLimiter;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class EventMeshTCPServer extends AbstractRemotingServer {
- private static final Logger LOGGER = LoggerFactory.getLogger(EventMeshTCPServer.class);
private ClientSessionGroupMapping clientSessionGroupMapping;
@@ -183,14 +182,14 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
try {
int port = eventMeshTCPConfiguration.getEventMeshTcpServerPort();
ChannelFuture f = bootstrap.bind(port).sync();
- LOGGER.info("EventMeshTCPServer[port={}] started.....", port);
+ log.info("EventMeshTCPServer[port={}] started.....", port);
f.channel().closeFuture().sync();
} catch (Exception e) {
- LOGGER.error("EventMeshTCPServer RemotingServer Start Err!", e);
+ log.error("EventMeshTCPServer RemotingServer Start Err!", e);
try {
shutdown();
} catch (Exception ex) {
- LOGGER.error("EventMeshTCPServer RemotingServer shutdown Err!", ex);
+ log.error("EventMeshTCPServer RemotingServer shutdown Err!", ex);
}
}
};
@@ -200,8 +199,8 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
}
public void init() throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("==================EventMeshTCPServer Initialing==================");
+ if (log.isInfoEnabled()) {
+ log.info("==================EventMeshTCPServer Initialing==================");
}
initThreadPool();
@@ -235,8 +234,8 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
eventMeshRebalanceService.init();
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("--------------------------EventMeshTCPServer Inited");
+ if (log.isInfoEnabled()) {
+ log.info("--------------------------EventMeshTCPServer Inited");
}
}
@@ -255,8 +254,8 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
eventMeshRebalanceService.start();
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("--------------------------EventMeshTCPServer Started");
+ if (log.isInfoEnabled()) {
+ log.info("--------------------------EventMeshTCPServer Started");
}
}
@@ -264,7 +263,7 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
public void shutdown() throws Exception {
if (this.getBossGroup() != null) {
this.getBossGroup().shutdownGracefully();
- LOGGER.info("shutdown bossGroup, no client is allowed to connect access server");
+ log.info("shutdown bossGroup, no client is allowed to connect access server");
}
if (eventMeshTCPConfiguration.isEventMeshServerRegistryEnable()) {
@@ -279,11 +278,11 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
if (this.getIoGroup() != null) {
this.getIoGroup().shutdownGracefully();
- LOGGER.info("shutdown ioGroup");
+ log.info("shutdown ioGroup");
}
if (this.getWorkerGroup() != null) {
this.getWorkerGroup().shutdownGracefully();
- LOGGER.info("shutdown workerGroup");
+ log.info("shutdown workerGroup");
}
eventMeshTcpRetryer.shutdown();
@@ -291,8 +290,8 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
eventMeshTcpMonitor.shutdown();
shutdownThreadPool();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("--------------------------EventMeshTCPServer Shutdown");
+ if (log.isInfoEnabled()) {
+ log.info("--------------------------EventMeshTCPServer Shutdown");
}
}
@@ -310,7 +309,7 @@ public class EventMeshTCPServer extends AbstractRemotingServer {
eventMeshRegisterInfo.setProtocolType(ConfigurationContextUtil.TCP);
registerResult = registry.register(eventMeshRegisterInfo);
} catch (Exception e) {
- LOGGER.error("eventMesh register to registry failed", e);
+ log.error("eventMesh register to registry failed", e);
}
return registerResult;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java
index f47352eae..b53969c7a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java
@@ -20,18 +20,18 @@ package org.apache.eventmesh.runtime.connector;
import org.apache.eventmesh.api.connector.ConnectorResourceService;
import org.apache.eventmesh.spi.EventMeshExtensionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class ConnectorResource {
- private static final Logger logger = LoggerFactory.getLogger(ConnectorResource.class);
private static ConnectorResourceService connectorResourceService;
public void init(String connectorResourcePluginType) throws Exception {
connectorResourceService = EventMeshExtensionFactory.getExtension(ConnectorResourceService.class, connectorResourcePluginType);
if (connectorResourceService == null) {
- logger.error("can't load the connectorResourceService plugin, please check.");
+ log.error("can't load the connectorResourceService plugin, please check.");
throw new RuntimeException("doesn't load the connectorResourceService plugin, please check.");
}
connectorResourceService.init();
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumer/SubscriptionManager.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumer/SubscriptionManager.java
index 04f7b8c57..f16c0471d 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumer/SubscriptionManager.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumer/SubscriptionManager.java
@@ -30,11 +30,12 @@ import java.util.Date;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class SubscriptionManager {
- private static final Logger logger = LoggerFactory.getLogger(SubscriptionManager.class);
+
private final ConcurrentHashMap<String /**group*/, ConsumerGroupConf> localConsumerGroupMapping =
new ConcurrentHashMap<>();
@@ -94,7 +95,7 @@ public class SubscriptionManager {
.get(consumerGroup + "@" + subscription.getTopic());
if (CollectionUtils.isEmpty(groupTopicClients)) {
- logger.error("group {} topic {} clients is empty", consumerGroup, subscription);
+ log.error("group {} topic {} clients is empty", consumerGroup, subscription);
}
ConsumerGroupConf consumerGroupConf = localConsumerGroupMapping.get(consumerGroup);
@@ -102,7 +103,7 @@ public class SubscriptionManager {
// new subscription
ConsumerGroupConf prev = localConsumerGroupMapping.putIfAbsent(consumerGroup, new ConsumerGroupConf(consumerGroup));
if (prev == null) {
- logger.info("add new subscription, consumer group: {}", consumerGroup);
+ log.info("add new subscription, consumer group: {}", consumerGroup);
}
consumerGroupConf = localConsumerGroupMapping.get(consumerGroup);
}
@@ -115,7 +116,7 @@ public class SubscriptionManager {
newTopicConf.setConsumerGroup(consumerGroup);
newTopicConf.setTopic(topic);
newTopicConf.setSubscriptionItem(subscription);
- logger.info("add new {}", newTopicConf);
+ log.info("add new {}", newTopicConf);
return newTopicConf;
});
consumerGroupTopicConf = consumerGroupConf.getConsumerGroupTopicConf().get(subscription.getTopic());
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumergroup/ConsumerGroupTopicConf.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumergroup/ConsumerGroupTopicConf.java
index 4b1a9c7fb..1eae55a4a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumergroup/ConsumerGroupTopicConf.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/consumergroup/ConsumerGroupTopicConf.java
@@ -25,16 +25,11 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
public class ConsumerGroupTopicConf implements Serializable {
- private static final Logger LOGGER = LoggerFactory.getLogger(ConsumerGroupTopicConf.class);
-
private static final long serialVersionUID = 4548889791666411923L;
private String consumerGroup;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java
index 8ab20c28e..1d7a1459b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java
@@ -26,21 +26,20 @@ import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import java.util.List;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class MQAdminWrapper extends MQWrapper {
- public Logger logger = LoggerFactory.getLogger(this.getClass());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class MQAdminWrapper extends MQWrapper {
protected Admin meshMQAdmin;
public MQAdminWrapper(String connectorPluginType) {
this.meshMQAdmin = ConnectorPluginFactory.getMeshMQAdmin(connectorPluginType);
if (meshMQAdmin == null) {
- logger.error("can't load the meshMQAdmin plugin, please check.");
+ log.error("can't load the meshMQAdmin plugin, please check.");
throw new RuntimeException("doesn't load the meshMQAdmin plugin, please check.");
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java
index 6bd8875f8..27bb56bd7 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java
@@ -25,21 +25,20 @@ import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import java.util.List;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class MQConsumerWrapper extends MQWrapper {
- public final Logger logger = LoggerFactory.getLogger(this.getClass());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class MQConsumerWrapper extends MQWrapper {
protected Consumer meshMQPushConsumer;
public MQConsumerWrapper(String connectorPluginType) {
this.meshMQPushConsumer = ConnectorPluginFactory.getMeshMQPushConsumer(connectorPluginType);
if (meshMQPushConsumer == null) {
- logger.error("can't load the meshMQPushConsumer plugin, please check.");
+ log.error("can't load the meshMQPushConsumer plugin, please check.");
throw new RuntimeException("doesn't load the meshMQPushConsumer plugin, please check.");
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java
index 73411a6fc..3700000ec 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java
@@ -24,21 +24,20 @@ import org.apache.eventmesh.api.producer.Producer;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class MQProducerWrapper extends MQWrapper {
- public Logger logger = LoggerFactory.getLogger(this.getClass());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class MQProducerWrapper extends MQWrapper {
protected Producer meshMQProducer;
public MQProducerWrapper(String connectorPluginType) {
this.meshMQProducer = ConnectorPluginFactory.getMeshMQProducer(connectorPluginType);
if (meshMQProducer == null) {
- logger.error("can't load the meshMQProducer plugin, please check.");
+ log.error("can't load the meshMQProducer plugin, please check.");
throw new RuntimeException("doesn't load the meshMQProducer plugin, please check.");
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/ConsumerManager.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/ConsumerManager.java
index dacd2cdfd..fd5caa47b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/ConsumerManager.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/ConsumerManager.java
@@ -41,12 +41,11 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class ConsumerManager {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger LOGGER = LoggerFactory.getLogger(ConsumerManager.class);
+@Slf4j
+public class ConsumerManager {
private final transient EventMeshGrpcServer eventMeshGrpcServer;
@@ -67,15 +66,15 @@ public class ConsumerManager {
}
public void init() throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Grpc ConsumerManager initialized.");
+ if (log.isInfoEnabled()) {
+ log.info("Grpc ConsumerManager initialized.");
}
}
public void start() throws Exception {
startClientCheck();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Grpc ConsumerManager started.");
+ if (log.isInfoEnabled()) {
+ log.info("Grpc ConsumerManager started.");
}
}
@@ -84,8 +83,8 @@ public class ConsumerManager {
consumer.shutdown();
}
scheduledExecutorService.shutdown();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Grpc ConsumerManager shutdown.");
+ if (log.isInfoEnabled()) {
+ log.info("Grpc ConsumerManager shutdown.");
}
}
@@ -211,8 +210,8 @@ public class ConsumerManager {
final int clientTimeout = eventMeshGrpcServer.getEventMeshGrpcConfiguration().getEventMeshSessionExpiredInMills();
if (clientTimeout > 0) {
scheduledExecutorService.scheduleAtFixedRate(() -> {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("grpc client info check");
+ if (log.isDebugEnabled()) {
+ log.debug("grpc client info check");
}
final List<ConsumerGroupClient> clientList = new LinkedList<>();
@@ -220,8 +219,8 @@ public class ConsumerManager {
clientList.addAll(clients);
});
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("total number of ConsumerGroupClients: {}", clientList.size());
+ if (log.isDebugEnabled()) {
+ log.debug("total number of ConsumerGroupClients: {}", clientList.size());
}
if (CollectionUtils.isEmpty(clientList)) {
@@ -231,8 +230,8 @@ public class ConsumerManager {
final Set<String> consumerGroupRestart = new HashSet<>();
clientList.forEach(client -> {
if (System.currentTimeMillis() - client.getLastUpTime().getTime() > clientTimeout) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("client {} lastUpdate time {} over three heartbeat cycles. Removing it",
+ if (log.isWarnEnabled()) {
+ log.warn("client {} lastUpdate time {} over three heartbeat cycles. Removing it",
JsonUtils.toJSONString(client), client.getLastUpTime());
}
@@ -248,8 +247,8 @@ public class ConsumerManager {
try {
restartEventMeshConsumer(consumerGroup);
} catch (Exception e) {
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error("Error in restarting EventMeshConsumer [{}]", consumerGroup, e);
+ if (log.isErrorEnabled()) {
+ log.error("Error in restarting EventMeshConsumer [{}]", consumerGroup, e);
}
}
});
@@ -265,4 +264,4 @@ public class ConsumerManager {
.distinct()
.collect(Collectors.toList());
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/consumergroup/WebhookTopicConfig.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/consumergroup/WebhookTopicConfig.java
index d519c6f91..55a8913ca 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/consumergroup/WebhookTopicConfig.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/consumergroup/WebhookTopicConfig.java
@@ -27,12 +27,11 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class WebhookTopicConfig extends ConsumerGroupTopicConfig {
- private final Logger logger = LoggerFactory.getLogger(WebhookTopicConfig.class);
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
+public class WebhookTopicConfig extends ConsumerGroupTopicConfig {
/**
* PUSH URL
* <p>
@@ -50,7 +49,7 @@ public class WebhookTopicConfig extends ConsumerGroupTopicConfig {
@Override
public synchronized void registerClient(ConsumerGroupClient client) {
if (client.getGrpcType() != grpcType) {
- logger.warn("Invalid grpc type: {}, expecting grpc type: {}, can not register client {}",
+ log.warn("Invalid grpc type: {}, expecting grpc type: {}, can not register client {}",
client.getGrpcType(), grpcType, client.toString());
return;
}
@@ -123,4 +122,4 @@ public class WebhookTopicConfig extends ConsumerGroupTopicConfig {
public List<String> getTotalUrls() {
return totalUrls;
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/BatchPublishMessageProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/BatchPublishMessageProcessor.java
index 840fc8633..79bec3e91 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/BatchPublishMessageProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/BatchPublishMessageProcessor.java
@@ -48,9 +48,11 @@ import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
-public class BatchPublishMessageProcessor {
- private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class BatchPublishMessageProcessor {
private final Logger aclLogger = LoggerFactory.getLogger("acl");
@@ -87,7 +89,7 @@ public class BatchPublishMessageProcessor {
// control flow rate limit
if (!eventMeshGrpcServer.getMsgRateLimiter()
.tryAcquire(EventMeshConstants.DEFAULT_FASTFAIL_TIMEOUT_IN_MILLISECONDS, TimeUnit.MILLISECONDS)) {
- logger.error("Send message speed over limit.");
+ log.error("Send message speed over limit.");
ServiceUtils.sendRespAndDone(StatusCode.EVENTMESH_BATCH_SPEED_OVER_LIMIT_ERR, emitter);
return;
}
@@ -113,14 +115,14 @@ public class BatchPublishMessageProcessor {
@Override
public void onSuccess(SendResult sendResult) {
long endTime = System.currentTimeMillis();
- logger.info("message|eventMesh2mq|REQ|BatchSend|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.info("message|eventMesh2mq|REQ|BatchSend|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, topic, seqNum, uniqueId);
}
@Override
public void onException(OnExceptionContext context) {
long endTime = System.currentTimeMillis();
- logger.error("message|eventMesh2mq|REQ|BatchSend|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.error("message|eventMesh2mq|REQ|BatchSend|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, topic, seqNum, uniqueId, context.getException());
}
});
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/ReplyMessageProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/ReplyMessageProcessor.java
index aa34154b4..b20e0381c 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/ReplyMessageProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/ReplyMessageProcessor.java
@@ -46,9 +46,11 @@ import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
-public class ReplyMessageProcessor {
- private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ReplyMessageProcessor {
private final Logger aclLogger = LoggerFactory.getLogger("acl");
@@ -85,7 +87,7 @@ public class ReplyMessageProcessor {
// control flow rate limit
if (!eventMeshGrpcServer.getMsgRateLimiter()
.tryAcquire(EventMeshConstants.DEFAULT_FASTFAIL_TIMEOUT_IN_MILLISECONDS, TimeUnit.MILLISECONDS)) {
- logger.error("Send message speed over limit.");
+ log.error("Send message speed over limit.");
ServiceUtils.sendStreamRespAndDone(requestHeader, StatusCode.EVENTMESH_SEND_MESSAGE_SPEED_OVER_LIMIT_ERR, emitter);
return;
}
@@ -114,7 +116,7 @@ public class ReplyMessageProcessor {
@Override
public void onSuccess(SendResult sendResult) {
long endTime = System.currentTimeMillis();
- logger.info("message|mq2eventmesh|REPLY|ReplyToServer|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.info("message|mq2eventmesh|REPLY|ReplyToServer|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, replyTopic, seqNum, uniqueId);
}
@@ -123,7 +125,7 @@ public class ReplyMessageProcessor {
ServiceUtils.sendStreamRespAndDone(requestHeader, StatusCode.EVENTMESH_REPLY_MSG_ERR,
EventMeshUtil.stackTrace(onExceptionContext.getException(), 2), emitter);
long endTime = System.currentTimeMillis();
- logger.error("message|mq2eventmesh|REPLY|ReplyToServer|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.error("message|mq2eventmesh|REPLY|ReplyToServer|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, replyTopic, seqNum, uniqueId, onExceptionContext.getException());
}
});
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/RequestMessageProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/RequestMessageProcessor.java
index 3f23c8d1d..7fccd42b6 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/RequestMessageProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/RequestMessageProcessor.java
@@ -44,9 +44,11 @@ import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
-public class RequestMessageProcessor {
- private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class RequestMessageProcessor {
private final Logger aclLogger = LoggerFactory.getLogger("acl");
@@ -83,7 +85,7 @@ public class RequestMessageProcessor {
// control flow rate limit
if (!eventMeshGrpcServer.getMsgRateLimiter()
.tryAcquire(EventMeshConstants.DEFAULT_FASTFAIL_TIMEOUT_IN_MILLISECONDS, TimeUnit.MILLISECONDS)) {
- logger.error("Send message speed over limit.");
+ log.error("Send message speed over limit.");
ServiceUtils.sendStreamRespAndDone(message.getHeader(), StatusCode.EVENTMESH_SEND_MESSAGE_SPEED_OVER_LIMIT_ERR, emitter);
return;
}
@@ -116,7 +118,7 @@ public class RequestMessageProcessor {
emitter.onCompleted();
long endTime = System.currentTimeMillis();
- logger.info("message|eventmesh2client|REPLY|RequestReply|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.info("message|eventmesh2client|REPLY|RequestReply|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, topic, seqNum, uniqueId);
eventMeshGrpcServer.getMetricsMonitor().recordSendMsgToClient();
} catch (Exception e) {
@@ -124,7 +126,7 @@ public class RequestMessageProcessor {
EventMeshUtil.stackTrace(e, 2), emitter);
long endTime = System.currentTimeMillis();
- logger.error("message|mq2eventmesh|REPLY|RequestReply|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.error("message|mq2eventmesh|REPLY|RequestReply|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, topic, seqNum, uniqueId, e);
}
}
@@ -134,7 +136,7 @@ public class RequestMessageProcessor {
ServiceUtils.sendStreamRespAndDone(message.getHeader(), StatusCode.EVENTMESH_REQUEST_REPLY_MSG_ERR,
EventMeshUtil.stackTrace(e, 2), emitter);
long endTime = System.currentTimeMillis();
- logger.error("message|eventMesh2mq|REPLY|RequestReply|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.error("message|eventMesh2mq|REPLY|RequestReply|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, topic, seqNum, uniqueId, e);
}
}, ttl);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SendAsyncMessageProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SendAsyncMessageProcessor.java
index c24d7e0ba..37960cad7 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SendAsyncMessageProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SendAsyncMessageProcessor.java
@@ -47,10 +47,12 @@ import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
-public class SendAsyncMessageProcessor {
- private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
+public class SendAsyncMessageProcessor {
+
private final Logger aclLogger = LoggerFactory.getLogger("acl");
private final EventMeshGrpcServer eventMeshGrpcServer;
@@ -86,7 +88,7 @@ public class SendAsyncMessageProcessor {
// control flow rate limit
if (!eventMeshGrpcServer.getMsgRateLimiter()
.tryAcquire(EventMeshConstants.DEFAULT_FASTFAIL_TIMEOUT_IN_MILLISECONDS, TimeUnit.MILLISECONDS)) {
- logger.error("Send message speed over limit.");
+ log.error("Send message speed over limit.");
ServiceUtils.sendRespAndDone(StatusCode.EVENTMESH_BATCH_SPEED_OVER_LIMIT_ERR, emitter);
return;
}
@@ -114,7 +116,7 @@ public class SendAsyncMessageProcessor {
public void onSuccess(SendResult sendResult) {
ServiceUtils.sendRespAndDone(StatusCode.SUCCESS, sendResult.toString(), emitter);
long endTime = System.currentTimeMillis();
- logger.info("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.info("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, topic, seqNum, uniqueId);
eventMeshGrpcServer.getMetricsMonitor().recordSendMsgToClient();
}
@@ -124,7 +126,7 @@ public class SendAsyncMessageProcessor {
ServiceUtils.sendRespAndDone(StatusCode.EVENTMESH_SEND_ASYNC_MSG_ERR,
EventMeshUtil.stackTrace(context.getException(), 2), emitter);
long endTime = System.currentTimeMillis();
- logger.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
+ log.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
endTime - startTime, topic, seqNum, uniqueId, context.getException());
}
});
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java
index e96218532..e1f25dbaa 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java
@@ -39,9 +39,11 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SubscribeStreamProcessor {
- private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SubscribeStreamProcessor {
private final Logger aclLogger = LoggerFactory.getLogger("acl");
@@ -120,10 +122,10 @@ public class SubscribeStreamProcessor {
// restart consumer group if required
if (requireRestart) {
- logger.info("ConsumerGroup {} topic info changed, restart EventMesh Consumer", consumerGroup);
+ log.info("ConsumerGroup {} topic info changed, restart EventMesh Consumer", consumerGroup);
consumerManager.restartEventMeshConsumer(consumerGroup);
} else {
- logger.warn("EventMesh consumer [{}] didn't restart.", consumerGroup);
+ log.warn("EventMesh consumer [{}] didn't restart.", consumerGroup);
}
ServiceUtils.sendStreamResp(header, StatusCode.SUCCESS, "subscribe success", emitter);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/UnsubscribeProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/UnsubscribeProcessor.java
index e9276d516..65189c298 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/UnsubscribeProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/UnsubscribeProcessor.java
@@ -32,12 +32,11 @@ import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class UnsubscribeProcessor {
+import lombok.extern.slf4j.Slf4j;
- private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+@Slf4j
+public class UnsubscribeProcessor {
private final EventMeshGrpcServer eventMeshGrpcServer;
@@ -100,12 +99,12 @@ public class UnsubscribeProcessor {
// restart consumer group if required
if (requireRestart) {
- logger.info("ConsumerGroup {} topic info changed, restart EventMesh Consumer", consumerGroup);
+ log.info("ConsumerGroup {} topic info changed, restart EventMesh Consumer", consumerGroup);
consumerManager.restartEventMeshConsumer(consumerGroup);
} else {
- logger.warn("EventMesh consumer [{}] didn't restart.", consumerGroup);
+ log.warn("EventMesh consumer [{}] didn't restart.", consumerGroup);
}
ServiceUtils.sendRespAndDone(StatusCode.SUCCESS, "unsubscribe success", emitter);
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java
index 03e6b696a..c941cd784 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java
@@ -28,13 +28,11 @@ import org.apache.eventmesh.runtime.util.EventMeshUtil;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class EventMeshProducer {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
private ProducerGroupConf producerGroupConfig;
private MQProducerWrapper mqProducerWrapper;
@@ -70,7 +68,7 @@ public class EventMeshProducer {
eventMeshGrpcConfiguration.getEventMeshConnectorPluginType());
mqProducerWrapper.init(keyValue);
serviceState = ServiceState.INITED;
- logger.info("EventMeshProducer [{}] inited...........", producerGroupConfig.getGroupName());
+ log.info("EventMeshProducer [{}] inited...........", producerGroupConfig.getGroupName());
}
public synchronized void start() throws Exception {
@@ -80,7 +78,7 @@ public class EventMeshProducer {
mqProducerWrapper.start();
serviceState = ServiceState.RUNNING;
- logger.info("EventMeshProducer [{}] started..........", producerGroupConfig.getGroupName());
+ log.info("EventMeshProducer [{}] started..........", producerGroupConfig.getGroupName());
}
public synchronized void shutdown() throws Exception {
@@ -90,7 +88,7 @@ public class EventMeshProducer {
mqProducerWrapper.shutdown();
serviceState = ServiceState.STOPED;
- logger.info("EventMeshProducer [{}] shutdown.........", producerGroupConfig.getGroupName());
+ log.info("EventMeshProducer [{}] shutdown.........", producerGroupConfig.getGroupName());
}
public ServiceState getStatus() {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/ProducerManager.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/ProducerManager.java
index 46cd5a1fe..7d14b615a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/ProducerManager.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/ProducerManager.java
@@ -23,14 +23,13 @@ import org.apache.eventmesh.runtime.core.consumergroup.ProducerGroupConf;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class ProducerManager {
+import lombok.extern.slf4j.Slf4j;
- public Logger logger = LoggerFactory.getLogger(this.getClass());
+@Slf4j
+public class ProducerManager {
- private final EventMeshGrpcServer eventMeshGrpcServer;
+ private EventMeshGrpcServer eventMeshGrpcServer;
private final ConcurrentHashMap<String, EventMeshProducer> producerTable = new ConcurrentHashMap<>();
@@ -39,11 +38,11 @@ public class ProducerManager {
}
public void init() throws Exception {
- logger.info("Grpc ProducerManager inited......");
+ log.info("Grpc ProducerManager inited......");
}
public void start() throws Exception {
- logger.info("Grpc ProducerManager started......");
+ log.info("Grpc ProducerManager started......");
}
public EventMeshProducer getEventMeshProducer(String producerGroup) throws Exception {
@@ -84,9 +83,9 @@ public class ProducerManager {
try {
eventMeshProducer.shutdown();
} catch (Exception ex) {
- logger.error("shutdown eventMeshProducer[{}] err", eventMeshProducer, ex);
+ log.error("shutdown eventMeshProducer[{}] err", eventMeshProducer, ex);
}
}
- logger.info("producerManager shutdown......");
+ log.info("producerManager shutdown......");
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/AbstractPushRequest.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/AbstractPushRequest.java
index a9532f9fe..d8170046a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/AbstractPushRequest.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/AbstractPushRequest.java
@@ -38,16 +38,14 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import com.google.common.collect.Sets;
-public abstract class AbstractPushRequest extends RetryContext {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPushRequest.class);
+@Slf4j
+public abstract class AbstractPushRequest extends RetryContext {
protected EventMeshGrpcServer eventMeshGrpcServer;
protected long createTime = System.currentTimeMillis();
@@ -86,7 +84,7 @@ public abstract class AbstractPushRequest extends RetryContext {
ProtocolTransportObject protocolTransportObject = protocolAdaptor.fromCloudEvent(cloudEvent);
return ((SimpleMessageWrapper) protocolTransportObject).getMessage();
} catch (Exception e) {
- LOGGER.error("Error in getting EventMeshMessage from CloudEvent", e);
+ log.error("Error in getting EventMeshMessage from CloudEvent", e);
return null;
}
}
@@ -97,7 +95,7 @@ public abstract class AbstractPushRequest extends RetryContext {
ProtocolAdaptor<ProtocolTransportObject> protocolAdaptor = ProtocolPluginFactory.getProtocolAdaptor(protocolType);
return protocolAdaptor.toCloudEvent(new SimpleMessageWrapper(simpleMessage));
} catch (Exception e) {
- LOGGER.error("Error in getting CloudEvent from EventMeshMessage", e);
+ log.error("Error in getting CloudEvent from EventMeshMessage", e);
return null;
}
}
@@ -130,7 +128,7 @@ public abstract class AbstractPushRequest extends RetryContext {
try {
eventMeshConsumer.updateOffset(subscriptionMode, Collections.singletonList(event), context);
} catch (Exception e) {
- LOGGER.error("Error in updating offset in EventMeshConsumer", e);
+ log.error("Error in updating offset in EventMeshConsumer", e);
}
}
}
@@ -164,4 +162,4 @@ public abstract class AbstractPushRequest extends RetryContext {
waitingRequests.get(handleMsgContext.getConsumerGroup()).remove(request);
}
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/MessageHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/MessageHandler.java
index da4f2b122..429c7aba9 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/MessageHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/MessageHandler.java
@@ -29,15 +29,14 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-public class MessageHandler {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger LOGGER = LoggerFactory.getLogger(MessageHandler.class);
+@Slf4j
+public class MessageHandler {
private static final ScheduledExecutorService SCHEDULER = ThreadPoolFactory.createSingleScheduledExecutor("eventMesh-pushMsgTimeout-");
@@ -66,7 +65,7 @@ public class MessageHandler {
Set<AbstractPushRequest> waitingRequests4Group = MapUtils.getObject(waitingRequests,
handleMsgContext.getConsumerGroup(), Sets.newConcurrentHashSet());
if (waitingRequests4Group.size() > CONSUMER_GROUP_WAITING_REQUEST_THRESHOLD) {
- LOGGER.warn("waitingRequests is too many, so reject, this message will be send back to MQ, consumerGroup:{}, threshold:{}",
+ log.warn("waitingRequests is too many, so reject, this message will be send back to MQ, consumerGroup:{}, threshold:{}",
handleMsgContext.getConsumerGroup(), CONSUMER_GROUP_WAITING_REQUEST_THRESHOLD);
return false;
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/StreamPushRequest.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/StreamPushRequest.java
index b875ff382..6d3e33b27 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/StreamPushRequest.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/push/StreamPushRequest.java
@@ -32,14 +32,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.grpc.stub.StreamObserver;
-public class StreamPushRequest extends AbstractPushRequest {
- private static final Logger LOGGER = LoggerFactory.getLogger(StreamPushRequest.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class StreamPushRequest extends AbstractPushRequest {
private final Map<String, List<EventEmitter<SimpleMessage>>> idcEmitters;
@@ -80,12 +79,12 @@ public class StreamPushRequest extends AbstractPushRequest {
}
long cost = System.currentTimeMillis() - lastPushTime;
- LOGGER.info("message|eventMesh2client|emitter|topic={}|bizSeqNo={}" + "|uniqueId={}|cost={}",
+ log.info("message|eventMesh2client|emitter|topic={}|bizSeqNo={}" + "|uniqueId={}|cost={}",
simpleMessage.getTopic(), simpleMessage.getSeqNum(), simpleMessage.getUniqueId(), cost);
complete();
} catch (Throwable t) {
long cost = System.currentTimeMillis() - lastPushTime;
- LOGGER.error("message|eventMesh2client|exception={} |emitter|topic={}|bizSeqNo={}" + "|uniqueId={}|cost={}",
+ log.error("message|eventMesh2client|exception={} |emitter|topic={}|bizSeqNo={}" + "|uniqueId={}|cost={}",
t.getMessage(), simpleMessage.getTopic(), simpleMessage.getSeqNum(),
simpleMessage.getUniqueId(), cost, t);
@@ -103,7 +102,7 @@ public class StreamPushRequest extends AbstractPushRequest {
} else if (subscriptionMode == SubscriptionMode.BROADCASTING) {
return emitterList;
} else {
- LOGGER.error("Invalid Subscription Mode, no message returning back to subscriber.");
+ log.error("Invalid Subscription Mode, no message returning back to subscriber.");
return Collections.emptyList();
}
}
@@ -114,12 +113,12 @@ public class StreamPushRequest extends AbstractPushRequest {
} else if (subscriptionMode == SubscriptionMode.BROADCASTING) {
return totalEmitters;
} else {
- LOGGER.error("Invalid Subscription Mode, no message returning back to subscriber.");
+ log.error("Invalid Subscription Mode, no message returning back to subscriber.");
return Collections.emptyList();
}
}
- LOGGER.error("No event emitters from subscriber, no message returning.");
+ log.error("No event emitters from subscriber, no message returning.");
return Collections.emptyList();
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/EventEmitter.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/EventEmitter.java
index 36ff404d8..c1eec14a5 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/EventEmitter.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/EventEmitter.java
@@ -17,13 +17,13 @@
package org.apache.eventmesh.runtime.core.protocol.grpc.service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.grpc.stub.StreamObserver;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventEmitter<T> {
- private final Logger logger = LoggerFactory.getLogger(EventEmitter.class);
private final StreamObserver<T> emitter;
@@ -35,7 +35,7 @@ public class EventEmitter<T> {
try {
emitter.onNext(event);
} catch (Throwable t) {
- logger.warn("StreamObserver Error onNext. {}", t.getMessage());
+ log.warn("StreamObserver Error onNext. {}", t.getMessage());
}
}
@@ -43,7 +43,7 @@ public class EventEmitter<T> {
try {
emitter.onCompleted();
} catch (Throwable t) {
- logger.warn("StreamObserver Error onCompleted. {}", t.getMessage());
+ log.warn("StreamObserver Error onCompleted. {}", t.getMessage());
}
}
@@ -51,7 +51,7 @@ public class EventEmitter<T> {
try {
emitter.onError(t);
} catch (Throwable t1) {
- logger.warn("StreamObserver Error onError. {}", t1.getMessage());
+ log.warn("StreamObserver Error onError. {}", t1.getMessage());
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/HeartbeatService.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/HeartbeatService.java
index c302d01d2..aa681c773 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/HeartbeatService.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/HeartbeatService.java
@@ -27,14 +27,13 @@ import org.apache.eventmesh.runtime.core.protocol.grpc.processor.HeartbeatProces
import java.util.concurrent.ThreadPoolExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.grpc.stub.StreamObserver;
-public class HeartbeatService extends HeartbeatServiceGrpc.HeartbeatServiceImplBase {
- private static final Logger LOGGER = LoggerFactory.getLogger(HeartbeatService.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class HeartbeatService extends HeartbeatServiceGrpc.HeartbeatServiceImplBase {
private final transient EventMeshGrpcServer eventMeshGrpcServer;
@@ -47,7 +46,7 @@ public class HeartbeatService extends HeartbeatServiceGrpc.HeartbeatServiceImplB
}
public void heartbeat(Heartbeat request, StreamObserver<Response> responseObserver) {
- LOGGER.info("cmd={}|{}|client2eventMesh|from={}|to={}",
+ log.info("cmd={}|{}|client2eventMesh|from={}|to={}",
"heartbeat", EventMeshConstants.PROTOCOL_GRPC, request.getHeader().getIp(),
eventMeshGrpcServer.getEventMeshGrpcConfiguration().getEventMeshIp());
@@ -57,7 +56,7 @@ public class HeartbeatService extends HeartbeatServiceGrpc.HeartbeatServiceImplB
try {
heartbeatProcessor.process(request, emitter);
} catch (Exception e) {
- LOGGER.error("Error code {}, error message {}", StatusCode.EVENTMESH_HEARTBEAT_ERR.getRetCode(),
+ log.error("Error code {}, error message {}", StatusCode.EVENTMESH_HEARTBEAT_ERR.getRetCode(),
StatusCode.EVENTMESH_HEARTBEAT_ERR.getErrMsg(), e);
ServiceUtils.sendRespAndDone(StatusCode.EVENTMESH_HEARTBEAT_ERR, e.getMessage(), emitter);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ProducerService.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ProducerService.java
index c7759a743..173bc065f 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ProducerService.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ProducerService.java
@@ -35,9 +35,11 @@ import org.slf4j.LoggerFactory;
import io.grpc.stub.StreamObserver;
-public class ProducerService extends PublisherServiceGrpc.PublisherServiceImplBase {
- private final Logger logger = LoggerFactory.getLogger(ProducerService.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ProducerService extends PublisherServiceGrpc.PublisherServiceImplBase {
private final Logger cmdLogger = LoggerFactory.getLogger("cmd");
@@ -56,14 +58,14 @@ public class ProducerService extends PublisherServiceGrpc.PublisherServiceImplBa
EventMeshConstants.PROTOCOL_GRPC, request.getHeader().getIp(),
eventMeshGrpcServer.getEventMeshGrpcConfiguration().getEventMeshIp());
eventMeshGrpcServer.getMetricsMonitor().recordReceiveMsgFromClient();
-
+
EventEmitter<Response> emitter = new EventEmitter<>(responseObserver);
threadPoolExecutor.submit(() -> {
SendAsyncMessageProcessor sendAsyncMessageProcessor = new SendAsyncMessageProcessor(eventMeshGrpcServer);
try {
sendAsyncMessageProcessor.process(request, emitter);
} catch (Exception e) {
- logger.error("Error code {}, error message {}", StatusCode.EVENTMESH_SEND_ASYNC_MSG_ERR.getRetCode(),
+ log.error("Error code {}, error message {}", StatusCode.EVENTMESH_SEND_ASYNC_MSG_ERR.getRetCode(),
StatusCode.EVENTMESH_SEND_ASYNC_MSG_ERR.getErrMsg(), e);
ServiceUtils.sendRespAndDone(StatusCode.EVENTMESH_SEND_ASYNC_MSG_ERR, e.getMessage(), emitter);
}
@@ -82,7 +84,7 @@ public class ProducerService extends PublisherServiceGrpc.PublisherServiceImplBa
try {
requestMessageProcessor.process(request, emitter);
} catch (Exception e) {
- logger.error("Error code {}, error message {}", StatusCode.EVENTMESH_REQUEST_REPLY_MSG_ERR.getRetCode(),
+ log.error("Error code {}, error message {}", StatusCode.EVENTMESH_REQUEST_REPLY_MSG_ERR.getRetCode(),
StatusCode.EVENTMESH_REQUEST_REPLY_MSG_ERR.getErrMsg(), e);
ServiceUtils.sendStreamRespAndDone(request.getHeader(), StatusCode.EVENTMESH_REQUEST_REPLY_MSG_ERR, e.getMessage(), emitter);
}
@@ -101,7 +103,7 @@ public class ProducerService extends PublisherServiceGrpc.PublisherServiceImplBa
try {
batchPublishMessageProcessor.process(request, emitter);
} catch (Exception e) {
- logger.error("Error code {}, error message {}", StatusCode.EVENTMESH_BATCH_PUBLISH_ERR.getRetCode(),
+ log.error("Error code {}, error message {}", StatusCode.EVENTMESH_BATCH_PUBLISH_ERR.getRetCode(),
StatusCode.EVENTMESH_BATCH_PUBLISH_ERR.getErrMsg(), e);
ServiceUtils.sendRespAndDone(StatusCode.EVENTMESH_BATCH_PUBLISH_ERR, e.getMessage(), emitter);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java
index 24c613ca6..2d7c5a8c9 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java
@@ -29,11 +29,12 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.eventbus.Subscribe;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class ConsumerManager {
private EventMeshHTTPServer eventMeshHTTPServer;
@@ -46,8 +47,6 @@ public class ConsumerManager {
private static final int DEFAULT_UPDATE_TIME = 3 * 30 * 1000;
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
private ScheduledExecutorService scheduledExecutorService =
Executors.newSingleThreadScheduledExecutor();
@@ -57,11 +56,11 @@ public class ConsumerManager {
public void init() throws Exception {
eventMeshHTTPServer.getEventBus().register(this);
- logger.info("consumerManager inited......");
+ log.info("consumerManager inited......");
}
public void start() throws Exception {
- logger.info("consumerManager started......");
+ log.info("consumerManager started......");
// scheduledExecutorService.scheduleAtFixedRate(() -> {
// logger.info("clientInfo check start.....");
@@ -203,10 +202,10 @@ public class ConsumerManager {
try {
consumerGroupManager.shutdown();
} catch (Exception ex) {
- logger.error("shutdown consumerGroupManager[{}] err", consumerGroupManager, ex);
+ log.error("shutdown consumerGroupManager[{}] err", consumerGroupManager, ex);
}
}
- logger.info("consumerManager shutdown......");
+ log.info("consumerManager shutdown......");
}
public boolean contains(String consumerGroup) {
@@ -254,21 +253,21 @@ public class ConsumerManager {
* @param consumerGroup
*/
public synchronized void delConsumer(String consumerGroup) throws Exception {
- logger.info("start delConsumer with consumerGroup {}", consumerGroup);
+ log.info("start delConsumer with consumerGroup {}", consumerGroup);
if (consumerTable.containsKey(consumerGroup)) {
ConsumerGroupManager cgm = consumerTable.remove(consumerGroup);
- logger.info("start unsubscribe topic with consumer group manager {}",
+ log.info("start unsubscribe topic with consumer group manager {}",
JsonUtils.toJSONString(cgm));
cgm.unsubscribe(consumerGroup);
cgm.shutdown();
}
- logger.info("end delConsumer with consumerGroup {}", consumerGroup);
+ log.info("end delConsumer with consumerGroup {}", consumerGroup);
}
@Subscribe
public void onChange(ConsumerGroupTopicConfChangeEvent event) {
try {
- logger.info("onChange event:{}", event);
+ log.info("onChange event:{}", event);
if (event.action
== ConsumerGroupTopicConfChangeEvent.ConsumerGroupTopicConfChangeAction.NEW) {
ConsumerGroupManager manager = getConsumer(event.consumerGroup);
@@ -300,14 +299,14 @@ public class ConsumerManager {
manager.getConsumerGroupConfig().getConsumerGroupTopicConf().remove(event.topic);
}
} catch (Exception ex) {
- logger.error("onChange event:{} err", event, ex);
+ log.error("onChange event:{} err", event, ex);
}
}
@Subscribe
public void onChange(ConsumerGroupStateEvent event) {
try {
- logger.info("onChange event:{}", event);
+ log.info("onChange event:{}", event);
if (event.action == ConsumerGroupStateEvent.ConsumerGroupStateAction.NEW) {
addConsumer(event.consumerGroup, event.consumerGroupConfig);
return;
@@ -323,7 +322,7 @@ public class ConsumerManager {
return;
}
} catch (Exception ex) {
- logger.error("onChange event:{} err", event, ex);
+ log.error("onChange event:{} err", event, ex);
}
}
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 ceafe19d2..dd87dbc26 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
@@ -59,6 +59,10 @@ import io.cloudevents.CloudEvent;
import io.cloudevents.core.builder.CloudEventBuilder;
import io.opentelemetry.api.trace.Span;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventMeshConsumer {
private final EventMeshHTTPServer eventMeshHTTPServer;
@@ -71,8 +75,6 @@ public class EventMeshConsumer {
private final AtomicBoolean inited4Broadcast = new AtomicBoolean(Boolean.FALSE);
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
public Logger messageLogger = LoggerFactory.getLogger("message");
private ConsumerGroupConf consumerGroupConf;
@@ -130,7 +132,7 @@ public class EventMeshConsumer {
EventMeshAsyncConsumeContext eventMeshAsyncConsumeContext = (EventMeshAsyncConsumeContext) context;
if (currentTopicConfig == null) {
- logger.error("no topicConfig found, consumerGroup:{} topic:{}",
+ log.error("no topicConfig found, consumerGroup:{} topic:{}",
consumerGroupConf.getConsumerGroup(), topic);
try {
sendMessageBack(event, uniqueId, bizSeqNo);
@@ -210,7 +212,7 @@ public class EventMeshConsumer {
(EventMeshAsyncConsumeContext) context;
if (currentTopicConfig == null) {
- logger.error("no topicConfig found, consumerGroup:{} topic:{}",
+ log.error("no topicConfig found, consumerGroup:{} topic:{}",
consumerGroupConf.getConsumerGroup(), topic);
try {
sendMessageBack(event, uniqueId, bizSeqNo);
@@ -250,7 +252,7 @@ public class EventMeshConsumer {
inited4Persistent.compareAndSet(false, true);
inited4Broadcast.compareAndSet(false, true);
- logger.info("EventMeshConsumer [{}] inited.............", consumerGroupConf.getConsumerGroup());
+ log.info("EventMeshConsumer [{}] inited.............", consumerGroupConf.getConsumerGroup());
}
private String getEventExtension(CloudEvent event, String protocolKey, String defaultValue) {
@@ -315,7 +317,7 @@ public class EventMeshConsumer {
= eventMeshHTTPServer.getProducerManager().getEventMeshProducer(consumerGroupConf.getConsumerGroup());
if (sendMessageBack == null) {
- logger.warn("consumer:{} consume fail, sendMessageBack, bizSeqNo:{}, uniqueId:{}",
+ log.warn("consumer:{} consume fail, sendMessageBack, bizSeqNo:{}, uniqueId:{}",
consumerGroupConf.getConsumerGroup(), bizSeqNo, uniqueId);
return;
}
@@ -330,7 +332,7 @@ public class EventMeshConsumer {
@Override
public void onException(OnExceptionContext context) {
- logger.warn("consumer:{} consume fail, sendMessageBack, bizSeqno:{}, uniqueId:{}",
+ log.warn("consumer:{} consume fail, sendMessageBack, bizSeqno:{}, uniqueId:{}",
consumerGroupConf.getConsumerGroup(), bizSeqNo, uniqueId);
}
});
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HandleMsgContext.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HandleMsgContext.java
index ae7c62f07..a8bf420ff 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HandleMsgContext.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HandleMsgContext.java
@@ -33,14 +33,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class HandleMsgContext {
- private static final Logger LOGGER = LoggerFactory.getLogger(HandleMsgContext.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class HandleMsgContext {
private String msgRandomNo;
@@ -206,8 +205,8 @@ public class HandleMsgContext {
public void finish() {
if (Objects.nonNull(eventMeshConsumer) && Objects.nonNull(context) && Objects.nonNull(event)) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("messageAcked|topic={}|event={}", topic, event);
+ if (log.isDebugEnabled()) {
+ log.debug("messageAcked|topic={}|event={}", topic, event);
}
eventMeshConsumer.updateOffset(topic, subscriptionItem.getMode(), Collections.singletonList(event), context);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HttpClientGroupMapping.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HttpClientGroupMapping.java
index c4b605eb8..fd1a458dd 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HttpClientGroupMapping.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HttpClientGroupMapping.java
@@ -45,11 +45,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public final class HttpClientGroupMapping {
- private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientGroupMapping.class);
private final transient Map<String /**group*/, ConsumerGroupConf> localConsumerGroupMapping =
new ConcurrentHashMap<>();
@@ -256,13 +256,13 @@ public final class HttpClientGroupMapping {
final ConsumerGroupTopicConf currentTopicConf = map.get(subTopic.getTopic());
if (!currentTopicConf.getUrls().add(url)) {
isChange = true;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("add subscribe success, group:{}, url:{} , topic:{}", consumerGroup, url,
+ if (log.isInfoEnabled()) {
+ log.info("add subscribe success, group:{}, url:{} , topic:{}", consumerGroup, url,
subTopic.getTopic());
}
} else {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("The group has subscribed, group:{}, url:{} , topic:{}", consumerGroup, url,
+ if (log.isWarnEnabled()) {
+ log.warn("The group has subscribed, group:{}, url:{} , topic:{}", consumerGroup, url,
subTopic.getTopic());
}
}
@@ -272,8 +272,8 @@ public final class HttpClientGroupMapping {
urls.add(url);
currentTopicConf.getIdcUrls().put(clientIdc, urls);
isChange = true;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("add url to idcUrlMap success, group:{}, url:{}, topic:{}, clientIdc:{}",
+ if (log.isInfoEnabled()) {
+ log.info("add url to idcUrlMap success, group:{}, url:{}, topic:{}, clientIdc:{}",
consumerGroup, url, subTopic.getTopic(), clientIdc);
}
} else {
@@ -281,13 +281,13 @@ public final class HttpClientGroupMapping {
if (!tmpSet.contains(url)) {
currentTopicConf.getIdcUrls().get(clientIdc).add(url);
isChange = true;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("add url to idcUrlMap success, group:{}, url:{}, topic:{}, clientIdc:{}",
+ if (log.isInfoEnabled()) {
+ log.info("add url to idcUrlMap success, group:{}, url:{}, topic:{}, clientIdc:{}",
consumerGroup, url, subTopic.getTopic(), clientIdc);
}
} else {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("The idcUrlMap has contains url, group:{}, url:{} , topic:{}, clientIdc:{}",
+ if (log.isWarnEnabled()) {
+ log.warn("The idcUrlMap has contains url, group:{}, url:{} , topic:{}, clientIdc:{}",
consumerGroup, url, subTopic.getTopic(), clientIdc);
}
}
@@ -308,8 +308,8 @@ public final class HttpClientGroupMapping {
final ConsumerGroupConf consumerGroupConf = localConsumerGroupMapping.get(consumerGroup);
if (consumerGroupConf == null) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("unsubscribe fail, the current mesh does not have group subscriptionInfo, group:{}, url:{}",
+ if (log.isWarnEnabled()) {
+ log.warn("unsubscribe fail, the current mesh does not have group subscriptionInfo, group:{}, url:{}",
consumerGroup, unSubscribeUrl);
}
return false;
@@ -317,8 +317,8 @@ public final class HttpClientGroupMapping {
final ConsumerGroupTopicConf consumerGroupTopicConf = consumerGroupConf.getConsumerGroupTopicConf().get(unSubTopic);
if (consumerGroupTopicConf == null) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn(
+ if (log.isWarnEnabled()) {
+ log.warn(
"unsubscribe fail, the current mesh does not have group-topic subscriptionInfo, group:{}, topic:{}, url:{}",
consumerGroup, unSubTopic, unSubscribeUrl);
}
@@ -327,12 +327,12 @@ public final class HttpClientGroupMapping {
if (consumerGroupTopicConf.getUrls().remove(unSubscribeUrl)) {
isChange = true;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("remove url success, group:{}, topic:{}, url:{}", consumerGroup, unSubTopic, unSubscribeUrl);
+ if (log.isInfoEnabled()) {
+ log.info("remove url success, group:{}, topic:{}, url:{}", consumerGroup, unSubTopic, unSubscribeUrl);
}
} else {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("remove url fail, not exist subscrition of this url, group:{}, topic:{}, url:{}",
+ if (log.isWarnEnabled()) {
+ log.warn("remove url fail, not exist subscrition of this url, group:{}, topic:{}, url:{}",
consumerGroup, unSubTopic, unSubscribeUrl);
}
}
@@ -340,20 +340,20 @@ public final class HttpClientGroupMapping {
if (consumerGroupTopicConf.getIdcUrls().containsKey(clientIdc)) {
if (consumerGroupTopicConf.getIdcUrls().get(clientIdc).remove(unSubscribeUrl)) {
isChange = true;
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("remove url from idcUrlMap success, group:{}, topic:{}, url:{}, clientIdc:{}",
+ if (log.isInfoEnabled()) {
+ log.info("remove url from idcUrlMap success, group:{}, topic:{}, url:{}, clientIdc:{}",
consumerGroup, unSubTopic, unSubscribeUrl, clientIdc);
}
} else {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn(
+ if (log.isWarnEnabled()) {
+ log.warn(
"remove url from idcUrlMap fail,not exist subscrition of this url, group:{}, topic:{}, url:{}, clientIdc:{}",
consumerGroup, unSubTopic, unSubscribeUrl, clientIdc);
}
}
} else {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn(
+ if (log.isWarnEnabled()) {
+ log.warn(
"remove url from idcUrlMap fail,not exist subscrition of this idc , group:{}, topic:{}, url:{}, clientIdc:{}",
consumerGroup, unSubTopic, unSubscribeUrl, clientIdc);
}
@@ -361,15 +361,15 @@ public final class HttpClientGroupMapping {
if (isChange && CollectionUtils.isEmpty(consumerGroupTopicConf.getUrls())) {
consumerGroupConf.getConsumerGroupTopicConf().remove(unSubTopic);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("group unsubscribe topic success,group:{}, topic:{}", consumerGroup, unSubTopic);
+ if (log.isInfoEnabled()) {
+ log.info("group unsubscribe topic success,group:{}, topic:{}", consumerGroup, unSubTopic);
}
}
if (isChange && MapUtils.isEmpty(consumerGroupConf.getConsumerGroupTopicConf())) {
localConsumerGroupMapping.remove(consumerGroup);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("group unsubscribe success,group:{}", consumerGroup);
+ if (log.isInfoEnabled()) {
+ log.info("group unsubscribe success,group:{}", consumerGroup);
}
}
return isChange;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/AdminMetricsProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/AdminMetricsProcessor.java
index b1e0688bd..a558b8704 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/AdminMetricsProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/AdminMetricsProcessor.java
@@ -22,11 +22,12 @@ import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
import org.apache.eventmesh.runtime.core.protocol.http.async.AsyncContext;
import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.HttpRequestProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class AdminMetricsProcessor implements HttpRequestProcessor {
private EventMeshHTTPServer eventMeshHTTPServer;
@@ -35,8 +36,6 @@ public class AdminMetricsProcessor implements HttpRequestProcessor {
this.eventMeshHTTPServer = eventMeshHTTPServer;
}
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
@Override
public void processRequest(ChannelHandlerContext ctx, AsyncContext<HttpCommand> asyncContext) throws Exception {
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java
index d55eaa1da..4f206bf94 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java
@@ -63,11 +63,11 @@ import com.fasterxml.jackson.core.type.TypeReference;
import lombok.Getter;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class HandlerService {
-
- private final Logger httpServerLogger = LoggerFactory.getLogger(this.getClass());
-
+
private final Logger httpLogger = LoggerFactory.getLogger("http");
private final Map<String, ProcessorWrapper> httpProcessorMap = new ConcurrentHashMap<>();
@@ -82,7 +82,7 @@ public class HandlerService {
public void init() {
- httpServerLogger.info("HandlerService start ");
+ log.info("HandlerService start ");
}
public void register(HttpProcessor httpProcessor, ThreadPoolExecutor threadPoolExecutor) {
@@ -105,7 +105,7 @@ public class HandlerService {
processorWrapper.httpProcessor = httpProcessor;
processorWrapper.traceEnabled = httpProcessor.getClass().getAnnotation(EventMeshTrace.class).isEnable();
httpProcessorMap.put(path, processorWrapper);
- httpServerLogger.info("path is {} processor name is {}", path, httpProcessor.getClass().getSimpleName());
+ log.info("path is {} processor name is {}", path, httpProcessor.getClass().getSimpleName());
}
public boolean isProcessorWrapper(HttpRequest httpRequest) {
@@ -141,7 +141,7 @@ public class HandlerService {
handlerSpecific.asyncContext = new AsyncContext<>(new HttpEventWrapper(), null, asyncContextCompleteHandler);
processorWrapper.threadPoolExecutor.execute(handlerSpecific);
} catch (Exception e) {
- httpServerLogger.error(e.getMessage(), e);
+ log.error(e.getMessage(), e);
this.sendResponse(ctx, httpRequest, HttpResponseUtils.createInternalServerError());
}
}
@@ -294,7 +294,7 @@ public class HandlerService {
}
private void error() {
- httpServerLogger.error(this.exception.getMessage(), this.exception);
+ log.error(this.exception.getMessage(), this.exception);
this.traceOperation.exceptionTrace(this.exception, this.traceMap);
metrics.getSummaryMetrics().recordHTTPDiscard();
metrics.getSummaryMetrics().recordHTTPReqResTimeCost(System.currentTimeMillis() - requestTime);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java
index 5dbf9098d..7aa419182 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java
@@ -45,14 +45,13 @@ import org.apache.commons.lang3.StringUtils;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class SubscribeProcessor implements HttpRequestProcessor {
- private static final Logger LOGGER = LoggerFactory.getLogger(SubscribeProcessor.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SubscribeProcessor implements HttpRequestProcessor {
private final transient EventMeshHTTPServer eventMeshHTTPServer;
@@ -71,8 +70,8 @@ public class SubscribeProcessor implements HttpRequestProcessor {
final Integer requestCode = Integer.valueOf(asyncContext.getRequest().getRequestCode());
final String localAddress = IPUtils.getLocalAddress();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("cmd={}|{}|client2eventMesh|from={}|to={}",
+ if (log.isInfoEnabled()) {
+ log.info("cmd={}|{}|client2eventMesh|from={}|to={}",
RequestCode.get(requestCode),
EventMeshConstants.PROTOCOL_HTTP,
RemotingHelper.parseChannelRemoteAddr(ctx.channel()), localAddress);
@@ -132,8 +131,8 @@ public class SubscribeProcessor implements HttpRequestProcessor {
SendMessageResponseBody.buildBody(EventMeshRetCode.EVENTMESH_ACL_ERR.getRetCode(), e.getMessage()));
asyncContext.onComplete(responseEventMeshCommand);
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("CLIENT HAS NO PERMISSION,SubscribeProcessor subscribe failed", e);
+ if (log.isWarnEnabled()) {
+ log.warn("CLIENT HAS NO PERMISSION,SubscribeProcessor subscribe failed", e);
}
return;
}
@@ -147,7 +146,7 @@ public class SubscribeProcessor implements HttpRequestProcessor {
try {
if (!IPUtils.isValidDomainOrIp(url, eventMeshHTTPServer.getEventMeshHttpConfiguration().getEventMeshIpv4BlackList(),
eventMeshHTTPServer.getEventMeshHttpConfiguration().getEventMeshIpv6BlackList())) {
- LOGGER.error("subscriber url {} is not valid", url);
+ log.error("subscriber url {} is not valid", url);
responseEventMeshCommand = request.createHttpCommandResponse(
subscribeResponseHeader,
SubscribeResponseBody
@@ -157,8 +156,8 @@ public class SubscribeProcessor implements HttpRequestProcessor {
return;
}
} catch (Exception e) {
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error("subscriber url:{} is invalid.", url, e);
+ if (log.isErrorEnabled()) {
+ log.error("subscriber url:{} is invalid.", url, e);
}
responseEventMeshCommand = request.createHttpCommandResponse(
subscribeResponseHeader,
@@ -172,7 +171,7 @@ public class SubscribeProcessor implements HttpRequestProcessor {
// obtain webhook delivery agreement for Abuse Protection
if (!WebhookUtil.obtainDeliveryAgreement(eventMeshHTTPServer.httpClientPool.getClient(),
url, eventMeshHTTPServer.getEventMeshHttpConfiguration().getEventMeshWebhookOrigin())) {
- LOGGER.error("subscriber url {} is not allowed by the target system", url);
+ log.error("subscriber url {} is not allowed by the target system", url);
responseEventMeshCommand = request.createHttpCommandResponse(
subscribeResponseHeader,
SubscribeResponseBody
@@ -198,15 +197,15 @@ public class SubscribeProcessor implements HttpRequestProcessor {
@Override
public void onResponse(final HttpCommand httpCommand) {
try {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("{}", httpCommand);
+ if (log.isDebugEnabled()) {
+ log.debug("{}", httpCommand);
}
eventMeshHTTPServer.sendResponse(ctx, httpCommand.httpResponse());
eventMeshHTTPServer.getMetrics().getSummaryMetrics().recordHTTPReqResTimeCost(
System.currentTimeMillis() - request.getReqTime());
} catch (Exception ex) {
- LOGGER.error("onResponse error", ex);
+ log.error("onResponse error", ex);
}
}
};
@@ -223,8 +222,8 @@ public class SubscribeProcessor implements HttpRequestProcessor {
asyncContext.onComplete(err);
final long endTime = System.currentTimeMillis();
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error(
+ if (log.isErrorEnabled()) {
+ log.error(
"message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}"
+ "|bizSeqNo={}|uniqueId={}", endTime - startTime,
JsonUtils.toJSONString(subscribeRequestBody.getTopics()),
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java
index 34cbafa8f..337d788de 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java
@@ -49,14 +49,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class UnSubscribeProcessor implements HttpRequestProcessor {
- private static final Logger LOGGER = LoggerFactory.getLogger(UnSubscribeProcessor.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class UnSubscribeProcessor implements HttpRequestProcessor {
private final transient EventMeshHTTPServer eventMeshHTTPServer;
@@ -69,8 +68,8 @@ public class UnSubscribeProcessor implements HttpRequestProcessor {
throws Exception {
HttpCommand responseEventMeshCommand;
final String localAddress = IPUtils.getLocalAddress();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("cmd={}|{}|client2eventMesh|from={}|to={}",
+ if (log.isInfoEnabled()) {
+ log.info("cmd={}|{}|client2eventMesh|from={}|to={}",
RequestCode.get(Integer.valueOf(asyncContext.getRequest().getRequestCode())),
EventMeshConstants.PROTOCOL_HTTP,
RemotingHelper.parseChannelRemoteAddr(ctx.channel()), localAddress);
@@ -124,8 +123,8 @@ public class UnSubscribeProcessor implements HttpRequestProcessor {
@Override
public void onResponse(final HttpCommand httpCommand) {
try {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("{}", httpCommand);
+ if (log.isDebugEnabled()) {
+ log.debug("{}", httpCommand);
}
eventMeshHTTPServer.sendResponse(ctx, httpCommand.httpResponse());
eventMeshHTTPServer.getMetrics().getSummaryMetrics().recordHTTPReqResTimeCost(
@@ -150,8 +149,8 @@ public class UnSubscribeProcessor implements HttpRequestProcessor {
final Client client = clientIterator.next();
if (StringUtils.equals(client.getPid(), pid)
&& StringUtils.equals(client.getUrl(), unSubscribeUrl)) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("client {} start unsubscribe", JsonUtils.toJSONString(client));
+ if (log.isWarnEnabled()) {
+ log.warn("client {} start unsubscribe", JsonUtils.toJSONString(client));
}
clientIterator.remove();
}
@@ -223,7 +222,7 @@ public class UnSubscribeProcessor implements HttpRequestProcessor {
+ EventMeshUtil.stackTrace(e, 2)));
asyncContext.onComplete(err);
final long endTime = System.currentTimeMillis();
- LOGGER.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}|url={}",
+ log.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}|url={}",
endTime - startTime,
JsonUtils.toJSONString(unSubscribeRequestBody.getTopics()),
unSubscribeRequestBody.getUrl(), e);
@@ -253,7 +252,7 @@ public class UnSubscribeProcessor implements HttpRequestProcessor {
+ EventMeshUtil.stackTrace(e, 2)));
asyncContext.onComplete(err);
final long endTime = System.currentTimeMillis();
- LOGGER.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms"
+ log.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms"
+ "|topic={}|url={}", endTime - startTime,
JsonUtils.toJSONString(unSubscribeRequestBody.getTopics()),
unSubscribeRequestBody.getUrl(), e);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java
index 4812c88b2..e675b841f 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java
@@ -27,17 +27,16 @@ import org.apache.eventmesh.runtime.util.EventMeshUtil;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventMeshProducer {
protected AtomicBoolean started = new AtomicBoolean(Boolean.FALSE);
protected AtomicBoolean inited = new AtomicBoolean(Boolean.FALSE);
- public Logger logger = LoggerFactory.getLogger(this.getClass());
-
public AtomicBoolean getInited() {
return inited;
}
@@ -85,7 +84,7 @@ public class EventMeshProducer {
mqProducerWrapper = new MQProducerWrapper(eventMeshHttpConfiguration.getEventMeshConnectorPluginType());
mqProducerWrapper.init(keyValue);
inited.compareAndSet(false, true);
- logger.info("EventMeshProducer [{}] inited.............", producerGroupConfig.getGroupName());
+ log.info("EventMeshProducer [{}] inited.............", producerGroupConfig.getGroupName());
}
@@ -96,7 +95,7 @@ public class EventMeshProducer {
mqProducerWrapper.start();
started.compareAndSet(false, true);
- logger.info("EventMeshProducer [{}] started.............", producerGroupConfig.getGroupName());
+ log.info("EventMeshProducer [{}] started.............", producerGroupConfig.getGroupName());
}
public synchronized void shutdown() throws Exception {
@@ -110,7 +109,7 @@ public class EventMeshProducer {
mqProducerWrapper.shutdown();
inited.compareAndSet(true, false);
started.compareAndSet(true, false);
- logger.info("EventMeshProducer [{}] shutdown.............", producerGroupConfig.getGroupName());
+ log.info("EventMeshProducer [{}] shutdown.............", producerGroupConfig.getGroupName());
}
@Override
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/ProducerManager.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/ProducerManager.java
index ebf65b4e5..dce75e5f8 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/ProducerManager.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/ProducerManager.java
@@ -22,12 +22,11 @@ import org.apache.eventmesh.runtime.core.consumergroup.ProducerGroupConf;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class ProducerManager {
+import lombok.extern.slf4j.Slf4j;
- public Logger logger = LoggerFactory.getLogger(this.getClass());
+@Slf4j
+public class ProducerManager {
private EventMeshHTTPServer eventMeshHTTPServer;
@@ -38,11 +37,11 @@ public class ProducerManager {
}
public void init() throws Exception {
- logger.info("producerManager inited......");
+ log.info("producerManager inited......");
}
public void start() throws Exception {
- logger.info("producerManager started......");
+ log.info("producerManager started......");
}
public EventMeshProducer getEventMeshProducer(String producerGroup) throws Exception {
@@ -81,10 +80,10 @@ public class ProducerManager {
try {
eventMeshProducer.shutdown();
} catch (Exception ex) {
- logger.error("shutdown eventMeshProducer[{}] err", eventMeshProducer, ex);
+ log.error("shutdown eventMeshProducer[{}] err", eventMeshProducer, ex);
}
}
- logger.info("producerManager shutdown......");
+ log.info("producerManager shutdown......");
}
public EventMeshHTTPServer getEventMeshHTTPServer() {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/SendMessageContext.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/SendMessageContext.java
index a174f289d..899338cf1 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/SendMessageContext.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/SendMessageContext.java
@@ -30,14 +30,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class SendMessageContext extends RetryContext {
- public static final Logger logger = LoggerFactory.getLogger("retry");
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SendMessageContext extends RetryContext {
private CloudEvent event;
@@ -142,7 +141,7 @@ public class SendMessageContext extends RetryContext {
@Override
public void onException(OnExceptionContext context) {
- logger.warn("", context.getException());
+ log.warn("", context.getException());
eventMeshHTTPServer.getMetrics().getSummaryMetrics().recordSendBatchMsgFailed(1);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
index 775da0b46..1270d162d 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
@@ -18,7 +18,6 @@
package org.apache.eventmesh.runtime.core.protocol.http.push;
import org.apache.eventmesh.common.Constants;
-import org.apache.eventmesh.common.exception.JsonException;
import org.apache.eventmesh.common.protocol.ProtocolTransportObject;
import org.apache.eventmesh.common.protocol.SubscriptionType;
import org.apache.eventmesh.common.protocol.http.HttpCommand;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPClientPool.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPClientPool.java
index 497cc704a..54af56b78 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPClientPool.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPClientPool.java
@@ -47,12 +47,11 @@ import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class HTTPClientPool {
+import lombok.extern.slf4j.Slf4j;
- public static final Logger LOGGER = LoggerFactory.getLogger(HTTPClientPool.class);
+@Slf4j
+public class HTTPClientPool {
private final transient List<CloseableHttpClient> clients = Collections.synchronizedList(new ArrayList<>());
@@ -100,7 +99,7 @@ public class HTTPClientPool {
innerSSLContext = innerSSLContext == null ? SSLContexts.custom().loadTrustMaterial(new TheTrustStrategy()).build() : innerSSLContext;
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
- LOGGER.error("Get sslContext error", e);
+ log.error("Get sslContext error", e);
return HttpClients.createDefault();
}
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 4744a4267..c309fddf8 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
@@ -34,17 +34,15 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.opentelemetry.api.trace.Span;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-public class HTTPMessageHandler implements MessageHandler {
+import lombok.extern.slf4j.Slf4j;
- public static final Logger LOGGER = LoggerFactory.getLogger(HTTPMessageHandler.class);
+@Slf4j
+public class HTTPMessageHandler implements MessageHandler {
private transient EventMeshConsumer eventMeshConsumer;
@@ -79,7 +77,7 @@ public class HTTPMessageHandler implements MessageHandler {
public boolean handle(final HandleMsgContext handleMsgContext) {
if (MapUtils.getObject(waitingRequests, handleMsgContext.getConsumerGroup(), Sets.newConcurrentHashSet()).size()
> CONSUMER_GROUP_WAITING_REQUEST_THRESHOLD) {
- LOGGER.warn("waitingRequests is too many, so reject, this message will be send back to MQ, "
+ log.warn("waitingRequests is too many, so reject, this message will be send back to MQ, "
+ "consumerGroup:{}, threshold:{}",
handleMsgContext.getConsumerGroup(), CONSUMER_GROUP_WAITING_REQUEST_THRESHOLD);
return false;
@@ -102,7 +100,7 @@ public class HTTPMessageHandler implements MessageHandler {
});
return true;
} catch (RejectedExecutionException e) {
- LOGGER.warn("pushMsgThreadPoolQueue is full, so reject, current task size {}",
+ log.warn("pushMsgThreadPoolQueue is full, so reject, current task size {}",
handleMsgContext.getEventMeshHTTPServer().getPushMsgExecutor().getQueue().size(), e);
return false;
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/retry/HttpRetryer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/retry/HttpRetryer.java
index dede08eae..4320beab7 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/retry/HttpRetryer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/retry/HttpRetryer.java
@@ -28,12 +28,14 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class HttpRetryer {
- private final Logger retryLogger = LoggerFactory.getLogger("retry");
+import lombok.extern.slf4j.Slf4j;
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
+@Slf4j
+public class HttpRetryer {
+ private final Logger retryLogger = LoggerFactory.getLogger("retry");
+
private final EventMeshHTTPServer eventMeshHTTPServer;
public HttpRetryer(EventMeshHTTPServer eventMeshHTTPServer) {
@@ -84,7 +86,7 @@ public class HttpRetryer {
}
}, "http-retry-dispatcher");
dispatcher.setDaemon(true);
- logger.info("HttpRetryer inited......");
+ log.info("HttpRetryer inited......");
}
public int size() {
@@ -101,11 +103,11 @@ public class HttpRetryer {
public void shutdown() {
dispatcher.interrupt();
pool.shutdown();
- logger.info("HttpRetryer shutdown......");
+ log.info("HttpRetryer shutdown......");
}
public void start() throws Exception {
dispatcher.start();
- logger.info("HttpRetryer started......");
+ log.info("HttpRetryer started......");
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java
index f31397120..f8b1cf667 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java
@@ -35,21 +35,20 @@ import org.apache.eventmesh.runtime.util.Utils;
import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
-public class EventMeshTcp2Client {
- private static final Logger LOGGER = LoggerFactory.getLogger(EventMeshTcp2Client.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class EventMeshTcp2Client {
public static InetSocketAddress serverGoodby2Client(EventMeshTCPServer eventMeshTCPServer,
Session session,
ClientSessionGroupMapping mapping) {
- LOGGER.info("serverGoodby2Client client[{}]", session.getClient());
+ log.info("serverGoodby2Client client[{}]", session.getClient());
try {
long startTime = System.currentTimeMillis();
Package msg = new Package();
@@ -68,7 +67,7 @@ public class EventMeshTcp2Client {
closeSessionIfTimeout(eventMeshTCPServer, session, mapping);
return address;
} catch (Exception e) {
- LOGGER.error("exception occur while serverGoodby2Client", e);
+ log.error("exception occur while serverGoodby2Client", e);
return null;
}
}
@@ -92,7 +91,7 @@ public class EventMeshTcp2Client {
return session.getRemoteAddress();
} catch (Exception e) {
- LOGGER.error("exception occur while goodbye2client", e);
+ log.error("exception occur while goodbye2client", e);
return null;
}
}
@@ -102,7 +101,7 @@ public class EventMeshTcp2Client {
long startTime = System.currentTimeMillis();
Package pkg = new Package(new Header(SERVER_GOODBYE_REQUEST, OPStatus.FAIL.getCode(), errMsg, null));
eventMeshTcpMonitor.getTcpSummaryMetrics().getEventMesh2clientMsgNum().incrementAndGet();
- LOGGER.info("goodBye2Client client[{}]", RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
+ log.info("goodBye2Client client[{}]", RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
ctx.writeAndFlush(pkg).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
@@ -110,7 +109,7 @@ public class EventMeshTcp2Client {
try {
mapping.closeSession(ctx);
} catch (Exception e) {
- LOGGER.warn("close session failed!", e);
+ log.warn("close session failed!", e);
}
}
});
@@ -118,7 +117,7 @@ public class EventMeshTcp2Client {
public static String redirectClient2NewEventMesh(EventMeshTCPServer eventMeshTCPServer, String newEventMeshIp,
int port, Session session, ClientSessionGroupMapping mapping) {
- LOGGER.info("begin to gracefully redirect Client {}, newIPPort[{}]", session.getClient(), newEventMeshIp + ":"
+ log.info("begin to gracefully redirect Client {}, newIPPort[{}]", session.getClient(), newEventMeshIp + ":"
+ port);
try {
long startTime = System.currentTimeMillis();
@@ -136,7 +135,7 @@ public class EventMeshTcp2Client {
closeSessionIfTimeout(eventMeshTCPServer, session, mapping);
return session.getRemoteAddress() + "--->" + newEventMeshIp + ":" + port;
} catch (Exception e) {
- LOGGER.error("exception occur while redirectClient2NewEventMesh", e);
+ log.error("exception occur while redirectClient2NewEventMesh", e);
return null;
}
}
@@ -149,10 +148,10 @@ public class EventMeshTcp2Client {
try {
if (session.getSessionState() != SessionState.CLOSED) {
mapping.closeSession(session.getContext());
- LOGGER.info("closeSessionIfTimeout success, session[{}]", session.getClient());
+ log.info("closeSessionIfTimeout success, session[{}]", session.getClient());
}
} catch (Exception e) {
- LOGGER.error("close session failed", e);
+ log.error("close session failed", e);
}
}
}, 30 * 1000, TimeUnit.MILLISECONDS);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpConnectionHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpConnectionHandler.java
index fe2f45f88..c64930337 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpConnectionHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpConnectionHandler.java
@@ -22,18 +22,18 @@ import org.apache.eventmesh.runtime.util.RemotingHelper;
import java.util.concurrent.atomic.AtomicInteger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.timeout.IdleState;
import io.netty.handler.timeout.IdleStateEvent;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventMeshTcpConnectionHandler extends ChannelDuplexHandler {
public static final AtomicInteger connections = new AtomicInteger(0);
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
private EventMeshTCPServer eventMeshTCPServer;
public EventMeshTcpConnectionHandler(EventMeshTCPServer eventMeshTCPServer) {
@@ -43,25 +43,25 @@ public class EventMeshTcpConnectionHandler extends ChannelDuplexHandler {
@Override
public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
final String remoteAddress = RemotingHelper.parseChannelRemoteAddr(ctx.channel());
- logger.info("client|tcp|channelRegistered|remoteAddress={}|msg={}", remoteAddress, "");
+ log.info("client|tcp|channelRegistered|remoteAddress={}|msg={}", remoteAddress, "");
super.channelRegistered(ctx);
}
@Override
public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
final String remoteAddress = RemotingHelper.parseChannelRemoteAddr(ctx.channel());
- logger.info("client|tcp|channelUnregistered|remoteAddress={}|msg={}", remoteAddress, "");
+ log.info("client|tcp|channelUnregistered|remoteAddress={}|msg={}", remoteAddress, "");
super.channelUnregistered(ctx);
}
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
final String remoteAddress = RemotingHelper.parseChannelRemoteAddr(ctx.channel());
- logger.info("client|tcp|channelActive|remoteAddress={}|msg={}", remoteAddress, "");
+ log.info("client|tcp|channelActive|remoteAddress={}|msg={}", remoteAddress, "");
int c = connections.incrementAndGet();
if (c > eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshTcpClientMaxNum()) {
- logger.warn("client|tcp|channelActive|remoteAddress={}|msg={}", remoteAddress, "too many client connect "
+ log.warn("client|tcp|channelActive|remoteAddress={}|msg={}", remoteAddress, "too many client connect "
+
"this eventMesh server");
ctx.close();
@@ -75,7 +75,7 @@ public class EventMeshTcpConnectionHandler extends ChannelDuplexHandler {
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
connections.decrementAndGet();
final String remoteAddress = RemotingHelper.parseChannelRemoteAddr(ctx.channel());
- logger.info("client|tcp|channelInactive|remoteAddress={}|msg={}", remoteAddress, "");
+ log.info("client|tcp|channelInactive|remoteAddress={}|msg={}", remoteAddress, "");
eventMeshTCPServer.getClientSessionGroupMapping().closeSession(ctx);
super.channelInactive(ctx);
}
@@ -87,7 +87,7 @@ public class EventMeshTcpConnectionHandler extends ChannelDuplexHandler {
IdleStateEvent event = (IdleStateEvent) evt;
if (event.state().equals(IdleState.ALL_IDLE)) {
final String remoteAddress = RemotingHelper.parseChannelRemoteAddr(ctx.channel());
- logger.info("client|tcp|userEventTriggered|remoteAddress={}|msg={}", remoteAddress, evt.getClass().getName());
+ log.info("client|tcp|userEventTriggered|remoteAddress={}|msg={}", remoteAddress, evt.getClass().getName());
eventMeshTCPServer.getClientSessionGroupMapping().closeSession(ctx);
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpExceptionHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpExceptionHandler.java
index d9aace846..17c7f85ee 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpExceptionHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpExceptionHandler.java
@@ -22,15 +22,15 @@ import org.apache.eventmesh.common.protocol.tcp.UserAgent;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventMeshTcpExceptionHandler extends ChannelDuplexHandler {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
private EventMeshTCPServer eventMeshTCPServer;
public EventMeshTcpExceptionHandler(EventMeshTCPServer eventMeshTCPServer) {
@@ -41,7 +41,7 @@ public class EventMeshTcpExceptionHandler extends ChannelDuplexHandler {
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
Session session = eventMeshTCPServer.getClientSessionGroupMapping().getSession(ctx);
UserAgent client = session == null ? null : session.getClient();
- logger.error("exceptionCaught, push goodbye to client|user={},errMsg={}", client, cause.fillInStackTrace());
+ log.error("exceptionCaught, push goodbye to client|user={},errMsg={}", client, cause.fillInStackTrace());
String errMsg;
if (cause.toString().contains("value not one of declared Enum instance names")) {
errMsg = "Unknown Command type";
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 1caa67a93..67d24937c 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
@@ -48,9 +48,12 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.opentelemetry.api.trace.Span;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventMeshTcpMessageDispatcher extends SimpleChannelInboundHandler<Package> {
- private static final Logger LOGGER = LoggerFactory.getLogger(EventMeshTcpMessageDispatcher.class);
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
private EventMeshTCPServer eventMeshTCPServer;
@@ -91,7 +94,7 @@ public class EventMeshTcpMessageDispatcher extends SimpleChannelInboundHandler<P
eventMeshTCPServer.getTaskHandleExecutorService().submit(task);
return;
}
-
+
if (Command.HELLO_REQUEST == cmd) {
if (MESSAGE_LOGGER.isInfoEnabled()) {
MESSAGE_LOGGER.info("pkg|c2eventMesh|cmd={}|pkg={}", cmd, pkg);
@@ -118,7 +121,7 @@ public class EventMeshTcpMessageDispatcher extends SimpleChannelInboundHandler<P
dispatch(ctx, pkg, startTime, cmd);
} catch (Exception e) {
- LOGGER.error("exception occurred while pkg|cmd={}|pkg={}", cmd, pkg, e);
+ log.error("exception occurred while pkg|cmd={}|pkg={}", cmd, pkg, e);
if (isNeedTrace(cmd)) {
Span span = TraceUtils.prepareServerSpan(pkg.getHeader().getProperties(),
@@ -149,7 +152,7 @@ public class EventMeshTcpMessageDispatcher extends SimpleChannelInboundHandler<P
pkg.getHeader().getSeq()));
ctx.writeAndFlush(res);
} catch (Exception ex) {
- LOGGER.warn("writeToClient failed", ex);
+ log.warn("writeToClient failed", ex);
}
}
@@ -200,11 +203,11 @@ public class EventMeshTcpMessageDispatcher extends SimpleChannelInboundHandler<P
throw new Exception("the incoming message is empty.");
}
if (pkg.getHeader() == null) {
- LOGGER.error("the incoming message does not have a header|pkg={}", pkg);
+ log.error("the incoming message does not have a header|pkg={}", pkg);
throw new Exception("the incoming message does not have a header.");
}
if (pkg.getHeader().getCmd() == null) {
- LOGGER.error("the incoming message does not have a command type|pkg={}", pkg);
+ log.error("the incoming message does not have a command type|pkg={}", pkg);
throw new Exception("the incoming message does not have a command type.");
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/FreePriorityDispatchStrategy.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/FreePriorityDispatchStrategy.java
index c15d5b9e5..9f4ded5bc 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/FreePriorityDispatchStrategy.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/FreePriorityDispatchStrategy.java
@@ -27,13 +27,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class FreePriorityDispatchStrategy implements DownstreamDispatchStrategy {
- private static final Logger LOGGER = LoggerFactory.getLogger(FreePriorityDispatchStrategy.class);
-
@Override
public Session select(final String group, final String topic, final Set<Session> groupConsumerSessions) {
if (CollectionUtils.isEmpty(groupConsumerSessions)
@@ -51,8 +49,8 @@ public class FreePriorityDispatchStrategy implements DownstreamDispatchStrategy
if (session.isIsolated()) {
isolatedSessions.add(session);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("session is not available because session is isolated,isolateTime:{},client:{}",
+ if (log.isInfoEnabled()) {
+ log.info("session is not available because session is isolated,isolateTime:{},client:{}",
session.getIsolateTime(), session.getClient());
}
continue;
@@ -63,13 +61,13 @@ public class FreePriorityDispatchStrategy implements DownstreamDispatchStrategy
if (CollectionUtils.isEmpty(filtered)) {
if (CollectionUtils.isEmpty(isolatedSessions)) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("all sessions can't downstream msg");
+ if (log.isWarnEnabled()) {
+ log.warn("all sessions can't downstream msg");
}
return null;
} else {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("all sessions are isolated,group:{},topic:{}", group, topic);
+ if (log.isWarnEnabled()) {
+ log.warn("all sessions are isolated,group:{},topic:{}", group, topic);
}
filtered.addAll(isolatedSessions);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventMeshRebalanceService.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventMeshRebalanceService.java
index 20f087a07..0832ae911 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventMeshRebalanceService.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventMeshRebalanceService.java
@@ -26,11 +26,11 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class EventMeshRebalanceService {
- protected final Logger logger = LoggerFactory.getLogger(EventMeshRebalanceService.class);
private EventMeshTCPServer eventMeshTCPServer;
@@ -48,7 +48,7 @@ public class EventMeshRebalanceService {
public void init() {
this.serviceRebalanceScheduler = ThreadPoolFactory.createScheduledExecutor(5, new EventMeshThreadFactory("proxy-rebalance-sch", true));
- logger.info("rebalance service inited ......");
+ log.info("rebalance service inited ......");
}
public void start() throws Exception {
@@ -57,15 +57,15 @@ public class EventMeshRebalanceService {
try {
rebalanceStrategy.doRebalance();
} catch (Exception ex) {
- logger.error("RebalanceByService failed", ex);
+ log.error("RebalanceByService failed", ex);
}
}, rebalanceIntervalMills, rebalanceIntervalMills, TimeUnit.MILLISECONDS);
- logger.info("rebalance service started......");
+ log.info("rebalance service started......");
}
public void shutdown() {
this.serviceRebalanceScheduler.shutdown();
- logger.info("rebalance service shutdown......");
+ log.info("rebalance service shutdown......");
}
public void printRebalanceThreadPoolState() {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java
index 9041b1f52..cdd7f3f3e 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java
@@ -38,12 +38,11 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
+import lombok.extern.slf4j.Slf4j;
- protected final Logger logger = LoggerFactory.getLogger(EventmeshRebalanceImpl.class);
+@Slf4j
+public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
private EventMeshTCPServer eventMeshTCPServer;
@@ -54,11 +53,11 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
@Override
public void doRebalance() throws Exception {
long startTime = System.currentTimeMillis();
- logger.info("doRebalance start===========startTime:{}", startTime);
+ log.info("doRebalance start===========startTime:{}", startTime);
Set<String> groupSet = eventMeshTCPServer.getClientSessionGroupMapping().getClientGroupMap().keySet();
if (CollectionUtils.isEmpty(groupSet)) {
- logger.warn("doRebalance failed,eventmesh has no group, please check eventmeshData");
+ log.warn("doRebalance failed,eventmesh has no group, please check eventmeshData");
return;
}
@@ -73,7 +72,7 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
doRebalanceByGroup(cluster, group, EventMeshConstants.PURPOSE_SUB, localEventMeshMap);
doRebalanceByGroup(cluster, group, EventMeshConstants.PURPOSE_PUB, localEventMeshMap);
}
- logger.info("doRebalance end===========startTime:{}, cost:{}", startTime, System.currentTimeMillis() - startTime);
+ log.info("doRebalance end===========startTime:{}, cost:{}", startTime, System.currentTimeMillis() - startTime);
}
private Map<String, String> queryLocalEventMeshMap(String cluster) {
@@ -83,7 +82,7 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
eventMeshDataInfoList = eventMeshTCPServer.getRegistry().findEventMeshInfoByCluster(cluster);
if (eventMeshDataInfoList == null || CollectionUtils.isEmpty(eventMeshDataInfoList)) {
- logger.warn("doRebalance failed,query eventmesh instances is null from registry,cluster:{}", cluster);
+ log.warn("doRebalance failed,query eventmesh instances is null from registry,cluster:{}", cluster);
return null;
}
localEventMeshMap = new HashMap<>();
@@ -96,12 +95,12 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
}
if (0 == localEventMeshMap.size()) {
- logger.warn("doRebalance failed,query eventmesh instances of localIDC is null from registry,localIDC:{},cluster:{}",
+ log.warn("doRebalance failed,query eventmesh instances of localIDC is null from registry,localIDC:{},cluster:{}",
localIdc, cluster);
return null;
}
} catch (Exception e) {
- logger.warn("doRebalance failed,findEventMeshInfoByCluster failed,cluster:{},errMsg:{}", cluster, e);
+ log.warn("doRebalance failed,findEventMeshInfoByCluster failed,cluster:{},errMsg:{}", cluster, e);
return null;
}
@@ -110,7 +109,7 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
private void doRebalanceByGroup(String cluster, String group, String purpose, Map<String,
String> eventMeshMap) throws Exception {
- logger.info("doRebalanceByGroup start, cluster:{}, group:{}, purpose:{}", cluster, group, purpose);
+ log.info("doRebalanceByGroup start, cluster:{}, group:{}, purpose:{}", cluster, group, purpose);
//query distribute data of loacl idc
Map<String, Integer> clientDistributionMap = queryLocalEventMeshDistributeData(cluster, group, purpose,
@@ -121,7 +120,7 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
doRebalanceRedirect(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshName(), group, purpose,
eventMeshMap, clientDistributionMap);
- logger.info("doRebalanceByGroup end, cluster:{}, group:{}, purpose:{}", cluster, group, purpose);
+ log.info("doRebalanceByGroup end, cluster:{}, group:{}, purpose:{}", cluster, group, purpose);
}
@@ -140,7 +139,7 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
List<String> eventMeshRecommendResult = selectRedirectEventMesh(group, eventMeshMap, clientDistributionMap,
judge, currEventMeshName);
if (eventMeshRecommendResult == null || eventMeshRecommendResult.size() != judge) {
- logger.warn("doRebalance failed,recommendEventMeshNum is not consistent,recommendResult:{},judge:{}",
+ log.warn("doRebalance failed,recommendEventMeshNum is not consistent,recommendResult:{},judge:{}",
eventMeshRecommendResult, judge);
return;
}
@@ -148,19 +147,19 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
//do redirect
doRedirect(group, purpose, judge, eventMeshRecommendResult);
} else {
- logger.info("rebalance condition not satisfy,group:{}, purpose:{},judge:{}", group, purpose, judge);
+ log.info("rebalance condition not satisfy,group:{}, purpose:{},judge:{}", group, purpose, judge);
}
}
private void doRedirect(String group, String purpose, int judge, List<String> eventMeshRecommendResult) throws Exception {
- logger.info("doRebalance redirect start---------------------group:{},judge:{}", group, judge);
+ log.info("doRebalance redirect start---------------------group:{},judge:{}", group, judge);
Set<Session> sessionSet = null;
if (EventMeshConstants.PURPOSE_SUB.equals(purpose)) {
sessionSet = eventMeshTCPServer.getClientSessionGroupMapping().getClientGroupMap().get(group).getGroupConsumerSessions();
} else if (EventMeshConstants.PURPOSE_PUB.equals(purpose)) {
sessionSet = eventMeshTCPServer.getClientSessionGroupMapping().getClientGroupMap().get(group).getGroupProducerSessions();
} else {
- logger.warn("doRebalance failed,param is illegal, group:{}, purpose:{}", group, purpose);
+ log.warn("doRebalance failed,param is illegal, group:{}, purpose:{}", group, purpose);
return;
}
List<Session> sessionList = new ArrayList<>(sessionSet);
@@ -171,10 +170,10 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
String newProxyPort = eventMeshRecommendResult.get(i).split(":")[1];
String redirectSessionAddr = EventMeshTcp2Client.redirectClient2NewEventMesh(eventMeshTCPServer, newProxyIp,
Integer.parseInt(newProxyPort), sessionList.get(i), eventMeshTCPServer.getClientSessionGroupMapping());
- logger.info("doRebalance,redirect sessionAddr:{}", redirectSessionAddr);
+ log.info("doRebalance,redirect sessionAddr:{}", redirectSessionAddr);
ThreadUtils.sleep(eventMeshTCPServer.getEventMeshTCPConfiguration().getSleepIntervalInRebalanceRedirectMills(), TimeUnit.MILLISECONDS);
}
- logger.info("doRebalance redirect end---------------------group:{}", group);
+ log.info("doRebalance redirect end---------------------group:{}", group);
}
private List<String> selectRedirectEventMesh(String group, Map<String, String> eventMeshMap,
@@ -213,7 +212,7 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
} else {
rebalanceResult = (modNum != 0 && index < modNum && index >= 0) ? avgNum + 1 : avgNum;
}
- logger.info("rebalance caculateRedirectNum,group:{}, purpose:{},sum:{},avgNum:{},"
+ log.info("rebalance caculateRedirectNum,group:{}, purpose:{},sum:{},avgNum:{},"
+
"modNum:{}, index:{}, currentNum:{}, rebalanceResult:{}", group, purpose, sum,
avgNum, modNum, index, currentNum, rebalanceResult);
@@ -229,7 +228,7 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
cluster, group, purpose);
if (MapUtils.isEmpty(eventMeshClientDistributionDataMap)) {
- logger.warn("doRebalance failed,found no distribute data in regitry, cluster:{}, group:{}, purpose:{}",
+ log.warn("doRebalance failed,found no distribute data in regitry, cluster:{}, group:{}, purpose:{}",
cluster, group, purpose);
return null;
}
@@ -244,16 +243,16 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
}
if (0 == localEventMeshDistributeData.size()) {
- logger.warn("doRebalance failed,found no distribute data of localIDC in regitry,cluster:{},group:{}, purpose:{},localIDC:{}",
+ log.warn("doRebalance failed,found no distribute data of localIDC in regitry,cluster:{},group:{}, purpose:{},localIDC:{}",
cluster, group, purpose, localIdc);
return null;
}
- logger.info("before revert clientDistributionMap:{}, group:{}, purpose:{}", localEventMeshDistributeData,
+ log.info("before revert clientDistributionMap:{}, group:{}, purpose:{}", localEventMeshDistributeData,
group, purpose);
for (String eventMeshName : localEventMeshDistributeData.keySet()) {
if (!eventMeshMap.containsKey(eventMeshName)) {
- logger.warn(
+ log.warn(
"doRebalance failed,exist eventMesh not register but exist in "
+ "distributionMap,cluster:{},grpup:{},purpose:{},eventMeshName:{}",
cluster, group, purpose, eventMeshName);
@@ -265,10 +264,10 @@ public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
localEventMeshDistributeData.put(eventMesh, 0);
}
}
- logger.info("after revert clientDistributionMap:{}, group:{}, purpose:{}", localEventMeshDistributeData,
+ log.info("after revert clientDistributionMap:{}, group:{}, purpose:{}", localEventMeshDistributeData,
group, purpose);
} catch (Exception e) {
- logger.warn("doRebalance failed,cluster:{},group:{},purpose:{},findProxyClientDistributionData failed, errMsg:{}",
+ log.warn("doRebalance failed,cluster:{},group:{},purpose:{},findProxyClientDistributionData failed, errMsg:{}",
cluster, group, purpose, e);
return null;
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/Session.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/Session.java
index 5d2424988..06aab4726 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/Session.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/Session.java
@@ -51,14 +51,16 @@ import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class Session {
protected static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
private static final Logger SUBSCRIB_LOGGER = LoggerFactory.getLogger("subscribeLogger");
- private static final Logger LOGGER = LoggerFactory.getLogger(Session.class);
-
private UserAgent client;
private InetSocketAddress remoteAddress;
@@ -233,7 +235,7 @@ public class Session {
}
);
} catch (Exception e) {
- LOGGER.error("exception while write2Client", e);
+ log.error("exception while write2Client", e);
}
}
@@ -280,7 +282,7 @@ public class Session {
}
return true;
}
-
+
@Override
public int hashCode() {
int result = 1001; //primeNumber
@@ -297,7 +299,7 @@ public class Session {
}
return result;
}
-
+
public WeakReference<ClientGroupWrapper> getClientGroupWrapper() {
return clientGroupWrapper;
}
@@ -352,12 +354,12 @@ public class Session {
public boolean isAvailable(String topic) {
if (SessionState.CLOSED == sessionState) {
- LOGGER.warn("session is not available because session has been closed,topic:{},client:{}", topic, client);
+ log.warn("session is not available because session has been closed,topic:{},client:{}", topic, client);
return false;
}
if (!sessionContext.subscribeTopics.containsKey(topic)) {
- LOGGER.warn("session is not available because session has not subscribe topic:{},client:{}", topic, client);
+ log.warn("session is not available because session has not subscribe topic:{},client:{}", topic, client);
return false;
}
@@ -366,7 +368,7 @@ public class Session {
public boolean isRunning() {
if (SessionState.RUNNING != sessionState) {
- LOGGER.warn("session is not running, state:{} client:{}", sessionState, client);
+ log.warn("session is not running, state:{} client:{}", sessionState, client);
return false;
}
return true;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/ClientAckContext.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/ClientAckContext.java
index 42684dc74..cabcc9d31 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/ClientAckContext.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/ClientAckContext.java
@@ -28,14 +28,13 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class ClientAckContext {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ClientAckContext {
private String seq;
@@ -112,9 +111,9 @@ public class ClientAckContext {
public void ackMsg() {
if (consumer != null && context != null && events != null) {
consumer.updateOffset(events, context);
- logger.info("ackMsg topic:{}, bizSeq:{}", events.get(0).getSubject(), EventMeshUtil.getMessageBizSeq(events.get(0)));
+ log.info("ackMsg topic:{}, bizSeq:{}", events.get(0).getSubject(), EventMeshUtil.getMessageBizSeq(events.get(0)));
} else {
- logger.warn("ackMsg failed,consumer is null:{}, context is null:{} , msgs is null:{}",
+ log.warn("ackMsg failed,consumer is null:{}, context is null:{} , msgs is null:{}",
consumer == null, context == null, events == null);
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
index df0558456..b260fedc8 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
@@ -34,14 +34,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class DownStreamMsgContext extends RetryContext {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class DownStreamMsgContext extends RetryContext {
public Session session;
@@ -86,10 +85,10 @@ public class DownStreamMsgContext extends RetryContext {
List<CloudEvent> events = new ArrayList<>();
events.add(event);
consumer.updateOffset(events, consumeConcurrentlyContext);
- logger.info("ackMsg seq:{}, topic:{}, bizSeq:{}", seq, events.get(0).getSubject(),
+ log.info("ackMsg seq:{}, topic:{}, bizSeq:{}", seq, events.get(0).getSubject(),
events.get(0).getExtension(EventMeshConstants.PROPERTY_MESSAGE_KEYS));
} else {
- logger.warn("ackMsg seq:{} failed,consumer is null:{}, context is null:{} , msgs is null:{}", seq,
+ log.warn("ackMsg seq:{} failed,consumer is null:{}, context is null:{} , msgs is null:{}", seq,
consumer == null, consumeConcurrentlyContext == null, event == null);
}
}
@@ -122,7 +121,7 @@ public class DownStreamMsgContext extends RetryContext {
@Override
public void retry() {
try {
- logger.info("retry downStream msg start,seq:{},retryTimes:{},bizSeq:{}", this.seq, this.retryTimes,
+ log.info("retry downStream msg start,seq:{},retryTimes:{},bizSeq:{}", this.seq, this.retryTimes,
EventMeshUtil.getMessageBizSeq(this.event));
if (isRetryMsgTimeout(this)) {
@@ -142,16 +141,16 @@ public class DownStreamMsgContext extends RetryContext {
}
if (rechoosen == null) {
- logger.warn("retry, found no session to downstream msg,seq:{}, retryTimes:{}, bizSeq:{}", this.seq,
+ log.warn("retry, found no session to downstream msg,seq:{}, retryTimes:{}, bizSeq:{}", this.seq,
this.retryTimes, EventMeshUtil.getMessageBizSeq(this.event));
} else {
this.session = rechoosen;
rechoosen.downstreamMsg(this);
- logger.info("retry downStream msg end,seq:{},retryTimes:{},bizSeq:{}", this.seq, this.retryTimes,
+ log.info("retry downStream msg end,seq:{},retryTimes:{},bizSeq:{}", this.seq, this.retryTimes,
EventMeshUtil.getMessageBizSeq(this.event));
}
} catch (Exception e) {
- logger.error("retry-dispatcher error!", e);
+ log.error("retry-dispatcher error!", e);
}
}
@@ -171,7 +170,7 @@ public class DownStreamMsgContext extends RetryContext {
double elapseTime = brokerCost + accessCost;
if (elapseTime >= ttl) {
- logger.warn("discard the retry because timeout, seq:{}, retryTimes:{}, bizSeq:{}", downStreamMsgContext.seq,
+ log.warn("discard the retry because timeout, seq:{}, retryTimes:{}, bizSeq:{}", downStreamMsgContext.seq,
downStreamMsgContext.retryTimes, EventMeshUtil.getMessageBizSeq(downStreamMsgContext.event));
flag = true;
eventMeshAckMsg(downStreamMsgContext);
@@ -187,7 +186,7 @@ public class DownStreamMsgContext extends RetryContext {
private void eventMeshAckMsg(DownStreamMsgContext downStreamMsgContext) {
List<CloudEvent> msgExts = new ArrayList<>();
msgExts.add(downStreamMsgContext.event);
- logger.warn("eventMeshAckMsg topic:{}, seq:{}, bizSeq:{}", downStreamMsgContext.event.getSubject(),
+ log.warn("eventMeshAckMsg topic:{}, seq:{}, bizSeq:{}", downStreamMsgContext.event.getSubject(),
downStreamMsgContext.seq, downStreamMsgContext.event.getExtension(EventMeshConstants.PROPERTY_MESSAGE_KEYS));
downStreamMsgContext.consumer.updateOffset(msgExts, downStreamMsgContext.consumeConcurrentlyContext);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java
index 7b721467f..365fbf318 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java
@@ -25,12 +25,11 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class PushContext {
+import lombok.extern.slf4j.Slf4j;
- public Logger logger = LoggerFactory.getLogger(this.getClass());
+@Slf4j
+public class PushContext {
private SessionPusher sessionPusher;
@@ -56,7 +55,7 @@ public class PushContext {
public void unAckMsg(String seq, DownStreamMsgContext downStreamMsgContext) {
unAckMsg.put(seq, downStreamMsgContext);
- logger.info("put msg in unAckMsg,seq:{},unAckMsgSize:{}", seq, getTotalUnackMsgs());
+ log.info("put msg in unAckMsg,seq:{},unAckMsgSize:{}", seq, getTotalUnackMsgs());
}
public int getTotalUnackMsgs() {
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 34942b983..dc51cfd52 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
@@ -47,12 +47,14 @@ import io.cloudevents.core.builder.CloudEventBuilder;
import io.netty.channel.ChannelFutureListener;
import io.opentelemetry.api.trace.Span;
-public class SessionPusher {
- private final Logger messageLogger = LoggerFactory.getLogger("message");
+import lombok.extern.slf4j.Slf4j;
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
+@Slf4j
+public class SessionPusher {
+ private final Logger messageLogger = LoggerFactory.getLogger("message");
+
private final AtomicLong deliveredMsgsCount = new AtomicLong(0);
private final AtomicLong deliverFailMsgsCount = new AtomicLong(0);
@@ -123,7 +125,7 @@ public class SessionPusher {
session.getContext().writeAndFlush(pkg).addListener(
(ChannelFutureListener) future -> {
if (!future.isSuccess()) {
- logger.error("downstreamMsg fail,seq:{}, retryTimes:{}, event:{}", downStreamMsgContext.seq,
+ log.error("downstreamMsg fail,seq:{}, retryTimes:{}, event:{}", downStreamMsgContext.seq,
downStreamMsgContext.retryTimes, downStreamMsgContext.event);
deliverFailMsgsCount.incrementAndGet();
@@ -131,7 +133,7 @@ public class SessionPusher {
long isolateTime = System.currentTimeMillis()
+ session.getEventMeshTCPConfiguration().getEventMeshTcpPushFailIsolateTimeInMills();
session.setIsolateTime(isolateTime);
- logger.warn("isolate client:{},isolateTime:{}", session.getClient(), isolateTime);
+ log.warn("isolate client:{},isolateTime:{}", session.getClient(), isolateTime);
//retry
long delayTime = SubscriptionType.SYNC == downStreamMsgContext.subscriptionItem.getType()
@@ -141,11 +143,11 @@ public class SessionPusher {
Objects.requireNonNull(session.getClientGroupWrapper().get()).getEventMeshTcpRetryer().pushRetry(downStreamMsgContext);
} else {
deliveredMsgsCount.incrementAndGet();
- logger.info("downstreamMsg success,seq:{}, retryTimes:{}, bizSeq:{}", downStreamMsgContext.seq,
+ log.info("downstreamMsg success,seq:{}, retryTimes:{}, bizSeq:{}", downStreamMsgContext.seq,
downStreamMsgContext.retryTimes, EventMeshUtil.getMessageBizSeq(downStreamMsgContext.event));
if (session.isIsolated()) {
- logger.info("cancel isolated,client:{}", session.getClient());
+ log.info("cancel isolated,client:{}", session.getClient());
session.setIsolateTime(System.currentTimeMillis());
}
}
@@ -160,7 +162,7 @@ public class SessionPusher {
public void unAckMsg(String seq, DownStreamMsgContext downStreamMsgContext) {
downStreamMap.put(seq, downStreamMsgContext);
- logger.info("put msg in unAckMsg,seq:{},unAckMsgSize:{}", seq, getTotalUnackMsgs());
+ log.info("put msg in unAckMsg,seq:{},unAckMsgSize:{}", seq, getTotalUnackMsgs());
}
public int getTotalUnackMsgs() {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/retry/EventMeshTcpRetryer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/retry/EventMeshTcpRetryer.java
index 8efa9d71d..7e4921adb 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/retry/EventMeshTcpRetryer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/retry/EventMeshTcpRetryer.java
@@ -28,12 +28,11 @@ import java.util.concurrent.DelayQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class EventMeshTcpRetryer {
+import lombok.extern.slf4j.Slf4j;
- public static final Logger logger = LoggerFactory.getLogger(EventMeshTcpRetryer.class);
+@Slf4j
+public class EventMeshTcpRetryer {
private EventMeshTCPServer eventMeshTCPServer;
@@ -62,7 +61,7 @@ public class EventMeshTcpRetryer {
public void pushRetry(RetryContext retryContext) {
if (retrys.size() >= eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshTcpMsgRetryQueueSize()) {
- logger.error("pushRetry fail,retrys is too much,allow max retryQueueSize:{}, retryTimes:{}, seq:{}, bizSeq:{}",
+ log.error("pushRetry fail,retrys is too much,allow max retryQueueSize:{}, retryTimes:{}, seq:{}, bizSeq:{}",
eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshTcpMsgRetryQueueSize(), retryContext.retryTimes,
retryContext.seq, EventMeshUtil.getMessageBizSeq(retryContext.event));
return;
@@ -77,13 +76,13 @@ public class EventMeshTcpRetryer {
}
if (retryContext.retryTimes >= maxRetryTimes) {
- logger.warn("pushRetry fail,retry over maxRetryTimes:{}, retryTimes:{}, seq:{}, bizSeq:{}", maxRetryTimes,
+ log.warn("pushRetry fail,retry over maxRetryTimes:{}, retryTimes:{}, seq:{}, bizSeq:{}", maxRetryTimes,
retryContext.retryTimes, retryContext.seq, EventMeshUtil.getMessageBizSeq(retryContext.event));
return;
}
retrys.offer(retryContext);
- logger.info("pushRetry success,seq:{}, retryTimes:{}, bizSeq:{}", retryContext.seq, retryContext.retryTimes,
+ log.info("pushRetry success,seq:{}, retryTimes:{}, bizSeq:{}", retryContext.seq, retryContext.retryTimes,
EventMeshUtil.getMessageBizSeq(retryContext.event));
}
@@ -95,21 +94,21 @@ public class EventMeshTcpRetryer {
pool.execute(retryContext::retry);
}
} catch (Exception e) {
- logger.error("retry-dispatcher error!", e);
+ log.error("retry-dispatcher error!", e);
}
}, "retry-dispatcher");
dispatcher.setDaemon(true);
- logger.info("EventMeshTcpRetryer inited......");
+ log.info("EventMeshTcpRetryer inited......");
}
public void start() throws Exception {
dispatcher.start();
- logger.info("EventMeshTcpRetryer started......");
+ log.info("EventMeshTcpRetryer started......");
}
public void shutdown() {
pool.shutdown();
- logger.info("EventMeshTcpRetryer shutdown......");
+ log.info("EventMeshTcpRetryer shutdown......");
}
public int getRetrySize() {
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 b5b7500f7..ef7cfa4c2 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
@@ -49,10 +49,13 @@ import io.cloudevents.CloudEvent;
import io.cloudevents.core.builder.CloudEventBuilder;
import io.opentelemetry.api.trace.Span;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class SessionSender {
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
- private static final Logger LOGGER = LoggerFactory.getLogger(SessionSender.class);
private final transient Session session;
@@ -146,12 +149,12 @@ public class SessionSender {
.getEventMesh2mqMsgNum()
.incrementAndGet();
} else {
- LOGGER.warn("send too fast,session flow control,session:{}", session.getClient());
+ log.warn("send too fast,session flow control,session:{}", session.getClient());
return new EventMeshTcpSendResult(header.getSeq(), EventMeshTcpSendStatus.SEND_TOO_FAST,
EventMeshTcpSendStatus.SEND_TOO_FAST.name());
}
} catch (Exception e) {
- LOGGER.warn("SessionSender send failed", e);
+ log.warn("SessionSender send failed", e);
if (!(e instanceof InterruptedException)) {
upstreamBuff.release();
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java
index 98bb827c7..78d6ba407 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java
@@ -35,14 +35,13 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
-public class UpStreamMsgContext extends RetryContext {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class UpStreamMsgContext extends RetryContext {
private Session session;
@@ -87,7 +86,7 @@ public class UpStreamMsgContext extends RetryContext {
@Override
public void retry() {
- logger.info("retry upStream msg start,seq:{},retryTimes:{},bizSeq:{}", this.seq, this.retryTimes,
+ log.info("retry upStream msg start,seq:{},retryTimes:{},bizSeq:{}", this.seq, this.retryTimes,
EventMeshUtil.getMessageBizSeq(this.event));
try {
@@ -102,14 +101,14 @@ public class UpStreamMsgContext extends RetryContext {
createSendCallback(replyCmd, taskExecuteTime, event, this), startTime, taskExecuteTime);
if (StringUtils.equals(EventMeshTcpSendStatus.SUCCESS.name(), sendStatus.getSendStatus().name())) {
- logger.info("pkg|eventMesh2mq|cmd={}|event={}|user={}|wait={}ms|cost={}ms", header.getCmd(), event,
+ log.info("pkg|eventMesh2mq|cmd={}|event={}|user={}|wait={}ms|cost={}ms", header.getCmd(), event,
session.getClient(), taskExecuteTime - startTime, sendTime - startTime);
} else {
throw new Exception(sendStatus.getDetail());
}
}
} catch (Exception e) {
- logger.error("TCP UpstreamMsg Retry error", e);
+ log.error("TCP UpstreamMsg Retry error", e);
}
}
@@ -121,7 +120,7 @@ public class UpStreamMsgContext extends RetryContext {
@Override
public void onSuccess(SendResult sendResult) {
session.getSender().getUpstreamBuff().release();
- logger.info("upstreamMsg message success|user={}|callback cost={}", session.getClient(),
+ log.info("upstreamMsg message success|user={}|callback cost={}", session.getClient(),
System.currentTimeMillis() - createTime);
if (replyCmd == Command.BROADCAST_MESSAGE_TO_SERVER_ACK || replyCmd == Command
.ASYNC_MESSAGE_TO_SERVER_ACK) {
@@ -141,7 +140,7 @@ public class UpStreamMsgContext extends RetryContext {
Objects.requireNonNull(session.getClientGroupWrapper().get()).getEventMeshTcpRetryer().pushRetry(retryContext);
session.getSender().failMsgCount.incrementAndGet();
- logger.error("upstreamMsg mq message error|user={}|callback cost={}, errMsg={}", session.getClient(),
+ log.error("upstreamMsg mq message error|user={}|callback cost={}, errMsg={}", session.getClient(),
System.currentTimeMillis() - createTime, new Exception(context.getException()));
msg.setHeader(new Header(replyCmd, OPStatus.FAIL.getCode(), context.getException().toString(), seq));
msg.setBody(event);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/GoodbyeTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/GoodbyeTask.java
index de3455e45..54defc3c6 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/GoodbyeTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/GoodbyeTask.java
@@ -29,14 +29,13 @@ import org.apache.eventmesh.runtime.util.Utils;
import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class GoodbyeTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(GoodbyeTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class GoodbyeTask extends AbstractTask {
public GoodbyeTask(Package pkg, ChannelHandlerContext ctx, long startTime, EventMeshTCPServer eventMeshTCPServer) {
super(pkg, ctx, startTime, eventMeshTCPServer);
@@ -48,14 +47,14 @@ public class GoodbyeTask extends AbstractTask {
Package msg = new Package();
try {
if (pkg.getHeader().getCmd() == Command.SERVER_GOODBYE_RESPONSE) {
- LOGGER.info("client|address={}| has reject ", session.getContext().channel().remoteAddress());
+ log.info("client|address={}| has reject ", session.getContext().channel().remoteAddress());
} else {
msg.setHeader(
new Header(CLIENT_GOODBYE_RESPONSE, OPStatus.SUCCESS.getCode(), OPStatus.SUCCESS.getDesc(),
pkg.getHeader().getSeq()));
}
} catch (Exception e) {
- LOGGER.error("GoodbyeTask failed|user={}|errMsg={}", session.getClient(), e);
+ log.error("GoodbyeTask failed|user={}|errMsg={}", session.getClient(), e);
msg.setHeader(new Header(CLIENT_GOODBYE_RESPONSE, OPStatus.FAIL.getCode(), Arrays.toString(e.getStackTrace()),
pkg.getHeader().getSeq()));
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HeartBeatTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HeartBeatTask.java
index 7d2b8fce9..f2ce96c4c 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HeartBeatTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HeartBeatTask.java
@@ -30,14 +30,13 @@ import org.apache.eventmesh.runtime.util.Utils;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class HeartBeatTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(HeartBeatTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class HeartBeatTask extends AbstractTask {
private final Acl acl;
@@ -63,7 +62,7 @@ public class HeartBeatTask extends AbstractTask {
res.setHeader(new Header(HEARTBEAT_RESPONSE, OPStatus.SUCCESS.getCode(), OPStatus.SUCCESS.getDesc(),
pkg.getHeader().getSeq()));
} catch (Exception e) {
- LOGGER.error("HeartBeatTask failed|user={}|errMsg={}", Objects.requireNonNull(session).getClient(), e);
+ log.error("HeartBeatTask failed|user={}|errMsg={}", Objects.requireNonNull(session).getClient(), e);
res.setHeader(new Header(HEARTBEAT_RESPONSE, OPStatus.FAIL.getCode(), "exception while "
+ "heartbeating", pkg.getHeader().getSeq()));
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HelloTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HelloTask.java
index 1ea200801..3180059ad 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HelloTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/HelloTask.java
@@ -43,9 +43,11 @@ import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
-public class HelloTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(HelloTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class HelloTask extends AbstractTask {
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
@@ -70,7 +72,7 @@ public class HelloTask extends AbstractTask {
}
if (eventMeshTCPServer.getEventMeshServer().getServiceState() != ServiceState.RUNNING) {
- LOGGER.error("server state is not running:{}", eventMeshTCPServer.getEventMeshServer().getServiceState());
+ log.error("server state is not running:{}", eventMeshTCPServer.getEventMeshServer().getServiceState());
throw new Exception("server state is not running, maybe deploying...");
}
@@ -92,7 +94,7 @@ public class HelloTask extends AbstractTask {
} else {
Utils.logSucceedMessageFlow(res, user, startTime, taskExecuteTime);
}
- LOGGER.warn("HelloTask failed,close session,addr:{}", ctx.channel().remoteAddress());
+ log.warn("HelloTask failed,close session,addr:{}", ctx.channel().remoteAddress());
eventMeshTCPServer.getClientSessionGroupMapping().closeSession(ctx);
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/ListenTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/ListenTask.java
index c4fef8d44..e9c65ce2b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/ListenTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/ListenTask.java
@@ -24,14 +24,13 @@ import org.apache.eventmesh.common.protocol.tcp.OPStatus;
import org.apache.eventmesh.common.protocol.tcp.Package;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class ListenTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(ListenTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ListenTask extends AbstractTask {
public ListenTask(Package pkg, ChannelHandlerContext ctx, long startTime, EventMeshTCPServer eventMeshTCPServer) {
super(pkg, ctx, startTime, eventMeshTCPServer);
@@ -47,7 +46,7 @@ public class ListenTask extends AbstractTask {
eventMeshTCPServer.getClientSessionGroupMapping().readySession(session);
}
} catch (Exception e) {
- LOGGER.error("ListenTask failed|user={}|errMsg={}", session.getClient(), e);
+ log.error("ListenTask failed|user={}|errMsg={}", session.getClient(), e);
Integer status = OPStatus.FAIL.getCode();
header = new Header(LISTEN_RESPONSE, status, e.toString(), pkg.getHeader().getSeq());
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageAckTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageAckTask.java
index 52af98718..3541d980b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageAckTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageAckTask.java
@@ -27,9 +27,11 @@ import org.slf4j.LoggerFactory;
import io.netty.channel.ChannelHandlerContext;
-public class MessageAckTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(MessageAckTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class MessageAckTask extends AbstractTask {
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
@@ -44,7 +46,7 @@ public class MessageAckTask extends AbstractTask {
Command cmd = pkg.getHeader().getCmd();
if (seq == null) {
- LOGGER.error("MessageAckTask failed, seq cannot be null|user={}", session.getClient());
+ log.error("MessageAckTask failed, seq cannot be null|user={}", session.getClient());
return;
}
DownStreamMsgContext downStreamMsgContext = session.getPusher().getUnAckMsg().get(seq);
@@ -54,7 +56,7 @@ public class MessageAckTask extends AbstractTask {
session.getPusher().getUnAckMsg().remove(seq);
} else {
if (cmd != Command.RESPONSE_TO_CLIENT_ACK) {
- LOGGER.warn("MessageAckTask, seq:{}, downStreamMsgContext not in downStreamMap,client:{}",
+ log.warn("MessageAckTask, seq:{}, downStreamMsgContext not in downStreamMap,client:{}",
seq, session.getClient());
}
}
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 30f82ff02..1407d190c 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
@@ -60,9 +60,12 @@ import io.netty.channel.ChannelHandlerContext;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class MessageTransferTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(MessageTransferTask.class);
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
private static final int TRY_PERMIT_TIME_OUT = 5;
@@ -91,7 +94,7 @@ public class MessageTransferTask extends AbstractTask {
ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).set(context);
}
} catch (Throwable ex) {
- LOGGER.warn("upload trace fail in MessageTransferTask[server-span-start]", ex);
+ log.warn("upload trace fail in MessageTransferTask[server-span-start]", ex);
}
Command replyCmd = getReplyCmd(cmd);
@@ -142,7 +145,7 @@ public class MessageTransferTask extends AbstractTask {
TraceUtils.finishSpanWithException(ctx, event, "Tps overload, global flow control", null);
- LOGGER.warn("======Tps overload, global flow control, rate:{}! PLEASE CHECK!========", eventMeshTCPServer.getRateLimiter().getRate());
+ log.warn("======Tps overload, global flow control, rate:{}! PLEASE CHECK!========", eventMeshTCPServer.getRateLimiter().getRate());
return;
}
@@ -165,9 +168,9 @@ public class MessageTransferTask extends AbstractTask {
}
}
} catch (Exception e) {
- LOGGER.error("MessageTransferTask failed|cmd={}|event={}|user={}", cmd, event,
- session.getClient(),
- e);
+ log.error("MessageTransferTask failed|cmd={}|event={}|user={}", cmd, event,
+ session.getClient(),
+ e);
if (cmd != RESPONSE_TO_SERVER) {
msg.setHeader(
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/RecommendTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/RecommendTask.java
index b2b556a64..46702c345 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/RecommendTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/RecommendTask.java
@@ -36,9 +36,11 @@ import org.slf4j.LoggerFactory;
import io.netty.channel.ChannelHandlerContext;
-public class RecommendTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(RecommendTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class RecommendTask extends AbstractTask {
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
@@ -102,4 +104,4 @@ public class RecommendTask extends AbstractTask {
}
return userAgent.getGroup();
}
-}
\ No newline at end of file
+}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/SubscribeTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/SubscribeTask.java
index a6dd62b42..b4232a25e 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/SubscribeTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/SubscribeTask.java
@@ -32,14 +32,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class SubscribeTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(SubscribeTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SubscribeTask extends AbstractTask {
private final Acl acl;
@@ -71,13 +70,13 @@ public class SubscribeTask extends AbstractTask {
synchronized (session) {
session.subscribe(subscriptionItems);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("SubscribeTask succeed|user={}|topics={}", session.getClient(), subscriptionItems);
+ if (log.isInfoEnabled()) {
+ log.info("SubscribeTask succeed|user={}|topics={}", session.getClient(), subscriptionItems);
}
}
msg.setHeader(new Header(Command.SUBSCRIBE_RESPONSE, OPStatus.SUCCESS.getCode(), OPStatus.SUCCESS.getDesc(), pkg.getHeader().getSeq()));
} catch (Exception e) {
- LOGGER.error("SubscribeTask failed|user={}|errMsg={}", session.getClient(), e);
+ log.error("SubscribeTask failed|user={}|errMsg={}", session.getClient(), e);
msg.setHeader(new Header(Command.SUBSCRIBE_RESPONSE, OPStatus.FAIL.getCode(), e.toString(), pkg.getHeader().getSeq()));
} finally {
Utils.writeAndFlush(msg, startTime, taskExecuteTime, session.getContext(), session);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/UnSubscribeTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/UnSubscribeTask.java
index 91cf712e1..d32e00f0a 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/UnSubscribeTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/UnSubscribeTask.java
@@ -36,9 +36,11 @@ import org.slf4j.LoggerFactory;
import io.netty.channel.ChannelHandlerContext;
-public class UnSubscribeTask extends AbstractTask {
- private static final Logger LOGGER = LoggerFactory.getLogger(UnSubscribeTask.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class UnSubscribeTask extends AbstractTask {
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/HTTPMetricsServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/HTTPMetricsServer.java
index 2b3707ead..32655f24d 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/HTTPMetricsServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/HTTPMetricsServer.java
@@ -29,13 +29,11 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class HTTPMetricsServer {
- private static final Logger LOGGER = LoggerFactory.getLogger(HTTPMetricsServer.class);
-
private final transient EventMeshHTTPServer eventMeshHTTPServer;
private final transient List<MetricsRegistry> metricsRegistries;
@@ -60,16 +58,16 @@ public class HTTPMetricsServer {
private void init() {
metricsRegistries.forEach(MetricsRegistry::start);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("HTTPMetricsServer initialized.");
+ if (log.isInfoEnabled()) {
+ log.info("HTTPMetricsServer initialized.");
}
}
public void start() {
metricsRegistries.forEach(metricsRegistry -> {
metricsRegistry.register(summaryMetrics);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Register httpMetrics to {}", metricsRegistry.getClass().getName());
+ if (log.isInfoEnabled()) {
+ log.info("Register httpMetrics to {}", metricsRegistry.getClass().getName());
}
});
@@ -80,7 +78,7 @@ public class HTTPMetricsServer {
summaryMetrics.snapshotSendMsgTPS();
summaryMetrics.snapshotPushMsgTPS();
} catch (Exception ex) {
- LOGGER.error("eventMesh snapshot tps metrics err", ex);
+ log.error("eventMesh snapshot tps metrics err", ex);
}
}, 0, 1000, TimeUnit.MILLISECONDS);
@@ -88,20 +86,20 @@ public class HTTPMetricsServer {
try {
logPrintServerMetrics(summaryMetrics, eventMeshHTTPServer);
} catch (Exception ex) {
- LOGGER.error("eventMesh print metrics err", ex);
+ log.error("eventMesh print metrics err", ex);
}
}, 1000, 30 * 1000, TimeUnit.MILLISECONDS);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("HTTPMetricsServer started.");
+ if (log.isInfoEnabled()) {
+ log.info("HTTPMetricsServer started.");
}
}
public void shutdown() {
metricsSchedule.shutdown();
metricsRegistries.forEach(MetricsRegistry::showdown);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("HTTPMetricsServer shutdown.");
+ if (log.isInfoEnabled()) {
+ log.info("HTTPMetricsServer shutdown.");
}
}
@@ -112,10 +110,10 @@ public class HTTPMetricsServer {
private void logPrintServerMetrics(final HttpSummaryMetrics summaryMetrics,
final EventMeshHTTPServer eventMeshHTTPServer) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("===========================================SERVER METRICS==================================================");
+ if (log.isInfoEnabled()) {
+ log.info("===========================================SERVER METRICS==================================================");
- LOGGER.info("maxHTTPTPS: {}, avgHTTPTPS: {}, maxHTTPCOST: {}, avgHTTPCOST: {}, avgHTTPBodyDecodeCost: {}, httpDiscard: {}",
+ log.info("maxHTTPTPS: {}, avgHTTPTPS: {}, maxHTTPCOST: {}, avgHTTPCOST: {}, avgHTTPBodyDecodeCost: {}, httpDiscard: {}",
summaryMetrics.maxHTTPTPS(),
summaryMetrics.avgHTTPTPS(),
summaryMetrics.maxHTTPCost(),
@@ -126,8 +124,8 @@ public class HTTPMetricsServer {
summaryMetrics.httpStatInfoClear();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("maxBatchSendMsgTPS: {}, avgBatchSendMsgTPS: {}, sum: {}. sumFail: {}, sumFailRate: {}, discard : {}",
+ if (log.isInfoEnabled()) {
+ log.info("maxBatchSendMsgTPS: {}, avgBatchSendMsgTPS: {}, sum: {}. sumFail: {}, sumFailRate: {}, discard : {}",
summaryMetrics.maxSendBatchMsgTPS(),
summaryMetrics.avgSendBatchMsgTPS(),
summaryMetrics.getSendBatchMsgNumSum(),
@@ -139,8 +137,8 @@ public class HTTPMetricsServer {
summaryMetrics.cleanSendBatchStat();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("maxSendMsgTPS: {}, avgSendMsgTPS: {}, sum: {}, sumFail: {}, sumFailRate: {}, replyMsg: {}, replyFail: {}",
+ if (log.isInfoEnabled()) {
+ log.info("maxSendMsgTPS: {}, avgSendMsgTPS: {}, sum: {}, sumFail: {}, sumFailRate: {}, replyMsg: {}, replyFail: {}",
summaryMetrics.maxSendMsgTPS(),
summaryMetrics.avgSendMsgTPS(),
summaryMetrics.getSendMsgNumSum(),
@@ -153,8 +151,8 @@ public class HTTPMetricsServer {
summaryMetrics.cleanSendMsgStat();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info(
+ if (log.isInfoEnabled()) {
+ log.info(
"maxPushMsgTPS: {}, avgPushMsgTPS: {}, sum: {}, sumFail: {}, sumFailRate: {}, maxClientLatency: {}, avgClientLatency: {}",
summaryMetrics.maxPushMsgTPS(),
summaryMetrics.avgPushMsgTPS(),
@@ -168,16 +166,16 @@ public class HTTPMetricsServer {
summaryMetrics.cleanHttpPushMsgStat();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("batchMsgQ: {}, sendMsgQ: {}, pushMsgQ: {}, httpRetryQ: {}",
+ if (log.isInfoEnabled()) {
+ log.info("batchMsgQ: {}, sendMsgQ: {}, pushMsgQ: {}, httpRetryQ: {}",
eventMeshHTTPServer.getBatchMsgExecutor().getQueue().size(),
eventMeshHTTPServer.getSendMsgExecutor().getQueue().size(),
eventMeshHTTPServer.getPushMsgExecutor().getQueue().size(),
eventMeshHTTPServer.getHttpRetryer().size());
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("batchAvgSend2MQCost: {}, avgSend2MQCost: {}, avgReply2MQCost: {}",
+ if (log.isInfoEnabled()) {
+ log.info("batchAvgSend2MQCost: {}, avgSend2MQCost: {}, avgReply2MQCost: {}",
summaryMetrics.avgBatchSendMsgCost(),
summaryMetrics.avgSendMsgCost(),
summaryMetrics.avgReplyMsgCost());
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/registry/Registry.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/registry/Registry.java
index 6deaa5f8f..cb95af598 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/registry/Registry.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/registry/Registry.java
@@ -26,11 +26,11 @@ import org.apache.eventmesh.spi.EventMeshExtensionFactory;
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class Registry {
- private static final Logger logger = LoggerFactory.getLogger(Registry.class);
private volatile boolean inited = false;
@@ -42,7 +42,7 @@ public class Registry {
if (!inited) {
registryService = EventMeshExtensionFactory.getExtension(RegistryService.class, registryPluginType);
if (registryService == null) {
- logger.error("can't load the registryService plugin, please check.");
+ log.error("can't load the registryService plugin, please check.");
throw new RuntimeException("doesn't load the registryService plugin, please check.");
}
registryService.init();
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/LogExporter.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/LogExporter.java
index 9bad68735..12e5d27e2 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/LogExporter.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/LogExporter.java
@@ -19,20 +19,20 @@ package org.apache.eventmesh.runtime.trace;
import java.util.Collection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.sdk.trace.export.SpanExporter;
+
+import lombok.extern.slf4j.Slf4j;
+
/**
* Because the class 'LoggingSpanExporter' in openTelemetry exported garbled code in eventMesh's startUp,
* I override the 'LoggingSpanExporter'.
*/
+@Slf4j
public class LogExporter implements SpanExporter {
- private static final Logger logger = LoggerFactory.getLogger(LogExporter.class);
@Override
public CompletableResultCode export(Collection<SpanData> spans) {
@@ -58,7 +58,7 @@ public class LogExporter implements SpanExporter {
: instrumentationLibraryInfo.getVersion())
.append("] ")
.append(span.getAttributes());
- logger.info(sb.toString());
+ log.info(sb.toString());
}
return CompletableResultCode.ofSuccess();
}
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 2be2a269f..b20c9b435 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
@@ -23,9 +23,6 @@ import org.apache.eventmesh.trace.api.TracePluginFactory;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import io.netty.channel.ChannelHandlerContext;
import io.opentelemetry.api.trace.Span;
@@ -33,8 +30,11 @@ import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class Trace {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
private final boolean useTrace;
private EventMeshTraceService eventMeshTraceService;
@@ -96,7 +96,7 @@ public class Trace {
Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
if (span == null) {
- logger.warn("span is null when finishSpan");
+ log.warn("span is null when finishSpan");
return null;
}
@@ -113,7 +113,7 @@ public class Trace {
}
if (span == null) {
- logger.warn("span is null when finishSpan");
+ log.warn("span is null when finishSpan");
return null;
}
@@ -133,7 +133,7 @@ public class Trace {
}
if (span == null) {
- logger.warn("span is null when finishSpan");
+ log.warn("span is null when finishSpan");
return null;
}
@@ -154,7 +154,7 @@ public class Trace {
Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
if (span == null) {
- logger.warn("span is null when finishSpan");
+ log.warn("span is null when finishSpan");
return;
}
if (statusCode != null) {
@@ -163,7 +163,7 @@ public class Trace {
span.end();
}
} catch (Exception e) {
- logger.warn("finishSpan occur exception,", e);
+ log.warn("finishSpan occur exception,", e);
}
}
@@ -171,7 +171,7 @@ public class Trace {
try {
if (useTrace) {
if (span == null) {
- logger.warn("span is null when finishSpan");
+ log.warn("span is null when finishSpan");
return;
}
if (statusCode != null) {
@@ -180,7 +180,7 @@ public class Trace {
span.end();
}
} catch (Exception e) {
- logger.warn("finishSpan occur exception,", e);
+ log.warn("finishSpan occur exception,", e);
}
}
@@ -188,7 +188,7 @@ public class Trace {
try {
if (useTrace) {
if (span == null) {
- logger.warn("span is null when finishSpan");
+ log.warn("span is null when finishSpan");
return;
}
if (statusCode != null) {
@@ -200,7 +200,7 @@ public class Trace {
span.end();
}
} catch (Exception e) {
- logger.warn("finishSpan occur exception,", e);
+ log.warn("finishSpan occur exception,", e);
}
}
@@ -212,7 +212,7 @@ public class Trace {
Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
if (span == null) {
- logger.warn("span is null when finishSpan");
+ log.warn("span is null when finishSpan");
return;
}
if (statusCode != null) {
@@ -224,7 +224,7 @@ public class Trace {
span.end();
}
} catch (Exception e) {
- logger.warn("finishSpan occur exception,", e);
+ log.warn("finishSpan occur exception,", e);
}
}
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/trace/TraceUtils.java
index c8ea2cc8a..41cd1f8e0 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/TraceUtils.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/TraceUtils.java
@@ -22,9 +22,6 @@ import org.apache.eventmesh.runtime.boot.EventMeshServer;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import io.netty.channel.ChannelHandlerContext;
import io.opentelemetry.api.trace.Span;
@@ -32,8 +29,11 @@ import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class TraceUtils {
- private static Logger logger = LoggerFactory.getLogger(TraceUtils.class);
public static Span prepareClientSpan(Map<String, Object> map, String spanName,
boolean isSpanFinishInOtherThread) {
@@ -43,7 +43,7 @@ public class TraceUtils {
spanName, SpanKind.CLIENT, Context.current(), isSpanFinishInOtherThread);
EventMeshServer.getTrace().inject(Context.current(), map);
} catch (Throwable ex) {
- logger.warn("upload trace fail when prepareSpan", ex);
+ log.warn("upload trace fail when prepareSpan", ex);
}
return span;
}
@@ -56,7 +56,7 @@ public class TraceUtils {
span = EventMeshServer.getTrace()
.createSpan(spanName, SpanKind.SERVER, traceContext, isSpanFinishInOtherThread);
} catch (Throwable ex) {
- logger.warn("upload trace fail when prepareSpan", ex);
+ log.warn("upload trace fail when prepareSpan", ex);
}
return span;
}
@@ -75,7 +75,7 @@ public class TraceUtils {
.createSpan(spanName, SpanKind.SERVER, traceContext, isSpanFinishInOtherThread);
}
} catch (Throwable ex) {
- logger.warn("upload trace fail when prepareSpan", ex);
+ log.warn("upload trace fail when prepareSpan", ex);
}
return span;
}
@@ -83,22 +83,22 @@ public class TraceUtils {
public static void finishSpan(Span span, CloudEvent event) {
try {
- logger.debug("finishSpan with event:{}", event);
+ log.debug("finishSpan with event:{}", event);
EventMeshServer.getTrace().addTraceInfoToSpan(span, event);
EventMeshServer.getTrace().finishSpan(span, StatusCode.OK);
} catch (Throwable ex) {
- logger.warn("upload trace fail when finishSpan", ex);
+ log.warn("upload trace fail when finishSpan", ex);
}
}
public static void finishSpan(ChannelHandlerContext ctx, CloudEvent event) {
try {
- logger.debug("finishSpan with event:{}", event);
+ log.debug("finishSpan with event:{}", event);
EventMeshServer.getTrace().addTraceInfoToSpan(ctx, event);
EventMeshServer.getTrace().finishSpan(ctx, StatusCode.OK);
} catch (Throwable ex) {
- logger.warn("upload trace fail when finishSpan", ex);
+ log.warn("upload trace fail when finishSpan", ex);
}
}
@@ -106,22 +106,22 @@ public class TraceUtils {
public static void finishSpanWithException(ChannelHandlerContext ctx, CloudEvent event,
String errMsg, Throwable e) {
try {
- logger.debug("finishSpanWithException with event:{}", event);
+ log.debug("finishSpanWithException with event:{}", event);
EventMeshServer.getTrace().addTraceInfoToSpan(ctx, event);
EventMeshServer.getTrace().finishSpan(ctx, StatusCode.ERROR, errMsg, e);
} catch (Throwable ex) {
- logger.warn("upload trace fail when finishSpanWithException", ex);
+ log.warn("upload trace fail when finishSpanWithException", ex);
}
}
public static void finishSpanWithException(Span span, Map<String, Object> map, String errMsg,
Throwable e) {
try {
- logger.debug("finishSpanWithException with map:{}", map);
+ log.debug("finishSpanWithException with map:{}", map);
EventMeshServer.getTrace().addTraceInfoToSpan(span, map);
EventMeshServer.getTrace().finishSpan(span, StatusCode.ERROR, errMsg, e);
} catch (Throwable ex) {
- logger.warn("upload trace fail when finishSpanWithException", ex);
+ log.warn("upload trace fail when finishSpanWithException", ex);
}
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
index badb953b8..f248b7c73 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
@@ -46,9 +46,6 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.ThreadPoolExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.cloudevents.CloudEvent;
import io.cloudevents.SpecVersion;
import io.cloudevents.core.v03.CloudEventV03;
@@ -59,11 +56,11 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class EventMeshUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(EventMeshUtil.class);
-
public static String buildPushMsgSeqNo() {
return new StringBuilder()
.append(StringUtils.rightPad(String.valueOf(System.currentTimeMillis()), 6))
@@ -182,8 +179,8 @@ public class EventMeshUtil {
public static String getLocalAddr() {
//priority of networkInterface when generating client ip
final String priority = System.getProperty("networkInterface.priority", "bond1<eth1<eth0");
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("networkInterface.priority: {}", priority);
+ if (log.isDebugEnabled()) {
+ log.debug("networkInterface.priority: {}", priority);
}
final List<String> preferList = new ArrayList<>();
@@ -211,14 +208,14 @@ public class EventMeshUtil {
final ArrayList<String> ipv6Result = new ArrayList<>();
if (preferNetworkInterface != null) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("use preferNetworkInterface:{}", preferNetworkInterface);
+ if (log.isDebugEnabled()) {
+ log.debug("use preferNetworkInterface:{}", preferNetworkInterface);
}
final Enumeration<InetAddress> en = preferNetworkInterface.getInetAddresses();
getIpResult(ipv4Result, ipv6Result, en);
} else {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("no preferNetworkInterface");
+ if (log.isDebugEnabled()) {
+ log.debug("no preferNetworkInterface");
}
final Enumeration<NetworkInterface> enumeration = NetworkInterface.getNetworkInterfaces();
while (enumeration.hasMoreElements()) {
@@ -243,7 +240,7 @@ public class EventMeshUtil {
//If failed to find,fall back to localhost
return normalizeHostAddress(InetAddress.getLocalHost());
} catch (SocketException | UnknownHostException e) {
- LOGGER.error("failed to get local address", e);
+ log.error("failed to get local address", e);
}
return null;
@@ -292,8 +289,8 @@ public class EventMeshUtil {
}
public static void printState(final ThreadPoolExecutor scheduledExecutorService) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("{} [{} {} {} {}]", ((EventMeshThreadFactory) scheduledExecutorService.getThreadFactory())
+ if (log.isInfoEnabled()) {
+ log.info("{} [{} {} {} {}]", ((EventMeshThreadFactory) scheduledExecutorService.getThreadFactory())
.getThreadNamePrefix(), scheduledExecutorService.getQueue().size(), scheduledExecutorService
.getPoolSize(), scheduledExecutorService.getActiveCount(), scheduledExecutorService
.getCompletedTaskCount());
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java
index 0e1afdaf7..5b7753c1b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java
@@ -38,8 +38,12 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpRequest;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class Utils {
- private static final Logger LOGGER = LoggerFactory.getLogger(Utils.class);
+
private static final Logger MESSAGE_LOGGER = LoggerFactory.getLogger("message");
/**
@@ -74,7 +78,7 @@ public class Utils {
}
);
} catch (Exception e) {
- LOGGER.error("exception while sending message to client", e);
+ log.error("exception while sending message to client", e);
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/ClientGlobal.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/ClientGlobal.java
index f4cc7e207..595218301 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/ClientGlobal.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/ClientGlobal.java
@@ -19,19 +19,17 @@ package org.apache.eventmesh.runtime.client.common;
import java.util.TimeZone;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class ClientGlobal {
- private static final Logger logger = LoggerFactory.getLogger(ClientGlobal.class);
-
public static ClientGlobal INSTANCE = new ClientGlobal();
public static ClientGlobal getInstance() {
@@ -51,6 +49,6 @@ public class ClientGlobal {
jsonMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
jsonMapper.setTimeZone(TimeZone.getDefault());
this.jsonMapper = jsonMapper;
- logger.info("ClientGlobal init success");
+ log.info("ClientGlobal init success");
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java
index 1124287c8..4c0d1ea1e 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java
@@ -30,17 +30,17 @@ import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import io.netty.handler.codec.ReplayingDecoder;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class Codec {
- private static final Logger logger = LoggerFactory.getLogger(Codec.class);
private static final int FRAME_MAX_LENGTH = 1024 * 1024 * 4;
private static final Charset UTF8 = Charset.forName(EventMeshConstants.DEFAULT_CHARSET);
private static final byte[] CONSTANT_MAGIC_FLAG = "EventMesh".getBytes(UTF8);
@@ -58,7 +58,7 @@ public class Codec {
headerData = headerJson == null ? null : headerJson.getBytes(UTF8);
bodyData = bodyJson == null ? null : bodyJson.getBytes(UTF8);
- logger.debug("headerJson={}|bodyJson={}", headerJson, bodyJson);
+ log.debug("headerJson={}|bodyJson={}", headerJson, bodyJson);
int headerLength = headerData == null ? 0 : headerData.length;
int bodyLength = bodyData == null ? 0 : bodyData.length;
@@ -126,12 +126,12 @@ public class Codec {
body = parseFromJson(header.getCommand(), new String(bodyData, UTF8));
}
- logger.debug("headerJson={}|bodyJson={}", new String(headerData, UTF8), new String(bodyData, UTF8));
+ log.debug("headerJson={}|bodyJson={}", new String(headerData, UTF8), new String(bodyData, UTF8));
Package pkg = new Package(header, body);
out.add(pkg);
} catch (Exception e) {
- logger.error("decode|length={}|headerLength={}|bodyLength={}|header={}|body={}.", length,
+ log.error("decode|length={}|headerLength={}|bodyLength={}|header={}|body={}.", length,
headerLength, bodyLength, header, body);
throw e;
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/RequestContext.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/RequestContext.java
index e1da9ab7c..4d2d59c15 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/RequestContext.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/RequestContext.java
@@ -21,12 +21,11 @@ import org.apache.eventmesh.common.protocol.tcp.Package;
import java.util.concurrent.CountDownLatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class RequestContext {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger LOGGER = LoggerFactory.getLogger(RequestContext.class);
+@Slf4j
+public class RequestContext {
private Object key;
private Package request;
@@ -78,8 +77,8 @@ public class RequestContext {
public static RequestContext context(Object key, Package request, CountDownLatch latch) throws Exception {
RequestContext c = new RequestContext(key, request, latch);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("_RequestContext|create|key=" + key);
+ if (log.isInfoEnabled()) {
+ log.info("_RequestContext|create|key=" + key);
}
return c;
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/TCPClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/TCPClient.java
index b660f6640..7d78cbc07 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/TCPClient.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/TCPClient.java
@@ -29,9 +29,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.AdaptiveRecvByteBufAllocator;
@@ -47,20 +44,22 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
+
+import lombok.extern.slf4j.Slf4j;
+
/**
* one Client connects one ACCESS
* Provides the most basic connection, send capability, and cannot provide disconnected reconnection capability,
* The service is request-dependent. If the disconnection and reconnection capability is provided,
* it will cause business insensitivity, that is, it will not follow the business reconnection logic.
*/
+@Slf4j
public abstract class TCPClient implements Closeable {
public int clientNo = (new Random()).nextInt(1000);
protected ConcurrentHashMap<Object, RequestContext> contexts = new ConcurrentHashMap<>();
- private Logger logger = LoggerFactory.getLogger(this.getClass());
-
protected String host = "10.255.34.120";
protected int port = 10000;
@@ -87,7 +86,7 @@ public abstract class TCPClient implements Closeable {
if (channel.isWritable()) {
channel.writeAndFlush(msg).addListener((ChannelFutureListener) future -> {
if (!future.isSuccess()) {
- logger.warn("send msg failed", future.isSuccess(), future.cause());
+ log.warn("send msg failed", future.isSuccess(), future.cause());
}
});
} else {
@@ -106,7 +105,7 @@ public abstract class TCPClient implements Closeable {
if (!contexts.contains(c)) {
contexts.put(key, c);
} else {
- logger.info("duplicate key : {}", key);
+ log.info("duplicate key : {}", key);
}
send(msg);
if (!c.getLatch().await(timeout, TimeUnit.MILLISECONDS)) {
@@ -136,7 +135,7 @@ public abstract class TCPClient implements Closeable {
ChannelFuture f = bootstrap.connect(host, port).sync();
InetSocketAddress localAddress = (InetSocketAddress) f.channel().localAddress();
channel = f.channel();
- logger.info("connected|local={}:{}|server={}", localAddress.getAddress().getHostAddress(), localAddress.getPort(), host + ":" + port);
+ log.info("connected|local={}:{}|server={}", localAddress.getAddress().getHostAddress(), localAddress.getPort(), host + ":" + port);
}
protected synchronized void reconnect() throws Exception {
@@ -148,7 +147,7 @@ public abstract class TCPClient implements Closeable {
return new ChannelDuplexHandler() {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
- logger.warn("exceptionCaught, close connection.|remote address={}", ctx.channel().remoteAddress(), cause);
+ log.warn("exceptionCaught, close connection.|remote address={}", ctx.channel().remoteAddress(), cause);
ctx.close();
}
};
@@ -159,7 +158,7 @@ public abstract class TCPClient implements Closeable {
try {
channel.disconnect().sync();
} catch (InterruptedException e) {
- logger.warn("close tcp client failed.|remote address={}", channel.remoteAddress(), e);
+ log.warn("close tcp client failed.|remote address={}", channel.remoteAddress(), e);
}
workers.shutdownGracefully();
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/PubClientImpl.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/PubClientImpl.java
index d898b64f2..4fac9067b 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/PubClientImpl.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/PubClientImpl.java
@@ -32,16 +32,16 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import org.junit.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
-public class PubClientImpl extends TCPClient implements PubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(PubClientImpl.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class PubClientImpl extends TCPClient implements PubClient {
private final UserAgent userAgent;
@@ -61,8 +61,8 @@ public class PubClientImpl extends TCPClient implements PubClient {
public void init() throws Exception {
open(new Handler());
hello();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("PubClientImpl|{}|started!", clientNo);
+ if (log.isInfoEnabled()) {
+ log.info("PubClientImpl|{}|started!", clientNo);
}
}
@@ -87,8 +87,8 @@ public class PubClientImpl extends TCPClient implements PubClient {
PubClientImpl.this.reconnect();
}
Package msg = MessageUtils.heartBeat();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("PubClientImpl|{}|send heartbeat|Command={}|msg={}",
+ if (log.isDebugEnabled()) {
+ log.debug("PubClientImpl|{}|send heartbeat|Command={}|msg={}",
clientNo, msg.getHeader().getCommand(), msg);
}
PubClientImpl.this.dispatcher(msg, ClientConstants.DEFAULT_TIMEOUT_IN_MILLISECONDS);
@@ -118,8 +118,8 @@ public class PubClientImpl extends TCPClient implements PubClient {
*/
@Override
public Package rr(Package msg, long timeout) throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("PubClientImpl|{}|rr|send|Command={}|msg={}", clientNo, Command.REQUEST_TO_SERVER, msg);
+ if (log.isInfoEnabled()) {
+ log.info("PubClientImpl|{}|rr|send|Command={}|msg={}", clientNo, Command.REQUEST_TO_SERVER, msg);
}
return dispatcher(msg, timeout);
}
@@ -165,8 +165,8 @@ public class PubClientImpl extends TCPClient implements PubClient {
* Send an event message, the return value is ACCESS and ACK is given
*/
public Package publish(Package msg, long timeout) throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("PubClientImpl|{}|publish|send|command={}|msg={}", clientNo, msg.getHeader().getCommand(), msg);
+ if (log.isInfoEnabled()) {
+ log.info("PubClientImpl|{}|publish|send|command={}|msg={}", clientNo, msg.getHeader().getCommand(), msg);
}
return dispatcher(msg, timeout);
}
@@ -175,8 +175,8 @@ public class PubClientImpl extends TCPClient implements PubClient {
* send broadcast message
*/
public Package broadcast(Package msg, long timeout) throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("PubClientImpl|{}|broadcast|send|type={}|msg={}", clientNo, msg.getHeader().getCommand(), msg);
+ if (log.isInfoEnabled()) {
+ log.info("PubClientImpl|{}|broadcast|send|type={}|msg={}", clientNo, msg.getHeader().getCommand(), msg);
}
return dispatcher(msg, timeout);
}
@@ -190,8 +190,8 @@ public class PubClientImpl extends TCPClient implements PubClient {
private class Handler extends SimpleChannelInboundHandler<Package> {
@Override
protected void channelRead0(ChannelHandlerContext ctx, Package msg) throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("PubClientImpl|{}|receive|type={}|msg={}", clientNo, msg.getHeader().getCommand(), msg);
+ if (log.isInfoEnabled()) {
+ log.info("PubClientImpl|{}|receive|type={}|msg={}", clientNo, msg.getHeader().getCommand(), msg);
}
Command cmd = msg.getHeader().getCommand();
if (callback != null) {
@@ -209,11 +209,11 @@ public class PubClientImpl extends TCPClient implements PubClient {
context.finish(msg);
return;
} else {
- LOGGER.error("msg ignored,context not found .|{}|{}", cmd, msg);
+ log.error("msg ignored,context not found .|{}|{}", cmd, msg);
return;
}
} else if (cmd == Command.SERVER_GOODBYE_REQUEST) {
- LOGGER.error("server goodby request: ---------------------------" + msg);
+ log.error("server goodby request: ---------------------------" + msg);
close();
} else {
RequestContext context = contexts.get(RequestContext.getHeaderSeq(msg));
@@ -222,7 +222,7 @@ public class PubClientImpl extends TCPClient implements PubClient {
context.finish(msg);
return;
} else {
- LOGGER.error("msg ignored,context not found .|{}|{}", cmd, msg);
+ log.error("msg ignored,context not found .|{}|{}", cmd, msg);
return;
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/SubClientImpl.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/SubClientImpl.java
index 5a39be844..6d05bf3b7 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/SubClientImpl.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/impl/SubClientImpl.java
@@ -39,16 +39,16 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import org.junit.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
-public class SubClientImpl extends TCPClient implements SubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(SubClientImpl.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SubClientImpl extends TCPClient implements SubClient {
private transient UserAgent userAgent;
@@ -70,8 +70,8 @@ public class SubClientImpl extends TCPClient implements SubClient {
public void init() throws Exception {
open(new Handler());
hello();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("SubClientImpl|{}|started!", clientNo);
+ if (log.isInfoEnabled()) {
+ log.info("SubClientImpl|{}|started!", clientNo);
}
}
@@ -105,8 +105,8 @@ public class SubClientImpl extends TCPClient implements SubClient {
SubClientImpl.this.reconnect();
}
Package msg = MessageUtils.heartBeat();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("SubClientImpl|{}|send heartbeat|Command={}|msg={}", clientNo,
+ if (log.isDebugEnabled()) {
+ log.debug("SubClientImpl|{}|send heartbeat|Command={}|msg={}", clientNo,
msg.getHeader().getCommand(), msg);
}
SubClientImpl.this.dispatcher(msg, ClientConstants.DEFAULT_TIMEOUT_IN_MILLISECONDS);
@@ -203,8 +203,8 @@ public class SubClientImpl extends TCPClient implements SubClient {
@SuppressWarnings("Duplicates")
@Override
protected void channelRead0(ChannelHandlerContext ctx, Package msg) throws Exception {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info(SubClientImpl.class.getSimpleName() + "|receive|command={}|msg={}",
+ if (log.isInfoEnabled()) {
+ log.info(SubClientImpl.class.getSimpleName() + "|receive|command={}|msg={}",
msg.getHeader().getCommand(), msg);
}
Command cmd = msg.getHeader().getCommand();
@@ -218,24 +218,24 @@ public class SubClientImpl extends TCPClient implements SubClient {
Package responsePKG = MessageUtils.rrResponse(msg);
send(responsePKG);
} catch (Exception e) {
- LOGGER.error("send rr request to client ack failed", e);
+ log.error("send rr request to client ack failed", e);
}
} else if (cmd == Command.ASYNC_MESSAGE_TO_CLIENT) {
Package asyncAck = MessageUtils.asyncMessageAck(msg);
try {
send(asyncAck);
} catch (Exception e) {
- LOGGER.error("send async request to client ack failed", e);
+ log.error("send async request to client ack failed", e);
}
} else if (cmd == Command.BROADCAST_MESSAGE_TO_CLIENT) {
Package broadcastAck = MessageUtils.broadcastMessageAck(msg);
try {
send(broadcastAck);
} catch (Exception e) {
- LOGGER.error("send broadcast request to client ack failed", e);
+ log.error("send broadcast request to client ack failed", e);
}
} else if (cmd == Command.SERVER_GOODBYE_REQUEST) {
- LOGGER.info("server goodby request: ---------------------------" + msg);
+ log.info("server goodby request: ---------------------------" + msg);
close();
} else {
//control instruction set
@@ -244,7 +244,7 @@ public class SubClientImpl extends TCPClient implements SubClient {
contexts.remove(context.getKey());
context.finish(msg);
} else {
- LOGGER.error("msg ignored,context not found.|{}|{}", cmd, msg);
+ log.error("msg ignored,context not found.|{}|{}", cmd, msg);
}
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncPubClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncPubClient.java
index b15586a08..1cbc7fe0e 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncPubClient.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncPubClient.java
@@ -25,14 +25,13 @@ import org.apache.eventmesh.runtime.client.common.UserAgentUtils;
import org.apache.eventmesh.runtime.client.hook.ReceiveMsgHook;
import org.apache.eventmesh.runtime.client.impl.PubClientImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class AsyncPubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(AsyncPubClient.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class AsyncPubClient {
public static void main(String[] args) throws Exception {
try (PubClientImpl pubClient =
@@ -42,8 +41,8 @@ public class AsyncPubClient {
pubClient.registerBusiHandler(new ReceiveMsgHook() {
@Override
public void handle(Package msg, ChannelHandlerContext ctx) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("server good by request: {}", msg);
+ if (log.isInfoEnabled()) {
+ log.info("server good by request: {}", msg);
}
}
});
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncSubClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncSubClient.java
index ba04f62b5..3bf809936 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncSubClient.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/AsyncSubClient.java
@@ -26,14 +26,13 @@ import org.apache.eventmesh.runtime.client.common.MessageUtils;
import org.apache.eventmesh.runtime.client.hook.ReceiveMsgHook;
import org.apache.eventmesh.runtime.client.impl.SubClientImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class AsyncSubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(AsyncSubClient.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class AsyncSubClient {
public static void main(String[] args) throws Exception {
try (SubClientImpl client =
@@ -46,8 +45,8 @@ public class AsyncSubClient {
public void handle(Package msg, ChannelHandlerContext ctx) {
if (msg.getBody() instanceof EventMeshMessage) {
String body = ((EventMeshMessage) msg.getBody()).getBody();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("receive message -------------------------------" + body);
+ if (log.isInfoEnabled()) {
+ log.info("receive message -------------------------------" + body);
}
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/BroadCastSubClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/BroadCastSubClient.java
index 14acd1dff..c174cb3e2 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/BroadCastSubClient.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/BroadCastSubClient.java
@@ -27,14 +27,13 @@ import org.apache.eventmesh.runtime.client.common.MessageUtils;
import org.apache.eventmesh.runtime.client.hook.ReceiveMsgHook;
import org.apache.eventmesh.runtime.client.impl.SubClientImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class BroadCastSubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(BroadCastSubClient.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class BroadCastSubClient {
public static void main(String[] args) throws Exception {
try (SubClientImpl client = new SubClientImpl("localhost", 10000, MessageUtils.generateSubServer())) {
@@ -47,8 +46,8 @@ public class BroadCastSubClient {
if (msg.getHeader().getCommand() == Command.BROADCAST_MESSAGE_TO_CLIENT) {
if (msg.getBody() instanceof EventMeshMessage) {
String body = ((EventMeshMessage) msg.getBody()).getBody();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("receive message -------------------------------" + body);
+ if (log.isInfoEnabled()) {
+ log.info("receive message -------------------------------" + body);
}
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CCSubClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CCSubClient.java
index e380e1e20..ff269096b 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CCSubClient.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CCSubClient.java
@@ -26,14 +26,13 @@ import org.apache.eventmesh.runtime.client.common.UserAgentUtils;
import org.apache.eventmesh.runtime.client.hook.ReceiveMsgHook;
import org.apache.eventmesh.runtime.client.impl.SubClientImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class CCSubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(CCSubClient.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class CCSubClient {
public static void main(String[] args) throws Exception {
try (SubClientImpl subClient =
@@ -45,8 +44,8 @@ public class CCSubClient {
subClient.registerBusiHandler(new ReceiveMsgHook() {
@Override
public void handle(Package msg, ChannelHandlerContext ctx) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Received message: {}", msg);
+ if (log.isInfoEnabled()) {
+ log.info("Received message: {}", msg);
}
if (msg.getHeader().getCommand() == Command.REQUEST_TO_CLIENT) {
Package rrResponse = MessageUtils.rrResponse(msg);
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CClientDemo.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CClientDemo.java
index c77b74a4e..db6fd8b48 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CClientDemo.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CClientDemo.java
@@ -25,18 +25,17 @@ import org.apache.eventmesh.runtime.client.common.MessageUtils;
import org.apache.eventmesh.runtime.client.hook.ReceiveMsgHook;
import org.apache.eventmesh.runtime.client.impl.EventMeshClientImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
+
+import lombok.extern.slf4j.Slf4j;
+
/**
* simple client usage example
*/
+@Slf4j
public class CClientDemo {
- public static final Logger LOGGER = LoggerFactory.getLogger(CClientDemo.class);
-
private static final String ASYNC_TOPIC = "TEST-TOPIC-TCP-ASYNC";
private static final String BROADCAST_TOPIC = "TEST-TOPIC-TCP-BROADCAST";
@@ -53,8 +52,8 @@ public class CClientDemo {
if (msg.getHeader().getCmd() == Command.ASYNC_MESSAGE_TO_CLIENT
|| msg.getHeader().getCmd() == Command.BROADCAST_MESSAGE_TO_CLIENT) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("receive message-------------------------------------" + msg);
+ if (log.isInfoEnabled()) {
+ log.info("receive message-------------------------------------" + msg);
}
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncPubClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncPubClient.java
index 40d7d2b4d..855738acb 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncPubClient.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncPubClient.java
@@ -23,13 +23,11 @@ import org.apache.eventmesh.runtime.client.common.MessageUtils;
import org.apache.eventmesh.runtime.client.common.UserAgentUtils;
import org.apache.eventmesh.runtime.client.impl.PubClientImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class SyncPubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(SyncPubClient.class);
-
public static void main(String[] args) throws Exception {
try (PubClientImpl pubClient =
new PubClientImpl("localhost", 10000, UserAgentUtils.createUserAgent())) {
@@ -40,8 +38,8 @@ public class SyncPubClient {
Package rr = pubClient.rr(MessageUtils.rrMesssage("TEST-TOPIC-TCP-SYNC", i), 3000);
if (rr.getBody() instanceof EventMeshMessage) {
String body = ((EventMeshMessage) rr.getBody()).getBody();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("rrMessage: " + body + " "
+ if (log.isInfoEnabled()) {
+ log.info("rrMessage: " + body + " "
+ "rr-reply-------------------------------------------------" + rr);
}
}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncSubClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncSubClient.java
index 44ec2ec85..010555a10 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncSubClient.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/SyncSubClient.java
@@ -26,14 +26,13 @@ import org.apache.eventmesh.runtime.client.common.MessageUtils;
import org.apache.eventmesh.runtime.client.hook.ReceiveMsgHook;
import org.apache.eventmesh.runtime.client.impl.SubClientImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.netty.channel.ChannelHandlerContext;
-public class SyncSubClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(SyncSubClient.class);
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SyncSubClient {
public static void main(String[] args) throws Exception {
try (SubClientImpl client =
@@ -45,8 +44,8 @@ public class SyncSubClient {
@Override
public void handle(Package msg, ChannelHandlerContext ctx) {
if (msg.getHeader().getCommand() == Command.REQUEST_TO_CLIENT) {
- if ((LOGGER.isInfoEnabled())) {
- LOGGER.info("receive message -------------------------------" + msg);
+ if ((log.isInfoEnabled())) {
+ log.info("receive message -------------------------------" + msg);
}
}
}
diff --git a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
index cb0543a39..80c47eaa7 100644
--- a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
+++ b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
@@ -30,12 +30,11 @@ import org.apache.commons.lang3.StringUtils;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class AsyncSyncRequestInstance {
+import lombok.extern.slf4j.Slf4j;
- public static final Logger logger = LoggerFactory.getLogger(AsyncSyncRequestInstance.class);
+@Slf4j
+public class AsyncSyncRequestInstance {
public static void main(String[] args) throws Exception {
@@ -71,26 +70,26 @@ public class AsyncSyncRequestInstance {
eventMeshHttpProducer.request(eventMeshMessage, new RRCallback<EventMeshMessage>() {
@Override
public void onSuccess(EventMeshMessage o) {
- logger.debug("sendmsg : {}, return : {}, cost:{}ms", eventMeshMessage.getContent(), o.getContent(),
+ log.debug("sendmsg : {}, return : {}, cost:{}ms", eventMeshMessage.getContent(), o.getContent(),
System.currentTimeMillis() - startTime);
}
@Override
public void onException(Throwable e) {
- logger.debug("sendmsg failed", e);
+ log.debug("sendmsg failed", e);
}
}, 3000);
ThreadUtils.sleep(2, TimeUnit.SECONDS);
} catch (Exception e) {
- logger.warn("async send msg failed", e);
+ log.warn("async send msg failed", e);
}
ThreadUtils.sleep(30, TimeUnit.SECONDS);
try (final EventMeshHttpProducer ignore = eventMeshHttpProducer) {
// close producer
} catch (Exception e1) {
- logger.warn("producer shutdown exception", e1);
+ log.warn("producer shutdown exception", e1);
}
}
}
diff --git a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java
index de12f5438..3d2c10bab 100644
--- a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java
+++ b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java
@@ -28,12 +28,11 @@ import org.apache.commons.lang3.StringUtils;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class SyncRequestInstance {
+import lombok.extern.slf4j.Slf4j;
- public static final Logger logger = LoggerFactory.getLogger(SyncRequestInstance.class);
+@Slf4j
+public class SyncRequestInstance {
public static void main(String[] args) throws Exception {
@@ -67,19 +66,19 @@ public class SyncRequestInstance {
.uniqueId(RandomStringUtils.generateNum(30)).build();
EventMeshMessage rsp = eventMeshHttpProducer.request(eventMeshMessage, 10000);
- if (logger.isDebugEnabled()) {
- logger.debug("sendmsg : {}, return : {}, cost:{}ms", eventMeshMessage.getContent(), rsp.getContent(),
+ if (log.isDebugEnabled()) {
+ log.debug("sendmsg : {}, return : {}, cost:{}ms", eventMeshMessage.getContent(), rsp.getContent(),
System.currentTimeMillis() - startTime);
}
} catch (Exception e) {
- logger.warn("send msg failed", e);
+ log.warn("send msg failed", e);
}
ThreadUtils.sleep(30, TimeUnit.SECONDS);
try (final EventMeshHttpProducer closed = eventMeshHttpProducer) {
// close producer
} catch (Exception e1) {
- logger.warn("producer shutdown exception", e1);
+ log.warn("producer shutdown exception", e1);
}
}
}
diff --git a/eventmesh-spi/build.gradle b/eventmesh-spi/build.gradle
index 8b6fcbd8f..e4e682109 100644
--- a/eventmesh-spi/build.gradle
+++ b/eventmesh-spi/build.gradle
@@ -21,4 +21,7 @@ dependencies {
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
+
+ testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
}
diff --git a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshExtensionFactory.java b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshExtensionFactory.java
index c000a0841..5a65e43a5 100644
--- a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshExtensionFactory.java
+++ b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshExtensionFactory.java
@@ -31,17 +31,16 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import lombok.extern.slf4j.Slf4j;
/**
* The extension fetching factory, all extension plugins should be fetched by this factory. And all the extension plugins defined in eventmesh should
* have {@link EventMeshSPI} annotation.
*/
+@Slf4j
public class EventMeshExtensionFactory {
- private static final Logger logger = LoggerFactory.getLogger(EventMeshExtensionFactory.class);
-
private static final List<ExtensionClassLoader> EXTENSION_CLASS_LOADERS = new ArrayList<>();
private static final ConcurrentHashMap<String, Object> EXTENSION_INSTANCE_CACHE = new ConcurrentHashMap<>(16);
@@ -90,13 +89,13 @@ public class EventMeshExtensionFactory {
T extensionInstance = extensionInstanceClass.getDeclaredConstructor().newInstance();
ConfigService.getInstance().populateConfigForObject(extensionInstance);
- logger.info("initialize extension instance success, extensionType: {}, extensionInstanceName: {}",
+ log.info("initialize extension instance success, extensionType: {}, extensionInstanceName: {}",
extensionType, extensionInstanceName);
return extensionInstance;
} catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
throw new ExtensionException("Extension initialize error", e);
} catch (NoSuchFieldException | IOException e) {
- logger.error("initialize extension instance config failed, extensionType: {}, extensionInstanceName: {}",
+ log.error("initialize extension instance config failed, extensionType: {}, extensionInstanceName: {}",
extensionType, extensionInstanceName, e);
throw new ExtensionException("Extension initialize error", e);
}
@@ -112,13 +111,13 @@ public class EventMeshExtensionFactory {
T extensionInstance = extensionInstanceClass.getDeclaredConstructor().newInstance();
ConfigService.getInstance().populateConfigForObject(extensionInstance);
- logger.info("initialize extension instance success, extensionType: {}, extensionName: {}",
+ log.info("initialize extension instance success, extensionType: {}, extensionName: {}",
extensionType, extensionInstanceName);
return extensionInstance;
} catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
throw new ExtensionException("Extension initialize error", e);
} catch (NoSuchFieldException | IOException e) {
- logger.error("initialize extension instance config failed, extensionType: {}, extensionInstanceName: {}",
+ log.error("initialize extension instance config failed, extensionType: {}, extensionInstanceName: {}",
extensionType, extensionInstanceName, e);
throw new ExtensionException("Extension initialize error", e);
}
diff --git a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/JarExtensionClassLoader.java b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/JarExtensionClassLoader.java
index e237b992a..858350217 100644
--- a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/JarExtensionClassLoader.java
+++ b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/JarExtensionClassLoader.java
@@ -35,8 +35,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
diff --git a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/MetaInfExtensionClassLoader.java b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/MetaInfExtensionClassLoader.java
index 2333117a3..dd00dff22 100644
--- a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/MetaInfExtensionClassLoader.java
+++ b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/MetaInfExtensionClassLoader.java
@@ -28,9 +28,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import lombok.extern.slf4j.Slf4j;
diff --git a/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/PrototypeExtension.java b/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/PrototypeExtension.java
index 27a50ac59..aa3223ffb 100644
--- a/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/PrototypeExtension.java
+++ b/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/PrototypeExtension.java
@@ -17,15 +17,14 @@
package org.apache.eventmesh.spi.example;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class PrototypeExtension implements TestPrototypeExtension {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger logger = LoggerFactory.getLogger(PrototypeExtension.class);
+@Slf4j
+public class PrototypeExtension implements TestPrototypeExtension {
@Override
public void hello() {
- logger.info("I am PrototypeExtension");
+ log.info("I am PrototypeExtension");
}
}
diff --git a/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/SingletonExtension.java b/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/SingletonExtension.java
index 285867c2d..ee4e056fa 100644
--- a/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/SingletonExtension.java
+++ b/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/SingletonExtension.java
@@ -17,15 +17,14 @@
package org.apache.eventmesh.spi.example;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class SingletonExtension implements TestSingletonExtension {
+import lombok.extern.slf4j.Slf4j;
- private static final Logger logger = LoggerFactory.getLogger(SingletonExtension.class);
+@Slf4j
+public class SingletonExtension implements TestSingletonExtension {
@Override
public void hello() {
- logger.info("I am SingletonExtension");
+ log.info("I am SingletonExtension");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org