1115

.gitignore

@@ -4,7 +4,7 @@
 .settings/
 target/
 devenv
-*.log*
+*.log.*
 *.iml
 .idea/
 *.versionsBackup

WORKSPACE

@@ -94,6 +94,10 @@ maven_install(
  "io.opentelemetry:opentelemetry-api:1.19.0",
  "io.opentelemetry:opentelemetry-sdk-metrics:1.19.0",
  "io.opentelemetry:opentelemetry-sdk-common:1.19.0",
+ "org.apache.logging.log4j:log4j-core:2.17.1",
+ "org.apache.logging.log4j:log4j-slf4j-impl:2.17.1",
+ "io.github.aliyun-mq:rocketmq-slf4j-api:1.0.1",
+ "io.github.aliyun-mq:rocketmq-logback-classic:1.0.1",
  ],
  fetch_sources = True,
  repositories = [

acl/BUILD.bazel

@@ -22,7 +22,6 @@ java_library(
  visibility = ["//visibility:public"],
  deps = [
  "//common",
- "//logging",
  "//remoting",
  "//srvutil",
  "@maven//:com_alibaba_fastjson",
@@ -36,6 +35,7 @@ java_library(
  "@maven//:org_apache_rocketmq_rocketmq_proto",
  "@maven//:org_lz4_lz4_java",
  "@maven//:org_yaml_snakeyaml",
+ "@maven//:io_github_aliyun_mq_rocketmq_slf4j_api",
  ],
 )
 

acl/pom.xml

@@ -31,10 +31,6 @@
  <groupId>${project.groupId}</groupId>
  <artifactId>rocketmq-remoting</artifactId>
  </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rocketmq-logging</artifactId>
- </dependency>
  <dependency>
  <groupId>${project.groupId}</groupId>
  <artifactId>rocketmq-common</artifactId>
@@ -43,6 +39,14 @@
  <groupId>${project.groupId}</groupId>
  <artifactId>rocketmq-srvutil</artifactId>
  </dependency>
+ <dependency>
+ <groupId>io.github.aliyun-mq</groupId>
+ <artifactId>rocketmq-slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.github.aliyun-mq</groupId>
+ <artifactId>rocketmq-logback-classic</artifactId>
+ </dependency>
  <dependency>
  <groupId>org.yaml</groupId>
  <artifactId>snakeyaml</artifactId>
@@ -55,17 +59,6 @@
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-lang3</artifactId>
  </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>commons-validator</groupId>
  <artifactId>commons-validator</artifactId>

acl/src/main/java/org/apache/rocketmq/acl/common/AclSigner.java

@@ -22,13 +22,13 @@
 import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.rocketmq.common.constant.LoggerName;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 
 public class AclSigner {
  public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
  public static final SigningAlgorithm DEFAULT_ALGORITHM = SigningAlgorithm.HmacSHA1;
- private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.ROCKETMQ_AUTHORIZE_LOGGER_NAME);
+ private static final Logger log = LoggerFactory.getLogger(LoggerName.ROCKETMQ_AUTHORIZE_LOGGER_NAME);
  private static final int CAL_SIGNATURE_FAILED = 10015;
  private static final String CAL_SIGNATURE_FAILED_MSG = "[%s:signature-failed] unable to calculate a request signature. error=%s";
 

acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java

@@ -27,8 +27,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.constant.LoggerName;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.RPCHook;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.yaml.snakeyaml.Yaml;
@@ -37,7 +37,7 @@
 
 public class AclUtils {
 
- private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
+ private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
 
  public static byte[] combineRequestContent(RemotingCommand request, SortedMap<String, String> fieldsMap) {
  try {

acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java

@@ -45,14 +45,14 @@
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.common.topic.TopicValidator;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.protocol.DataVersion;
 import org.apache.rocketmq.srvutil.AclFileWatchService;
 
 public class PlainPermissionManager {
 
- private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
+ private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
 
  private String fileHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
  System.getenv(MixAll.ROCKETMQ_HOME_ENV));

acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java

@@ -23,12 +23,12 @@
 import org.apache.rocketmq.acl.common.AclException;
 import org.apache.rocketmq.acl.common.AclUtils;
 import org.apache.rocketmq.common.constant.LoggerName;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 
 public class RemoteAddressStrategyFactory {
 
- private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
+ private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
 
  public static final NullRemoteAddressStrategy NULL_NET_ADDRESS_STRATEGY = new NullRemoteAddressStrategy();
 

broker/BUILD.bazel

@@ -25,7 +25,6 @@ java_library(
  "//client",
  "//common",
  "//filter",
- "//logging",
  "//remoting",
  "//srvutil",
  "//store",
@@ -50,6 +49,7 @@ java_library(
  "@maven//:org_apache_commons_commons_lang3",
  "@maven//:org_lz4_lz4_java",
  "@maven//:org_slf4j_slf4j_api",
+ "@maven//:io_github_aliyun_mq_rocketmq_slf4j_api",
  ],
 )
 
@@ -70,13 +70,13 @@ java_library(
  "//client",
  "//common",
  "//filter",
- "//logging",
  "//remoting",
  "//store",
  "@maven//:com_alibaba_fastjson",
  "@maven//:com_google_guava_guava",
  "@maven//:io_netty_netty_all",
  "@maven//:org_apache_commons_commons_lang3",
+ "@maven//:io_github_aliyun_mq_rocketmq_slf4j_api",
  ],
 )
 

broker/pom.xml

@@ -35,8 +35,12 @@
  <artifactId>rocketmq-store</artifactId>
  </dependency>
  <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rocketmq-remoting</artifactId>
+ <groupId>io.github.aliyun-mq</groupId>
+ <artifactId>rocketmq-slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.github.aliyun-mq</groupId>
+ <artifactId>rocketmq-logback-classic</artifactId>
  </dependency>
  <dependency>
  <groupId>${project.groupId}</groupId>
@@ -58,10 +62,6 @@
  <groupId>commons-io</groupId>
  <artifactId>commons-io</artifactId>
  </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
  <dependency>
  <groupId>com.alibaba</groupId>
  <artifactId>fastjson</artifactId>
@@ -70,10 +70,6 @@
  <groupId>org.javassist</groupId>
  <artifactId>javassist</artifactId>
  </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
  <dependency>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcpkix-jdk15on</artifactId>

broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java

@@ -116,8 +116,8 @@
 import org.apache.rocketmq.common.message.MessageExtBrokerInner;
 import org.apache.rocketmq.common.stats.MomentStatsItem;
 import org.apache.rocketmq.common.utils.ServiceProvider;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.Configuration;
 import org.apache.rocketmq.remoting.RPCHook;
 import org.apache.rocketmq.remoting.RemotingServer;
@@ -159,9 +159,9 @@
 import org.apache.rocketmq.store.timer.TimerMetrics;
 
 public class BrokerController {
- protected static final InternalLogger LOG = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
- private static final InternalLogger LOG_PROTECTION = InternalLoggerFactory.getLogger(LoggerName.PROTECTION_LOGGER_NAME);
- private static final InternalLogger LOG_WATER_MARK = InternalLoggerFactory.getLogger(LoggerName.WATER_MARK_LOGGER_NAME);
+ protected static final Logger LOG = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
+ private static final Logger LOG_PROTECTION = LoggerFactory.getLogger(LoggerName.PROTECTION_LOGGER_NAME);
+ private static final Logger LOG_WATER_MARK = LoggerFactory.getLogger(LoggerName.WATER_MARK_LOGGER_NAME);
  protected static final int HA_ADDRESS_MIN_LENGTH = 6;
 
  protected final BrokerConfig brokerConfig;

broker/src/main/java/org/apache/rocketmq/broker/BrokerPreOnlineService.java

@@ -29,8 +29,8 @@
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.ServiceThread;
 import org.apache.rocketmq.common.constant.LoggerName;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.common.RemotingHelper;
 import org.apache.rocketmq.remoting.protocol.BrokerSyncInfo;
 import org.apache.rocketmq.remoting.protocol.body.BrokerMemberGroup;
@@ -41,7 +41,7 @@
 import org.apache.rocketmq.store.timer.TimerCheckpoint;
 
 public class BrokerPreOnlineService extends ServiceThread {
- private static final InternalLogger LOGGER = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
+ private static final Logger LOGGER = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
  private final BrokerController brokerController;
 
  private int waitBrokerIndex = 0;

broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java

@@ -16,8 +16,6 @@
  */
 package org.apache.rocketmq.broker;
 
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -32,22 +30,20 @@
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.common.utils.NetworkUtil;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.netty.NettyClientConfig;
 import org.apache.rocketmq.remoting.netty.NettyServerConfig;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.apache.rocketmq.store.config.BrokerRole;
 import org.apache.rocketmq.store.config.MessageStoreConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class BrokerStartup {
  public static Properties properties = null;
  public static CommandLine commandLine = null;
  public static String configFile = null;
- public static InternalLogger log;
+ public static Logger log;
  public static final SystemConfigFileHelper CONFIG_FILE_HELPER = new SystemConfigFileHelper();
 
  public static void main(String[] args) {
@@ -169,36 +165,31 @@ public static BrokerController createBrokerController(String[] args) {
  }
 
  messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1);
- LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
- JoranConfigurator configurator = new JoranConfigurator();
- configurator.setContext(lc);
- lc.reset();
  System.setProperty("brokerLogDir", "");
  if (brokerConfig.isIsolateLogEnable()) {
  System.setProperty("brokerLogDir", brokerConfig.getBrokerName() + "_" + brokerConfig.getBrokerId());
  }
  if (brokerConfig.isIsolateLogEnable() && messageStoreConfig.isEnableDLegerCommitLog()) {
  System.setProperty("brokerLogDir", brokerConfig.getBrokerName() + "_" + messageStoreConfig.getdLegerSelfId());
  }
- configurator.doConfigure(brokerConfig.getRocketmqHome() + "/conf/logback_broker.xml");
 
  if (commandLine.hasOption('p')) {
- InternalLogger console = InternalLoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME);
+ Logger console = LoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME);
  MixAll.printObjectProperties(console, brokerConfig);
  MixAll.printObjectProperties(console, nettyServerConfig);
  MixAll.printObjectProperties(console, nettyClientConfig);
  MixAll.printObjectProperties(console, messageStoreConfig);
  System.exit(0);
  } else if (commandLine.hasOption('m')) {
- InternalLogger console = InternalLoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME);
+ Logger console = LoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME);
  MixAll.printObjectProperties(console, brokerConfig, true);
  MixAll.printObjectProperties(console, nettyServerConfig, true);
  MixAll.printObjectProperties(console, nettyClientConfig, true);
  MixAll.printObjectProperties(console, messageStoreConfig, true);
  System.exit(0);
  }
 
- log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
+ log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
  MixAll.printObjectProperties(log, brokerConfig);
  MixAll.printObjectProperties(log, nettyServerConfig);
  MixAll.printObjectProperties(log, nettyClientConfig);

broker/src/main/java/org/apache/rocketmq/broker/client/ClientHousekeepingService.java

@@ -23,12 +23,12 @@
 import org.apache.rocketmq.broker.BrokerController;
 import org.apache.rocketmq.common.ThreadFactoryImpl;
 import org.apache.rocketmq.common.constant.LoggerName;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.ChannelEventListener;
 
 public class ClientHousekeepingService implements ChannelEventListener {
- private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
+ private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
  private final BrokerController brokerController;
 
  private ScheduledExecutorService scheduledExecutorService;

broker/src/main/java/org/apache/rocketmq/broker/client/ConsumerGroupInfo.java

@@ -26,14 +26,14 @@
 import java.util.concurrent.ConcurrentMap;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
 import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
 import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
 
 public class ConsumerGroupInfo {
- private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
+ private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
  private final String groupName;
  private final ConcurrentMap<String/* Topic */, SubscriptionData> subscriptionTable =
  new ConcurrentHashMap<>();

broker/src/main/java/org/apache/rocketmq/broker/client/ConsumerManager.java

@@ -28,16 +28,16 @@
 import java.util.stream.Collectors;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.shade.org.slf4j.Logger;
+import org.apache.rocketmq.shade.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.common.RemotingHelper;
 import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
 import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
 import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
 import org.apache.rocketmq.store.stats.BrokerStatsManager;
 
 public class ConsumerManager {
- private static final InternalLogger LOGGER = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
+ private static final Logger LOGGER = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
  private static final long CHANNEL_EXPIRED_TIMEOUT = 1000 * 120;
  private final ConcurrentMap<String, ConsumerGroupInfo> consumerTable =
  new ConcurrentHashMap<>(1024);