@@ -99,13 +99,7 @@
org.apache.logging.log4j
- log4j-slf4j-impl
- test
-
-
-
- org.apache.logging.log4j
- log4j-1.2-api
+ log4j-slf4j2-impl
test
diff --git a/flume-ng-channels/flume-spillable-memory-channel/src/main/java/org/apache/flume/channel/SpillableMemoryChannel.java b/flume-ng-channels/flume-spillable-memory-channel/src/main/java/org/apache/flume/channel/SpillableMemoryChannel.java
index 2fe3e85e06..36bdf1924e 100644
--- a/flume-ng-channels/flume-spillable-memory-channel/src/main/java/org/apache/flume/channel/SpillableMemoryChannel.java
+++ b/flume-ng-channels/flume-spillable-memory-channel/src/main/java/org/apache/flume/channel/SpillableMemoryChannel.java
@@ -33,8 +33,8 @@
import org.apache.flume.exception.ChannelFullException;
import org.apache.flume.instrumentation.ChannelCounter;
import org.apache.flume.lifecycle.LifecycleState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -86,7 +86,7 @@ public class SpillableMemoryChannel extends FileChannel {
*/
public static final String AVG_EVENT_SIZE = "avgEventSize";
- private static Logger LOGGER = LoggerFactory.getLogger(SpillableMemoryChannel.class);
+ private static final Logger logger = LogManager.getLogger();
public static final int defaultMemoryCapacity = 10000;
public static final int defaultOverflowCapacity = 100000000;
@@ -345,7 +345,7 @@ protected void doPut(Event event) throws InterruptedException {
protected Event doTake() throws InterruptedException {
channelCounter.incrementEventTakeAttemptCount();
if (!totalStored.tryAcquire(overflowTimeout, TimeUnit.SECONDS)) {
- LOGGER.debug("Take is backing off as channel is empty.");
+ logger.debug("Take is backing off as channel is empty.");
return null;
}
boolean takeSuceeded = false;
@@ -365,7 +365,7 @@ protected Event doTake() throws InterruptedException {
if (useOverflow) {
if (drainOrderTop > 0) {
- LOGGER.debug("Take is switching to primary");
+ logger.debug("Take is switching to primary");
return null; // takes should now occur from primary channel
}
@@ -374,7 +374,7 @@ protected Event doTake() throws InterruptedException {
drainOrder.takeOverflow(1);
} else {
if (drainOrderTop < 0) {
- LOGGER.debug("Take is switching to overflow");
+ logger.debug("Take is switching to overflow");
return null; // takes should now occur from overflow channel
}
@@ -406,13 +406,13 @@ protected Event doTake() throws InterruptedException {
protected void doCommit() throws InterruptedException {
if (putCalled) {
putCommit();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Put Committed. Drain Order Queue state : " + drainOrder.dump());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Put Committed. Drain Order Queue state : " + drainOrder.dump());
}
} else if (takeCalled) {
takeCommit();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Take Committed. Drain Order Queue state : " + drainOrder.dump());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Take Committed. Drain Order Queue state : " + drainOrder.dump());
}
}
}
@@ -432,7 +432,7 @@ private void takeCommit() {
if (overflowActivated && memoryPercentFree >= overflowDeactivationThreshold) {
overflowActivated = false;
- LOGGER.info("Overflow Deactivated");
+ logger.info("Overflow Deactivated");
}
channelCounter.setChannelSize(getTotalStored());
}
@@ -537,7 +537,7 @@ private void commitPutsToPrimary() {
@Override
protected void doRollback() {
- LOGGER.debug("Rollback() of " + (takeCalled ? " Take Tx" : (putCalled ? " Put Tx" : "Empty Tx")));
+ logger.debug("Rollback() of " + (takeCalled ? " Take Tx" : (putCalled ? " Put Tx" : "Empty Tx")));
if (putCalled) {
if (overflowPutTx != null) {
@@ -615,7 +615,7 @@ public void configure(Context context) {
} catch (NumberFormatException e) {
newMemoryCapacity = defaultMemoryCapacity;
- LOGGER.warn(
+ logger.warn(
"Invalid " + MEMORY_CAPACITY + " specified, initializing " + getName()
+ " channel to default value of {}",
defaultMemoryCapacity);
@@ -631,7 +631,7 @@ public void configure(Context context) {
Integer newOverflowTimeout = context.getInteger(OVERFLOW_TIMEOUT, defaultOverflowTimeout);
overflowTimeout = (newOverflowTimeout != null) ? newOverflowTimeout : defaultOverflowTimeout;
} catch (NumberFormatException e) {
- LOGGER.warn(
+ logger.warn(
"Incorrect value for " + getName() + "'s " + OVERFLOW_TIMEOUT + " setting. Using default value {}",
defaultOverflowTimeout);
overflowTimeout = defaultOverflowTimeout;
@@ -642,7 +642,7 @@ public void configure(Context context) {
overflowDeactivationThreshold =
(newThreshold != null) ? newThreshold / 100.0 : defaultOverflowDeactivationThreshold / 100.0;
} catch (NumberFormatException e) {
- LOGGER.warn(
+ logger.warn(
"Incorrect value for " + getName() + "'s " + OVERFLOW_DEACTIVATION_THRESHOLD
+ ". Using default value {} %",
defaultOverflowDeactivationThreshold);
@@ -654,7 +654,7 @@ public void configure(Context context) {
byteCapacityBufferPercentage =
context.getInteger(BYTE_CAPACITY_BUFFER_PERCENTAGE, defaultByteCapacityBufferPercentage);
} catch (NumberFormatException e) {
- LOGGER.warn("Error parsing " + BYTE_CAPACITY_BUFFER_PERCENTAGE + " for "
+ logger.warn("Error parsing " + BYTE_CAPACITY_BUFFER_PERCENTAGE + " for "
+ getName() + ". Using default="
+ defaultByteCapacityBufferPercentage + ". " + e.getMessage());
byteCapacityBufferPercentage = defaultByteCapacityBufferPercentage;
@@ -663,7 +663,7 @@ public void configure(Context context) {
try {
avgEventSize = context.getInteger(AVG_EVENT_SIZE, defaultAvgEventSize);
} catch (NumberFormatException e) {
- LOGGER.warn("Error parsing " + AVG_EVENT_SIZE + " for " + getName()
+ logger.warn("Error parsing " + AVG_EVENT_SIZE + " for " + getName()
+ ". Using default = " + defaultAvgEventSize + ". "
+ e.getMessage());
avgEventSize = defaultAvgEventSize;
@@ -677,7 +677,7 @@ public void configure(Context context) {
byteCapacity = Integer.MAX_VALUE;
}
} catch (NumberFormatException e) {
- LOGGER.warn("Error parsing " + BYTE_CAPACITY + " setting for " + getName()
+ logger.warn("Error parsing " + BYTE_CAPACITY + " setting for " + getName()
+ ". Using default = " + defaultByteCapacity + ". "
+ e.getMessage());
byteCapacity = (int) ((defaultByteCapacity * (1 - byteCapacityBufferPercentage * .01)) / avgEventSize);
@@ -694,7 +694,7 @@ public void configure(Context context) {
try {
if (!bytesRemaining.tryAcquire(
lastByteCapacity - byteCapacity, overflowTimeout, TimeUnit.SECONDS)) {
- LOGGER.warn("Couldn't acquire permits to downsize the byte capacity, "
+ logger.warn("Couldn't acquire permits to downsize the byte capacity, "
+ "resizing has been aborted");
} else {
lastByteCapacity = byteCapacity;
@@ -710,7 +710,7 @@ public void configure(Context context) {
overflowCapacity = context.getInteger(OVERFLOW_CAPACITY, defaultOverflowCapacity);
// Determine if File channel needs to be disabled
if (memoryCapacity < 1 && overflowCapacity < 1) {
- LOGGER.warn("For channel " + getName() + OVERFLOW_CAPACITY + " cannot be set to 0 if "
+ logger.warn("For channel " + getName() + OVERFLOW_CAPACITY + " cannot be set to 0 if "
+ MEMORY_CAPACITY + " is also 0. " + "Using default value "
+ OVERFLOW_CAPACITY + " = " + defaultOverflowCapacity);
overflowCapacity = defaultOverflowCapacity;
@@ -737,7 +737,7 @@ private void resizePrimaryQueue(int newMemoryCapacity) throws InterruptedExcepti
if (memoryCapacity > newMemoryCapacity) {
int diff = memoryCapacity - newMemoryCapacity;
if (!memQueRemaining.tryAcquire(diff, overflowTimeout, TimeUnit.SECONDS)) {
- LOGGER.warn("Memory buffer currently contains more events than the new size. "
+ logger.warn("Memory buffer currently contains more events than the new size. "
+ "Downsizing has been aborted.");
return;
}
diff --git a/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml b/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml
index bf3e6f3aa0..339fdfdb21 100644
--- a/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml
+++ b/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml
@@ -33,8 +33,8 @@
- org.slf4j
- slf4j-api
+ org.apache.logging.log4j
+ log4j-api
org.apache.flume
diff --git a/flume-ng-configfilters/flume-ng-external-process-config-filter/src/main/java/org/apache/flume/configfilter/ExternalProcessConfigFilter.java b/flume-ng-configfilters/flume-ng-external-process-config-filter/src/main/java/org/apache/flume/configfilter/ExternalProcessConfigFilter.java
index cad22925d6..bccd0fa996 100644
--- a/flume-ng-configfilters/flume-ng-external-process-config-filter/src/main/java/org/apache/flume/configfilter/ExternalProcessConfigFilter.java
+++ b/flume-ng-configfilters/flume-ng-external-process-config-filter/src/main/java/org/apache/flume/configfilter/ExternalProcessConfigFilter.java
@@ -23,12 +23,12 @@
import java.util.Arrays;
import java.util.Map;
import java.util.Scanner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ExternalProcessConfigFilter extends AbstractConfigFilter {
- private static final Logger LOGGER = LoggerFactory.getLogger(ExternalProcessConfigFilter.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String COMMAND_KEY = "command";
private static final String CHARSET_KEY = "charset";
@@ -42,7 +42,7 @@ public String filter(String key) {
try {
return execCommand(key);
} catch (InterruptedException | IllegalStateException | IOException ex) {
- LOGGER.error("Error while reading value for key {}: ", key, ex);
+ logger.error("Error while reading value for key {}: ", key, ex);
}
return null;
}
@@ -90,10 +90,10 @@ private String getResultFromStream(InputStream inputStream) {
if (scanner.hasNextLine()) {
result = scanner.nextLine();
if (scanner.hasNextLine()) {
- LOGGER.warn("External process has more than one line of output. " + "Only the first line is used.");
+ logger.warn("External process has more than one line of output. " + "Only the first line is used.");
}
} else {
- LOGGER.warn("External process has not produced any output.");
+ logger.warn("External process has not produced any output.");
}
return result;
diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml
index 74d408611f..1c86eaf997 100644
--- a/flume-ng-configuration/pom.xml
+++ b/flume-ng-configuration/pom.xml
@@ -36,8 +36,8 @@
- org.slf4j
- slf4j-api
+ org.apache.logging.log4j
+ log4j-api
@@ -48,13 +48,7 @@
org.apache.logging.log4j
- log4j-slf4j-impl
- test
-
-
-
- org.apache.logging.log4j
- log4j-1.2-api
+ log4j-slf4j2-impl
test
diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/ConfigFilterFactory.java b/flume-ng-configuration/src/main/java/org/apache/flume/conf/ConfigFilterFactory.java
index e9e33be77a..731f8cec80 100644
--- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/ConfigFilterFactory.java
+++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/ConfigFilterFactory.java
@@ -21,17 +21,17 @@
import org.apache.flume.FlumeException;
import org.apache.flume.conf.configfilter.ConfigFilterType;
import org.apache.flume.configfilter.ConfigFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ConfigFilterFactory {
- private static final Logger LOGGER = LoggerFactory.getLogger(ConfigFilterFactory.class);
+ private static final Logger logger = LogManager.getLogger();
public static ConfigFilter create(String name, String type) throws FlumeException {
Preconditions.checkNotNull(name, "name");
Preconditions.checkNotNull(type, "type");
- LOGGER.info("Creating instance of configfilter {}, type {}", name, type);
+ logger.info("Creating instance of configfilter {}, type {}", name, type);
Class aClass = getClass(type);
try {
ConfigFilter configFilter = aClass.newInstance();
@@ -49,7 +49,7 @@ public static Class getClass(String type) throws FlumeEx
try {
srcType = ConfigFilterType.valueOf(type.toUpperCase(Locale.ENGLISH));
} catch (IllegalArgumentException ex) {
- LOGGER.debug("Configfilter type {} is a custom type", type);
+ logger.debug("Configfilter type {} is a custom type", type);
}
if (srcType != ConfigFilterType.OTHER) {
classname = srcType.getClassName();
diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java b/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java
index ee008c2430..1fd692a0ce 100644
--- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java
+++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/FlumeConfiguration.java
@@ -67,8 +67,8 @@
import org.apache.flume.conf.source.SourceConfiguration;
import org.apache.flume.conf.source.SourceType;
import org.apache.flume.configfilter.ConfigFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -85,7 +85,7 @@
*/
public class FlumeConfiguration {
- private static final Logger LOGGER = LoggerFactory.getLogger(FlumeConfiguration.class);
+ private static final Logger logger = LogManager.getLogger();
private final Map agentConfigMap;
private final LinkedList errors;
@@ -103,7 +103,7 @@ public FlumeConfiguration(Properties properties) {
// Construct the in-memory component hierarchy
for (Entry entry : properties.entrySet()) {
if (!addRawProperty(entry.getKey().toString(), entry.getValue().toString())) {
- LOGGER.warn("Configuration property ignored: {} = {}", entry.getKey(), entry.getValue());
+ logger.warn("Configuration property ignored: {} = {}", entry.getKey(), entry.getValue());
}
}
// Now iterate thru the agentContext and create agent configs and add them
@@ -122,7 +122,7 @@ public FlumeConfiguration(Map properties) {
// Construct the in-memory component hierarchy
for (Entry entry : properties.entrySet()) {
if (!addRawProperty(entry.getKey(), entry.getValue())) {
- LOGGER.warn("Configuration property ignored: {} = {}", entry.getKey(), entry.getValue());
+ logger.warn("Configuration property ignored: {} = {}", entry.getKey(), entry.getValue());
}
}
// Now iterate thru the agentContext and create agent configs and add them
@@ -150,16 +150,16 @@ private void validateConfiguration() {
AgentConfiguration aconf = next.getValue();
if (!aconf.isValid()) {
- LOGGER.warn("Agent configuration invalid for agent '{}'. It will be removed.", agentName);
+ logger.warn("Agent configuration invalid for agent '{}'. It will be removed.", agentName);
addError(agentName, AGENT_CONFIGURATION_INVALID, ERROR);
it.remove();
}
- LOGGER.debug("Channels:{}\n", aconf.channels);
- LOGGER.debug("Sinks {}\n", aconf.sinks);
- LOGGER.debug("Sources {}\n", aconf.sources);
+ logger.debug("Channels:{}\n", aconf.channels);
+ logger.debug("Sinks {}\n", aconf.sinks);
+ logger.debug("Sources {}\n", aconf.sources);
}
- LOGGER.info(
+ logger.info(
"Post-validation flume configuration contains configuration for agents: {}", agentConfigMap.keySet());
}
@@ -340,9 +340,9 @@ public Set getSinkgroupSet() {
* @return true if the configuration is valid, false otherwise
*/
private boolean isValid() {
- LOGGER.debug("Starting validation of configuration for agent: {}", agentName);
- if (LOGGER.isDebugEnabled() && LogPrivacyUtil.allowLogPrintConfig()) {
- LOGGER.debug("Initial configuration: {}", getPrevalidationConfig());
+ logger.debug("Starting validation of configuration for agent: {}", agentName);
+ if (logger.isDebugEnabled() && LogPrivacyUtil.allowLogPrintConfig()) {
+ logger.debug("Initial configuration: {}", getPrevalidationConfig());
}
configFilterSet = validateConfigFilterSet();
@@ -351,7 +351,7 @@ private boolean isValid() {
// Make sure that at least one channel is specified
if (channels == null || channels.trim().isEmpty()) {
- LOGGER.warn(
+ logger.warn(
"Agent configuration for '{}' does not contain any channels. Marking it as invalid.",
agentName);
addError(CONFIG_CHANNELS, PROPERTY_VALUE_NULL, ERROR);
@@ -362,7 +362,7 @@ private boolean isValid() {
channelSet = validateChannels(channelSet);
if (channelSet.isEmpty()) {
- LOGGER.warn(
+ logger.warn(
"Agent configuration for '{}' does not contain any valid channels. " + "Marking it as invalid.",
agentName);
addError(CONFIG_CHANNELS, PROPERTY_VALUE_NULL, ERROR);
@@ -375,7 +375,7 @@ private boolean isValid() {
// If no sources or sinks are present, then this is invalid
if (sourceSet.isEmpty() && sinkSet.isEmpty()) {
- LOGGER.warn("Agent configuration for '{}' has no sources or sinks. Will be marked invalid.", agentName);
+ logger.warn("Agent configuration for '{}' has no sources or sinks. Will be marked invalid.", agentName);
addError(CONFIG_SOURCES, PROPERTY_VALUE_NULL, ERROR);
addError(CONFIG_SINKS, PROPERTY_VALUE_NULL, ERROR);
return false;
@@ -389,9 +389,9 @@ private boolean isValid() {
sinks = getSpaceDelimitedList(sinkSet);
sinkgroups = getSpaceDelimitedList(sinkgroupSet);
- if (LOGGER.isDebugEnabled() && LogPrivacyUtil.allowLogPrintConfig()) {
- LOGGER.debug("Post validation configuration for {}", agentName);
- LOGGER.debug(getPostvalidationConfig());
+ if (logger.isDebugEnabled() && LogPrivacyUtil.allowLogPrintConfig()) {
+ logger.debug("Post validation configuration for {}", agentName);
+ logger.debug(getPostvalidationConfig());
}
return true;
@@ -429,7 +429,7 @@ private void createConfigFilters() {
configFilterPatternCache.put(configFilter.getName(), createConfigFilterPattern(configFilter));
}
} catch (Exception e) {
- LOGGER.error("Error while creating config filter {}", name, e);
+ logger.error("Error while creating config filter {}", name, e);
}
}
}
@@ -461,7 +461,7 @@ private void filterValue(Context c, String contextKey) {
String filteredValue = currentValue;
while (matcher.find()) {
String key = matcher.group("key");
- LOGGER.debug("Replacing {} from config filter {}", key, configFilter.getName());
+ logger.debug("Replacing {} from config filter {}", key, configFilter.getName());
String filtered = configFilter.filter(key);
if (filtered == null) {
continue;
@@ -472,7 +472,7 @@ private void filterValue(Context c, String contextKey) {
c.put(contextKey, filteredValue);
} catch (Exception e) {
e.printStackTrace();
- LOGGER.error(
+ logger.error(
"Error while matching and filtering configFilter: {} and key: {}",
new Object[] {configFilter.getName(), contextKey, e});
}
@@ -561,7 +561,7 @@ private Set validateChannels(Set channelSet) {
try {
conf = (ChannelConfiguration)
ComponentConfigurationFactory.create(channelName, config, ComponentType.CHANNEL);
- LOGGER.debug("Created channel {}", channelName);
+ logger.debug("Created channel {}", channelName);
if (conf != null) {
conf.configure(channelContext);
}
@@ -579,7 +579,7 @@ private Set validateChannels(Set channelSet) {
// thrown
if (conf != null) errorList.addAll(conf.getErrors());
iter.remove();
- LOGGER.warn(
+ logger.warn(
"Could not configure channel {} due to: {}",
new Object[] {channelName, e.getMessage(), e});
}
@@ -598,7 +598,7 @@ private Set validateChannels(Set channelSet) {
private Set validateConfigFilterSet() {
if (configFilters == null || configFilters.isEmpty()) {
- LOGGER.warn("Agent configuration for '{}' has no configfilters.", agentName);
+ logger.warn("Agent configuration for '{}' has no configfilters.", agentName);
return new HashSet<>();
}
Set configFilterSet = new HashSet<>(Arrays.asList(configFilters.split("\\s+")));
@@ -632,7 +632,7 @@ private Set validateConfigFilterSet() {
try {
conf = (ConfigFilterConfiguration) ComponentConfigurationFactory.create(
configFilterName, config, ComponentType.CONFIG_FILTER);
- LOGGER.debug("Created configfilter {}", configFilterName);
+ logger.debug("Created configfilter {}", configFilterName);
if (conf != null) {
conf.configure(configFilterContext);
}
@@ -648,14 +648,14 @@ private Set validateConfigFilterSet() {
} catch (ConfigurationException e) {
if (conf != null) errorList.addAll(conf.getErrors());
iter.remove();
- LOGGER.warn(
+ logger.warn(
"Could not configure configfilter {} due to: {}",
new Object[] {configFilterName, e.getMessage(), e});
}
} else {
iter.remove();
addError(configFilterName, CONFIG_ERROR, ERROR);
- LOGGER.warn("Configuration empty for: {}. Removed.", configFilterName);
+ logger.warn("Configuration empty for: {}. Removed.", configFilterName);
}
}
@@ -671,7 +671,7 @@ private Set validateConfigFilterSet() {
private Set validateSources(Set channelSet) {
// Arrays.split() call will throw NPE if the sources string is empty
if (sources == null || sources.isEmpty()) {
- LOGGER.warn("Agent configuration for '{}' has no sources.", agentName);
+ logger.warn("Agent configuration for '{}' has no sources.", agentName);
addError(CONFIG_SOURCES, PROPERTY_VALUE_NULL, WARNING);
return new HashSet();
}
@@ -742,14 +742,14 @@ private Set validateSources(Set channelSet) {
} catch (ConfigurationException e) {
if (srcConf != null) errorList.addAll(srcConf.getErrors());
iter.remove();
- LOGGER.warn(
+ logger.warn(
"Could not configure source {} due to: {}",
new Object[] {sourceName, e.getMessage(), e});
}
} else {
iter.remove();
addError(sourceName, CONFIG_ERROR, ERROR);
- LOGGER.warn("Configuration empty for: {}.Removed.", sourceName);
+ logger.warn("Configuration empty for: {}.Removed.", sourceName);
}
}
@@ -770,7 +770,7 @@ private Set validateSinks(Set channelSet) {
Set sinkSet;
SinkConfiguration sinkConf = null;
if (sinks == null || sinks.isEmpty()) {
- LOGGER.warn("Agent configuration for '{}' has no sinks.", agentName);
+ logger.warn("Agent configuration for '{}' has no sinks.", agentName);
addError(CONFIG_SINKS, PROPERTY_VALUE_NULL, WARNING);
return new HashSet();
} else {
@@ -801,7 +801,7 @@ private Set validateSinks(Set channelSet) {
Context sinkContext = sinkContextMap.get(sinkName.trim());
if (sinkContext == null) {
iter.remove();
- LOGGER.warn("no context for sink{}", sinkName);
+ logger.warn("no context for sink{}", sinkName);
addError(sinkName, CONFIG_ERROR, ERROR);
} else {
String config = null;
@@ -819,7 +819,7 @@ private Set validateSinks(Set channelSet) {
configSpecified = true;
}
try {
- LOGGER.debug("Creating sink: {} using {}", sinkName, config);
+ logger.debug("Creating sink: {} using {}", sinkName, config);
sinkConf = (SinkConfiguration)
ComponentConfigurationFactory.create(sinkName, config, ComponentType.SINK);
@@ -839,7 +839,7 @@ private Set validateSinks(Set channelSet) {
} catch (ConfigurationException e) {
iter.remove();
if (sinkConf != null) errorList.addAll(sinkConf.getErrors());
- LOGGER.warn(
+ logger.warn(
"Could not configure sink {} due to: {}", new Object[] {sinkName, e.getMessage(), e});
}
}
@@ -897,14 +897,14 @@ private Set validateGroups(Set sinkSet) {
} catch (ConfigurationException e) {
iter.remove();
addError(sinkgroupName, CONFIG_ERROR, ERROR);
- LOGGER.warn(
+ logger.warn(
"Could not configure sink group {} due to: {}",
new Object[] {sinkgroupName, e.getMessage(), e});
}
} else {
iter.remove();
addError(sinkgroupName, CONFIG_ERROR, ERROR);
- LOGGER.warn("Configuration error for: {}.Removed.", sinkgroupName);
+ logger.warn("Configuration error for: {}.Removed.", sinkgroupName);
}
}
@@ -932,7 +932,7 @@ private Set validGroupSinks(
while (sinkIt.hasNext()) {
String curSink = sinkIt.next();
if (usedSinks.containsKey(curSink)) {
- LOGGER.warn(
+ logger.warn(
"Agent configuration for '{}' sinkgroup '{}' sink '{}' in use by another group: "
+ "'{}', sink not added",
new Object[] {agentName, groupConf.getComponentName(), curSink, usedSinks.get(curSink)});
@@ -940,7 +940,7 @@ private Set validGroupSinks(
sinkIt.remove();
continue;
} else if (!sinkSet.contains(curSink)) {
- LOGGER.warn(
+ logger.warn(
"Agent configuration for '{}' sinkgroup '{}' sink not found: '{}', " + " sink not added",
new Object[] {agentName, groupConf.getComponentName(), curSink});
addError(curSink, INVALID_PROPERTY, ERROR);
@@ -1036,7 +1036,7 @@ private boolean addProperty(String key, String value) {
configFilters = value;
return true;
} else {
- LOGGER.warn("Duplicate configfilter list specified for agent: {}", agentName);
+ logger.warn("Duplicate configfilter list specified for agent: {}", agentName);
addError(CONFIG_CONFIGFILTERS, DUPLICATE_PROPERTY, ERROR);
return false;
}
@@ -1047,7 +1047,7 @@ private boolean addProperty(String key, String value) {
sources = value;
return true;
} else {
- LOGGER.warn("Duplicate source list specified for agent: {}", agentName);
+ logger.warn("Duplicate source list specified for agent: {}", agentName);
addError(CONFIG_SOURCES, DUPLICATE_PROPERTY, ERROR);
return false;
}
@@ -1057,10 +1057,10 @@ private boolean addProperty(String key, String value) {
if (CONFIG_SINKS.equals(key)) {
if (sinks == null) {
sinks = value;
- LOGGER.info("Added sinks: {} Agent: {}", sinks, agentName);
+ logger.info("Added sinks: {} Agent: {}", sinks, agentName);
return true;
} else {
- LOGGER.warn("Duplicate sink list specfied for agent: {}", agentName);
+ logger.warn("Duplicate sink list specfied for agent: {}", agentName);
addError(CONFIG_SINKS, DUPLICATE_PROPERTY, ERROR);
return false;
}
@@ -1073,7 +1073,7 @@ private boolean addProperty(String key, String value) {
return true;
} else {
- LOGGER.warn("Duplicate channel list specified for agent: {}", agentName);
+ logger.warn("Duplicate channel list specified for agent: {}", agentName);
addError(CONFIG_CHANNELS, DUPLICATE_PROPERTY, ERROR);
return false;
}
@@ -1086,7 +1086,7 @@ private boolean addProperty(String key, String value) {
return true;
} else {
- LOGGER.warn("Duplicate sinkgroup list specfied for agent: {}", agentName);
+ logger.warn("Duplicate sinkgroup list specfied for agent: {}", agentName);
addError(CONFIG_SINKGROUPS, DUPLICATE_PROPERTY, ERROR);
return false;
}
@@ -1100,7 +1100,7 @@ private boolean addProperty(String key, String value) {
return true;
}
- LOGGER.warn("Invalid property specified: {}", key);
+ logger.warn("Invalid property specified: {}", key);
addError(key, INVALID_PROPERTY, ERROR);
return false;
}
@@ -1131,11 +1131,11 @@ private boolean addComponentConfig(
ComponentNameAndConfigKey parsed = parseConfigKey(key, configPrefix);
if (parsed != null) {
String name = parsed.getComponentName().trim();
- LOGGER.info("Processing:{}", name);
+ logger.info("Processing:{}", name);
Context context = contextMap.get(name);
if (context == null) {
- LOGGER.debug("Created context for {}: {}", name, parsed.getConfigKey());
+ logger.debug("Created context for {}: {}", name, parsed.getConfigKey());
context = new Context();
contextMap.put(name, context);
}
diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/LogPrivacyUtil.java b/flume-ng-configuration/src/main/java/org/apache/flume/conf/LogPrivacyUtil.java
index 2391a97d75..2b97613854 100644
--- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/LogPrivacyUtil.java
+++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/LogPrivacyUtil.java
@@ -16,8 +16,8 @@
*/
package org.apache.flume.conf;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Utility class to help any Flume component determine whether logging potentially sensitive
@@ -27,7 +27,7 @@
* InterfaceStability.Evolving
*/
public class LogPrivacyUtil {
- private static final Logger logger = LoggerFactory.getLogger(LogPrivacyUtil.class);
+ private static final Logger logger = LogManager.getLogger();
/**
* system property name to enable logging of potentially sensitive user data
*/
diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml
index 7c7428e329..a41891d265 100644
--- a/flume-ng-core/pom.xml
+++ b/flume-ng-core/pom.xml
@@ -62,8 +62,8 @@
- org.slf4j
- slf4j-api
+ org.apache.logging.log4j
+ log4j-api
@@ -107,13 +107,7 @@
org.apache.logging.log4j
- log4j-1.2-api
- test
-
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
+ log4j-slf4j2-impl
test
diff --git a/flume-ng-core/src/main/java/org/apache/flume/SinkRunner.java b/flume-ng-core/src/main/java/org/apache/flume/SinkRunner.java
index 04c4189d59..e98e8be3f9 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/SinkRunner.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/SinkRunner.java
@@ -19,8 +19,8 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.flume.lifecycle.LifecycleAware;
import org.apache.flume.lifecycle.LifecycleState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -38,7 +38,7 @@
*/
public class SinkRunner implements LifecycleAware {
- private static final Logger logger = LoggerFactory.getLogger(SinkRunner.class);
+ private static final Logger logger = LogManager.getLogger();
private static final long backoffSleepIncrement = 1000;
private static final long maxBackoffSleep = 5000;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelProcessor.java b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelProcessor.java
index 8ff3d16309..c3d85ed4a2 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelProcessor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelProcessor.java
@@ -33,8 +33,8 @@
import org.apache.flume.interceptor.Interceptor;
import org.apache.flume.interceptor.InterceptorBuilderFactory;
import org.apache.flume.interceptor.InterceptorChain;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* A channel processor exposes operations to put {@link Event}s into
@@ -49,7 +49,7 @@
*/
public class ChannelProcessor implements Configurable {
- private static final Logger LOG = LoggerFactory.getLogger(ChannelProcessor.class);
+ private static final Logger logger = LogManager.getLogger();
private final ChannelSelector selector;
private final InterceptorChain interceptorChain;
@@ -96,7 +96,7 @@ private void configureInterceptors(Context context) {
Context interceptorContext = new Context(interceptorContexts.getSubProperties(interceptorName + "."));
String type = interceptorContext.getString("type");
if (type == null) {
- LOG.error("Type not specified for interceptor " + interceptorName);
+ logger.error("Type not specified for interceptor " + interceptorName);
throw new FlumeException("Interceptor.Type not specified for " + interceptorName);
}
try {
@@ -104,13 +104,13 @@ private void configureInterceptors(Context context) {
builder.configure(interceptorContext);
interceptors.add(builder.build());
} catch (ClassNotFoundException e) {
- LOG.error("Builder class not found. Exception follows.", e);
+ logger.error("Builder class not found. Exception follows.", e);
throw new FlumeException("Interceptor.Builder not found.", e);
} catch (InstantiationException e) {
- LOG.error("Could not instantiate Builder. Exception follows.", e);
+ logger.error("Could not instantiate Builder. Exception follows.", e);
throw new FlumeException("Interceptor.Builder not constructable.", e);
} catch (IllegalAccessException e) {
- LOG.error("Unable to access Builder. Exception follows.", e);
+ logger.error("Unable to access Builder. Exception follows.", e);
throw new FlumeException("Unable to access Interceptor.Builder.", e);
}
}
@@ -185,7 +185,7 @@ public void processEventBatch(List events) {
} catch (Throwable t) {
tx.rollback();
if (t instanceof Error) {
- LOG.error("Error while writing to required channel: " + reqChannel, t);
+ logger.error("Error while writing to required channel: " + reqChannel, t);
throw (Error) t;
} else if (t instanceof ChannelException) {
throw (ChannelException) t;
@@ -215,7 +215,7 @@ public void processEventBatch(List events) {
tx.commit();
} catch (Throwable t) {
tx.rollback();
- LOG.error("Unable to put batch on optional channel: " + optChannel, t);
+ logger.error("Unable to put batch on optional channel: " + optChannel, t);
if (t instanceof Error) {
throw (Error) t;
}
@@ -260,7 +260,7 @@ public void processEvent(Event event) {
} catch (Throwable t) {
tx.rollback();
if (t instanceof Error) {
- LOG.error("Error while writing to required channel: " + reqChannel, t);
+ logger.error("Error while writing to required channel: " + reqChannel, t);
throw (Error) t;
} else if (t instanceof ChannelException) {
throw (ChannelException) t;
@@ -287,7 +287,7 @@ public void processEvent(Event event) {
tx.commit();
} catch (Throwable t) {
tx.rollback();
- LOG.error("Unable to put event on optional channel: " + optChannel, t);
+ logger.error("Unable to put event on optional channel: " + optChannel, t);
if (t instanceof Error) {
throw (Error) t;
}
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelSelectorFactory.java b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelSelectorFactory.java
index 6ad9235e46..563c944f9e 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelSelectorFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelSelectorFactory.java
@@ -27,12 +27,12 @@
import org.apache.flume.conf.Configurables;
import org.apache.flume.conf.channel.ChannelSelectorConfiguration;
import org.apache.flume.conf.channel.ChannelSelectorType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ChannelSelectorFactory {
- private static final Logger LOGGER = LoggerFactory.getLogger(ChannelSelectorFactory.class);
+ private static final Logger logger = LogManager.getLogger();
public static ChannelSelector create(List channels, Map config) {
@@ -69,7 +69,7 @@ private static ChannelSelector getSelectorForType(String type) {
try {
selectorType = ChannelSelectorType.valueOf(type.toUpperCase(Locale.ENGLISH));
} catch (IllegalArgumentException ex) {
- LOGGER.debug("Selector type {} is a custom type", type);
+ logger.debug("Selector type {} is a custom type", type);
}
if (!selectorType.equals(ChannelSelectorType.OTHER)) {
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java
index 4ba69cc6b5..2d261a8504 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java
@@ -25,8 +25,8 @@
import org.apache.flume.Event;
import org.apache.flume.Transaction;
import org.apache.flume.exception.ChannelException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -48,7 +48,7 @@
*/
public class ChannelUtils {
- private static final Logger logger = LoggerFactory.getLogger(ChannelUtils.class);
+ private static final Logger logger = LogManager.getLogger();
/**
*
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/DefaultChannelFactory.java b/flume-ng-core/src/main/java/org/apache/flume/channel/DefaultChannelFactory.java
index ec9e9cb1d6..edd6d7b4cf 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/DefaultChannelFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/DefaultChannelFactory.java
@@ -22,12 +22,12 @@
import org.apache.flume.ChannelFactory;
import org.apache.flume.FlumeException;
import org.apache.flume.conf.channel.ChannelType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class DefaultChannelFactory implements ChannelFactory {
- private static final Logger logger = LoggerFactory.getLogger(DefaultChannelFactory.class);
+ private static final Logger logger = LogManager.getLogger();
@Override
public Channel create(String name, String type) throws FlumeException {
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java b/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java
index d765c1fb53..ac3c8cbe99 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java
@@ -31,8 +31,8 @@
import org.apache.flume.exception.ChannelException;
import org.apache.flume.exception.ChannelFullException;
import org.apache.flume.instrumentation.ChannelCounter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -49,7 +49,7 @@
@InterfaceStability.Stable
@Recyclable
public class MemoryChannel extends BasicChannelSemantics implements TransactionCapacitySupported {
- private static Logger LOGGER = LoggerFactory.getLogger(MemoryChannel.class);
+ private static final Logger logger = LogManager.getLogger();
private static final Integer defaultCapacity = 100;
private static final Integer defaultTransCapacity = 100;
private static final double byteCapacitySlotSize = 100;
@@ -225,27 +225,27 @@ public void configure(Context context) {
capacity = context.getInteger("capacity", defaultCapacity);
} catch (NumberFormatException e) {
capacity = defaultCapacity;
- LOGGER.warn(
+ logger.warn(
"Invalid capacity specified, initializing channel to " + "default capacity of {}", defaultCapacity);
}
if (capacity <= 0) {
capacity = defaultCapacity;
- LOGGER.warn(
+ logger.warn(
"Invalid capacity specified, initializing channel to " + "default capacity of {}", defaultCapacity);
}
try {
transCapacity = context.getInteger("transactionCapacity", defaultTransCapacity);
} catch (NumberFormatException e) {
transCapacity = defaultTransCapacity;
- LOGGER.warn(
+ logger.warn(
"Invalid transation capacity specified, initializing channel" + " to default capacity of {}",
defaultTransCapacity);
}
if (transCapacity <= 0) {
transCapacity = defaultTransCapacity;
- LOGGER.warn(
+ logger.warn(
"Invalid transation capacity specified, initializing channel" + " to default capacity of {}",
defaultTransCapacity);
}
@@ -303,7 +303,7 @@ public void configure(Context context) {
} else {
try {
if (!bytesRemaining.tryAcquire(lastByteCapacity - byteCapacity, keepAlive, TimeUnit.SECONDS)) {
- LOGGER.warn(
+ logger.warn(
"Couldn't acquire permits to downsize the byte capacity, resizing has been aborted");
} else {
lastByteCapacity = byteCapacity;
@@ -329,7 +329,7 @@ private void resizeQueue(int capacity) throws InterruptedException {
return;
} else if (oldCapacity > capacity) {
if (!queueRemaining.tryAcquire(oldCapacity - capacity, keepAlive, TimeUnit.SECONDS)) {
- LOGGER.warn("Couldn't acquire permits to downsize the queue, resizing has been aborted");
+ logger.warn("Couldn't acquire permits to downsize the queue, resizing has been aborted");
} else {
synchronized (queueLock) {
LinkedBlockingDeque newQueue = new LinkedBlockingDeque(capacity);
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java b/flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java
index a8434e94de..2a500980e2 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java
@@ -24,8 +24,6 @@
import org.apache.flume.Context;
import org.apache.flume.Event;
import org.apache.flume.FlumeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MultiplexingChannelSelector extends AbstractChannelSelector {
@@ -35,9 +33,6 @@ public class MultiplexingChannelSelector extends AbstractChannelSelector {
public static final String CONFIG_DEFAULT_CHANNEL = "default";
public static final String CONFIG_PREFIX_OPTIONAL = "optional";
- @SuppressWarnings("unused")
- private static final Logger LOG = LoggerFactory.getLogger(MultiplexingChannelSelector.class);
-
private static final List EMPTY_LIST = Collections.emptyList();
private String headerName;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/event/EventHelper.java b/flume-ng-core/src/main/java/org/apache/flume/event/EventHelper.java
index ebeaae596a..58a010b151 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/event/EventHelper.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/event/EventHelper.java
@@ -20,8 +20,8 @@
import java.util.Arrays;
import org.apache.commons.io.HexDump;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class EventHelper {
@@ -29,7 +29,7 @@ public class EventHelper {
private static final String EOL = System.getProperty("line.separator", "\n");
private static final int DEFAULT_MAX_BYTES = 16;
- private static final Logger LOGGER = LoggerFactory.getLogger(EventHelper.class);
+ private static final Logger logger = LogManager.getLogger();
public static String dumpEvent(Event event) {
return dumpEvent(event, DEFAULT_MAX_BYTES);
@@ -54,8 +54,8 @@ public static String dumpEvent(Event event, int maxBytes) {
}
buffer.append(hexDump);
} catch (Exception e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Exception while dumping event", e);
+ if (logger.isInfoEnabled()) {
+ logger.info("Exception while dumping event", e);
}
buffer.append("...Exception while dumping: ").append(e.getMessage());
}
diff --git a/flume-ng-core/src/main/java/org/apache/flume/formatter/output/PathManagerFactory.java b/flume-ng-core/src/main/java/org/apache/flume/formatter/output/PathManagerFactory.java
index 4f68de007b..b6d3a017cb 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/formatter/output/PathManagerFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/formatter/output/PathManagerFactory.java
@@ -20,14 +20,14 @@
import java.util.Locale;
import org.apache.flume.Context;
import org.apache.flume.FlumeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Create PathManager instances.
*/
public class PathManagerFactory {
- private static final Logger logger = LoggerFactory.getLogger(PathManagerFactory.class);
+ private static final Logger logger = LogManager.getLogger();
public static PathManager getInstance(String managerType, Context context) {
diff --git a/flume-ng-core/src/main/java/org/apache/flume/instrumentation/util/JMXPollUtil.java b/flume-ng-core/src/main/java/org/apache/flume/instrumentation/util/JMXPollUtil.java
index 940dcdc2bc..7ce3f8a79d 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/instrumentation/util/JMXPollUtil.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/instrumentation/util/JMXPollUtil.java
@@ -26,15 +26,15 @@
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanServer;
import javax.management.ObjectInstance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
*/
public class JMXPollUtil {
- private static Logger LOG = LoggerFactory.getLogger(JMXPollUtil.class);
+ private static final Logger logger = LogManager.getLogger();
private static MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
public static Map> getAllMBeans() {
@@ -43,7 +43,7 @@ public static Map> getAllMBeans() {
try {
queryMBeans = mbeanServer.queryMBeans(null, null);
} catch (Exception ex) {
- LOG.error("Could not get Mbeans for monitoring", ex);
+ logger.error("Could not get Mbeans for monitoring", ex);
Throwables.propagate(ex);
}
for (ObjectInstance obj : queryMBeans) {
@@ -72,7 +72,7 @@ public static Map> getAllMBeans() {
}
mbeanMap.put(component, attrMap);
} catch (Exception e) {
- LOG.error("Unable to poll JMX for metrics.", e);
+ logger.error("Unable to poll JMX for metrics.", e);
}
}
return mbeanMap;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java
index cb518de2e7..707109e50a 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java
@@ -24,8 +24,8 @@
import java.util.Map;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Simple Interceptor class that sets the host name or IP on all events
@@ -60,7 +60,7 @@
*/
public class HostInterceptor implements Interceptor {
- private static final Logger logger = LoggerFactory.getLogger(HostInterceptor.class);
+ private static final Logger logger = LogManager.getLogger();
private final boolean preserveExisting;
private final String header;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/InterceptorType.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/InterceptorType.java
index 13fbb48e80..22aab36495 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/InterceptorType.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/InterceptorType.java
@@ -17,13 +17,13 @@
package org.apache.flume.interceptor;
public enum InterceptorType {
- TIMESTAMP(org.apache.flume.interceptor.TimestampInterceptor.Builder.class),
- HOST(org.apache.flume.interceptor.HostInterceptor.Builder.class),
- STATIC(org.apache.flume.interceptor.StaticInterceptor.Builder.class),
- REGEX_FILTER(org.apache.flume.interceptor.RegexFilteringInterceptor.Builder.class),
- REGEX_EXTRACTOR(org.apache.flume.interceptor.RegexExtractorInterceptor.Builder.class),
- REMOVE_HEADER(org.apache.flume.interceptor.RemoveHeaderInterceptor.Builder.class),
- SEARCH_REPLACE(org.apache.flume.interceptor.SearchAndReplaceInterceptor.Builder.class);
+ TIMESTAMP(TimestampInterceptor.Builder.class),
+ HOST(HostInterceptor.Builder.class),
+ STATIC(StaticInterceptor.Builder.class),
+ REGEX_FILTER(RegexFilteringInterceptor.Builder.class),
+ REGEX_EXTRACTOR(RegexExtractorInterceptor.Builder.class),
+ REMOVE_HEADER(RemoveHeaderInterceptor.Builder.class),
+ SEARCH_REPLACE(SearchAndReplaceInterceptor.Builder.class);
private final Class builderClass;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java
index 29cf302b1a..e17183d3e6 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java
@@ -27,8 +27,8 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Interceptor that extracts matches using a specified regular expression and
@@ -99,7 +99,7 @@ public class RegexExtractorInterceptor implements Interceptor {
static final String REGEX = "regex";
static final String SERIALIZERS = "serializers";
- private static final Logger logger = LoggerFactory.getLogger(RegexExtractorInterceptor.class);
+ private static final Logger logger = LogManager.getLogger();
private final Pattern regex;
private final List serializers;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexFilteringInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexFilteringInterceptor.java
index b63cfe9591..d3a2d2ec23 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexFilteringInterceptor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexFilteringInterceptor.java
@@ -26,8 +26,8 @@
import java.util.regex.Pattern;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Interceptor that filters events selectively based on a configured regular
@@ -67,7 +67,7 @@
*/
public class RegexFilteringInterceptor implements Interceptor {
- private static final Logger logger = LoggerFactory.getLogger(RegexFilteringInterceptor.class);
+ private static final Logger logger = LogManager.getLogger();
private final Pattern regex;
private final boolean excludeEvents;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RemoveHeaderInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RemoveHeaderInterceptor.java
index c85adffc75..941da03d09 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RemoveHeaderInterceptor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RemoveHeaderInterceptor.java
@@ -28,8 +28,8 @@
import org.apache.flume.Context;
import org.apache.flume.Event;
import org.apache.flume.conf.LogPrivacyUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* This interceptor manipulates Flume event headers, by removing one or many
@@ -54,7 +54,7 @@ public class RemoveHeaderInterceptor implements Interceptor {
static final String LIST_SEPARATOR = "fromListSeparator";
static final String LIST_SEPARATOR_DEFAULT = "\\s*,\\s*";
static final String MATCH_REGEX = "matching";
- private static final Logger LOG = LoggerFactory.getLogger(RemoveHeaderInterceptor.class);
+ private static final Logger logger = LogManager.getLogger();
private final String withName;
private final Set fromList;
private final Pattern matchRegex;
@@ -107,7 +107,7 @@ public Event intercept(final Event event) {
final Map headers = event.getHeaders();
// If withName matches, removing it directly
if (withName != null && headers.remove(withName) != null) {
- LOG.trace("Removed header \"{}\" for event: {}", withName, event);
+ logger.trace("Removed header \"{}\" for event: {}", withName, event);
}
// Also, we need to go through the list
if (fromList != null || matchRegex != null) {
@@ -127,11 +127,11 @@ public Event intercept(final Event event) {
}
}
if (!removedHeaders.isEmpty() && LogPrivacyUtil.allowLogRawData()) {
- LOG.trace("Removed headers \"{}\" for event: {}", removedHeaders, event);
+ logger.trace("Removed headers \"{}\" for event: {}", removedHeaders, event);
}
}
} catch (final Exception e) {
- LOG.error("Failed to process event " + event, e);
+ logger.error("Failed to process event " + event, e);
}
return event;
}
@@ -150,8 +150,8 @@ public static class Builder implements Interceptor.Builder {
*/
@Override
public Interceptor build() {
- if (LOG.isDebugEnabled()) {
- LOG.debug(
+ if (logger.isDebugEnabled()) {
+ logger.debug(
"Creating RemoveHeaderInterceptor with: withName={}, fromList={}, "
+ "listSeparator={}, matchRegex={}",
new String[] {withName, fromList, listSeparator, String.valueOf(matchRegex)});
diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java
index 2cb71a57de..232d4e5790 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java
@@ -25,8 +25,6 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
@@ -46,8 +44,6 @@
*/
public class SearchAndReplaceInterceptor implements Interceptor {
- private static final Logger logger = LoggerFactory.getLogger(SearchAndReplaceInterceptor.class);
-
private final Pattern searchPattern;
private final String replaceString;
private final Charset charset;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/StaticInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/StaticInterceptor.java
index 4d92b6123e..e762616d37 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/StaticInterceptor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/StaticInterceptor.java
@@ -20,8 +20,8 @@
import java.util.Map;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Interceptor class that appends a static, pre-configured header to all events.
@@ -52,7 +52,7 @@
*/
public class StaticInterceptor implements Interceptor {
- private static final Logger logger = LoggerFactory.getLogger(StaticInterceptor.class);
+ private static final Logger logger = LogManager.getLogger();
private final boolean preserveExisting;
private final String key;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleController.java b/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleController.java
index 06341d8fe2..c26a12f557 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleController.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleController.java
@@ -17,12 +17,12 @@
package org.apache.flume.lifecycle;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class LifecycleController {
- private static final Logger logger = LoggerFactory.getLogger(LifecycleController.class);
+ private static final Logger logger = LogManager.getLogger();
private static final long shortestSleepDuration = 50;
private static final int maxNumberOfChecks = 5;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java b/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java
index a1c5163883..67ed39acfb 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleSupervisor.java
@@ -26,12 +26,12 @@
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.flume.FlumeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class LifecycleSupervisor implements LifecycleAware {
- private static final Logger logger = LoggerFactory.getLogger(LifecycleSupervisor.class);
+ private static final Logger logger = LogManager.getLogger();
private Map supervisedProcesses;
private Map> monitorFutures;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/serialization/BodyTextEventSerializer.java b/flume-ng-core/src/main/java/org/apache/flume/serialization/BodyTextEventSerializer.java
index 9908266023..3aefcf4f9c 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/serialization/BodyTextEventSerializer.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/serialization/BodyTextEventSerializer.java
@@ -20,8 +20,6 @@
import java.io.OutputStream;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* This class simply writes the body of the event to the output stream
@@ -29,8 +27,6 @@
*/
public class BodyTextEventSerializer implements EventSerializer {
- private static final Logger logger = LoggerFactory.getLogger(BodyTextEventSerializer.class);
-
// for legacy reasons, by default, append a newline to each event written out
private final String APPEND_NEWLINE = "appendNewline";
private final boolean APPEND_NEWLINE_DFLT = true;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/serialization/EventDeserializerFactory.java b/flume-ng-core/src/main/java/org/apache/flume/serialization/EventDeserializerFactory.java
index d0f3be7204..fab1160daf 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/serialization/EventDeserializerFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/serialization/EventDeserializerFactory.java
@@ -22,14 +22,14 @@
import org.apache.flume.FlumeException;
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@InterfaceAudience.Private
@InterfaceStability.Stable
public class EventDeserializerFactory {
- private static final Logger logger = LoggerFactory.getLogger(EventDeserializerFactory.class);
+ private static final Logger logger = LogManager.getLogger();
public static EventDeserializer getInstance(String deserializerType, Context context, ResettableInputStream in) {
diff --git a/flume-ng-core/src/main/java/org/apache/flume/serialization/EventSerializerFactory.java b/flume-ng-core/src/main/java/org/apache/flume/serialization/EventSerializerFactory.java
index d62fcc1f81..d0873c5765 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/serialization/EventSerializerFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/serialization/EventSerializerFactory.java
@@ -23,14 +23,14 @@
import org.apache.flume.FlumeException;
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@InterfaceAudience.Private
@InterfaceStability.Stable
public class EventSerializerFactory {
- private static final Logger logger = LoggerFactory.getLogger(EventSerializerFactory.class);
+ private static final Logger logger = LogManager.getLogger();
public static EventSerializer getInstance(String serializerType, Context context, OutputStream out) {
diff --git a/flume-ng-core/src/main/java/org/apache/flume/serialization/HeaderAndBodyTextEventSerializer.java b/flume-ng-core/src/main/java/org/apache/flume/serialization/HeaderAndBodyTextEventSerializer.java
index 14b1abc170..8d92612b5b 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/serialization/HeaderAndBodyTextEventSerializer.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/serialization/HeaderAndBodyTextEventSerializer.java
@@ -20,8 +20,6 @@
import java.io.OutputStream;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* This class simply writes the body of the event to the output stream
@@ -29,8 +27,6 @@
*/
public class HeaderAndBodyTextEventSerializer implements EventSerializer {
- private static final Logger logger = LoggerFactory.getLogger(HeaderAndBodyTextEventSerializer.class);
-
// for legacy reasons, by default, append a newline to each event written out
private final String APPEND_NEWLINE = "appendNewline";
private final boolean APPEND_NEWLINE_DFLT = true;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractRpcSink.java b/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractRpcSink.java
index 92bd158391..9dc4844b3b 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractRpcSink.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractRpcSink.java
@@ -40,8 +40,8 @@
import org.apache.flume.conf.Configurable;
import org.apache.flume.exception.ChannelException;
import org.apache.flume.instrumentation.SinkCounter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* This sink provides the basic RPC functionality for Flume. This sink takes
@@ -139,7 +139,7 @@
*/
public abstract class AbstractRpcSink extends AbstractSink implements Configurable, BatchSizeSupported {
- private static final Logger logger = LoggerFactory.getLogger(AbstractRpcSink.class);
+ private static final Logger logger = LogManager.getLogger();
private String hostname;
private Integer port;
private RpcClient client;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/DefaultSinkFactory.java b/flume-ng-core/src/main/java/org/apache/flume/sink/DefaultSinkFactory.java
index 059b2deb7a..371f211b83 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/DefaultSinkFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/DefaultSinkFactory.java
@@ -22,12 +22,12 @@
import org.apache.flume.Sink;
import org.apache.flume.SinkFactory;
import org.apache.flume.conf.sink.SinkType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class DefaultSinkFactory implements SinkFactory {
- private static final Logger logger = LoggerFactory.getLogger(DefaultSinkFactory.class);
+ private static final Logger logger = LogManager.getLogger();
@Override
public Sink create(String name, String type) throws FlumeException {
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java b/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
index 0f00d3c857..a09a3107ac 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
@@ -28,8 +28,8 @@
import org.apache.flume.EventDeliveryException;
import org.apache.flume.Sink;
import org.apache.flume.Sink.Status;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* FailoverSinkProcessor maintains a prioritized list of sinks,
@@ -106,7 +106,7 @@ private void adjustRefresh() {
}
}
- private static final Logger logger = LoggerFactory.getLogger(FailoverSinkProcessor.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String PRIORITY_PREFIX = "priority.";
private static final String MAX_PENALTY_PREFIX = "maxpenalty";
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java b/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java
index 61c5420370..30943ca4e9 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java
@@ -29,8 +29,8 @@
import org.apache.flume.util.OrderSelector;
import org.apache.flume.util.RandomOrderSelector;
import org.apache.flume.util.RoundRobinOrderSelector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Provides the ability to load-balance flow over multiple sinks.
@@ -85,7 +85,7 @@ public class LoadBalancingSinkProcessor extends AbstractSinkProcessor {
public static final String SELECTOR_NAME_ROUND_ROBIN_BACKOFF = "ROUND_ROBIN_BACKOFF";
public static final String SELECTOR_NAME_RANDOM_BACKOFF = "RANDOM_BACKOFF";
- private static final Logger LOGGER = LoggerFactory.getLogger(LoadBalancingSinkProcessor.class);
+ private static final Logger logger = LogManager.getLogger();
private SinkSelector selector;
@@ -120,7 +120,7 @@ public void configure(Context context) {
selector.setSinks(getSinks());
selector.configure(new Context(context.getSubProperties(CONFIG_SELECTOR_PREFIX)));
- LOGGER.debug("Sink selector: " + selector + " initialized");
+ logger.debug("Sink selector: " + selector + " initialized");
}
@Override
@@ -149,7 +149,7 @@ public Status process() throws EventDeliveryException {
break;
} catch (Exception ex) {
selector.informSinkFailed(sink);
- LOGGER.warn("Sink failed to consume event. " + "Attempting next sink if available.", ex);
+ logger.warn("Sink failed to consume event. " + "Attempting next sink if available.", ex);
}
}
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java b/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java
index 82f5ee746c..fb1f41660e 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java
@@ -24,8 +24,8 @@
import org.apache.flume.Transaction;
import org.apache.flume.conf.Configurable;
import org.apache.flume.event.EventHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -51,7 +51,7 @@
*/
public class LoggerSink extends AbstractSink implements Configurable {
- private static final Logger logger = LoggerFactory.getLogger(LoggerSink.class);
+ private static final Logger logger = LogManager.getLogger();
// Default Max bytes to dump
public static final int DEFAULT_MAX_BYTE_DUMP = 16;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java b/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java
index 749e820df5..51290b04f2 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java
@@ -26,8 +26,8 @@
import org.apache.flume.Transaction;
import org.apache.flume.conf.BatchSizeSupported;
import org.apache.flume.conf.Configurable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -49,7 +49,7 @@
*/
public class NullSink extends AbstractSink implements Configurable, BatchSizeSupported {
- private static final Logger logger = LoggerFactory.getLogger(NullSink.class);
+ private static final Logger logger = LogManager.getLogger();
private static final int DFLT_BATCH_SIZE = 100;
private static final int DFLT_LOG_EVERY_N_EVENTS = 10000;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/RollingFileSink.java b/flume-ng-core/src/main/java/org/apache/flume/sink/RollingFileSink.java
index dd2eed1463..559a7468f2 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/RollingFileSink.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/RollingFileSink.java
@@ -38,12 +38,12 @@
import org.apache.flume.instrumentation.SinkCounter;
import org.apache.flume.serialization.EventSerializer;
import org.apache.flume.serialization.EventSerializerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class RollingFileSink extends AbstractSink implements Configurable, BatchSizeSupported {
- private static final Logger logger = LoggerFactory.getLogger(RollingFileSink.class);
+ private static final Logger logger = LogManager.getLogger();
private static final long defaultRollInterval = 30;
private static final int defaultBatchSize = 100;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/SinkProcessorFactory.java b/flume-ng-core/src/main/java/org/apache/flume/sink/SinkProcessorFactory.java
index b8c8f733d8..d5f15d1d38 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/SinkProcessorFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/SinkProcessorFactory.java
@@ -27,11 +27,11 @@
import org.apache.flume.conf.ComponentConfiguration;
import org.apache.flume.conf.Configurables;
import org.apache.flume.conf.sink.SinkProcessorType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class SinkProcessorFactory {
- private static final Logger logger = LoggerFactory.getLogger(SinkProcessorFactory.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String TYPE = "type";
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/BasicSourceSemantics.java b/flume-ng-core/src/main/java/org/apache/flume/source/BasicSourceSemantics.java
index 3b98a812f3..38255b022b 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/BasicSourceSemantics.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/BasicSourceSemantics.java
@@ -26,8 +26,8 @@
import org.apache.flume.channel.ChannelProcessor;
import org.apache.flume.conf.Configurable;
import org.apache.flume.lifecycle.LifecycleState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Alternative to AbstractSource, which:
@@ -41,7 +41,7 @@
@InterfaceAudience.Public
@InterfaceStability.Evolving
public abstract class BasicSourceSemantics implements Source, Configurable {
- private static final Logger logger = LoggerFactory.getLogger(BasicSourceSemantics.class);
+ private static final Logger logger = LogManager.getLogger();
private Exception exception;
private ChannelProcessor channelProcessor;
private String name;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/DefaultSourceFactory.java b/flume-ng-core/src/main/java/org/apache/flume/source/DefaultSourceFactory.java
index c59b11941f..c66e1115d2 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/DefaultSourceFactory.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/DefaultSourceFactory.java
@@ -22,12 +22,12 @@
import org.apache.flume.Source;
import org.apache.flume.SourceFactory;
import org.apache.flume.conf.source.SourceType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class DefaultSourceFactory implements SourceFactory {
- private static final Logger logger = LoggerFactory.getLogger(DefaultSourceFactory.class);
+ private static final Logger logger = LogManager.getLogger();
@Override
public Source create(String name, String type) throws FlumeException {
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java b/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java
index 8ff4087d28..3a6778a2f2 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java
@@ -41,8 +41,8 @@
import org.apache.flume.conf.Configurable;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.instrumentation.SourceCounter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -143,7 +143,7 @@
*/
public class ExecSource extends AbstractSource implements EventDrivenSource, Configurable, BatchSizeSupported {
- private static final Logger logger = LoggerFactory.getLogger(ExecSource.class);
+ private static final Logger logger = LogManager.getLogger();
private String shell;
private String command;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSource.java b/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSource.java
index 708da2dede..03fdb7f8a4 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSource.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSource.java
@@ -43,8 +43,8 @@
import org.apache.flume.conf.Configurables;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.exception.ChannelException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -100,7 +100,7 @@
*/
public class NetcatSource extends AbstractSource implements Configurable, EventDrivenSource {
- private static final Logger logger = LoggerFactory.getLogger(NetcatSource.class);
+ private static final Logger logger = LogManager.getLogger();
private String hostName;
private int port;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/PollableSourceRunner.java b/flume-ng-core/src/main/java/org/apache/flume/source/PollableSourceRunner.java
index 118bcb4efc..5d85ebee88 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/PollableSourceRunner.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/PollableSourceRunner.java
@@ -24,8 +24,8 @@
import org.apache.flume.SourceRunner;
import org.apache.flume.channel.ChannelProcessor;
import org.apache.flume.lifecycle.LifecycleState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -44,7 +44,7 @@
*/
public class PollableSourceRunner extends SourceRunner {
- private static final Logger logger = LoggerFactory.getLogger(PollableSourceRunner.class);
+ private static final Logger logger = LogManager.getLogger();
private AtomicBoolean shouldStop;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java b/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java
index 9a26e4b8d9..2d9e1c2a06 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java
@@ -28,12 +28,12 @@
import org.apache.flume.event.EventBuilder;
import org.apache.flume.exception.ChannelException;
import org.apache.flume.instrumentation.SourceCounter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class SequenceGeneratorSource extends AbstractPollableSource implements Configurable, BatchSizeSupported {
- private static final Logger logger = LoggerFactory.getLogger(SequenceGeneratorSource.class);
+ private static final Logger logger = LogManager.getLogger();
private int batchSize;
private SourceCounter sourceCounter;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/StressSource.java b/flume-ng-core/src/main/java/org/apache/flume/source/StressSource.java
index e2ba4df98d..468e57efa3 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/StressSource.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/StressSource.java
@@ -29,8 +29,8 @@
import org.apache.flume.event.EventBuilder;
import org.apache.flume.exception.ChannelException;
import org.apache.flume.source.shaded.guava.RateLimiter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* StressSource is an internal load-generating source implementation
@@ -53,7 +53,7 @@
*/
public class StressSource extends AbstractPollableSource implements Configurable, BatchSizeSupported {
- private static final Logger logger = LoggerFactory.getLogger(StressSource.class);
+ private static final Logger logger = LogManager.getLogger();
private CounterGroup counterGroup;
private byte[] buffer;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/tools/DirectMemoryUtils.java b/flume-ng-core/src/main/java/org/apache/flume/tools/DirectMemoryUtils.java
index c18f3d7806..e4bbc6a999 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/tools/DirectMemoryUtils.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/tools/DirectMemoryUtils.java
@@ -25,12 +25,12 @@
import java.util.List;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicInteger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class DirectMemoryUtils {
- private static final Logger LOG = LoggerFactory.getLogger(DirectMemoryUtils.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String MAX_DIRECT_MEMORY_PARAM = "-XX:MaxDirectMemorySize=";
private static final long DEFAULT_SIZE = getDefaultDirectMemorySize();
private static final AtomicInteger allocated = new AtomicInteger(0);
@@ -39,7 +39,7 @@ public static ByteBuffer allocate(int size) {
Preconditions.checkArgument(size > 0, "Size must be greater than zero");
long maxDirectMemory = getDirectMemorySize();
long allocatedCurrently = allocated.get();
- LOG.info("Direct Memory Allocation: " + " Allocation = "
+ logger.info("Direct Memory Allocation: " + " Allocation = "
+ size + ", Allocated = "
+ allocatedCurrently + ", MaxDirectMemorySize = "
+ maxDirectMemory + ", Remaining = "
@@ -49,7 +49,7 @@ public static ByteBuffer allocate(int size) {
allocated.addAndGet(size);
return result;
} catch (OutOfMemoryError error) {
- LOG.error(
+ logger.error(
"Error allocating " + size + ", you likely want" + " to increase " + MAX_DIRECT_MEMORY_PARAM,
error);
throw error;
@@ -66,7 +66,7 @@ public static void clean(ByteBuffer buffer) throws Exception {
cleanMethod.invoke(cleaner);
allocated.getAndAdd(-buffer.capacity());
long maxDirectMemory = getDirectMemorySize();
- LOG.info("Direct Memory Deallocation: " + ", Allocated = "
+ logger.info("Direct Memory Deallocation: " + ", Allocated = "
+ allocated.get() + ", MaxDirectMemorySize = "
+ maxDirectMemory + ", Remaining = "
+ Math.max(0, (maxDirectMemory - allocated.get())));
@@ -106,7 +106,8 @@ private static long getDefaultDirectMemorySize() {
return (Long) result;
}
} catch (Exception e) {
- LOG.info("Unable to get maxDirectMemory from VM: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ logger.info(
+ "Unable to get maxDirectMemory from VM: " + e.getClass().getSimpleName() + ": " + e.getMessage());
}
// default according to VM.maxDirectMemory()
return Runtime.getRuntime().maxMemory();
diff --git a/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestCensoringInterceptor.java b/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestCensoringInterceptor.java
index 53b2629acf..ce532272ab 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestCensoringInterceptor.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestCensoringInterceptor.java
@@ -31,13 +31,9 @@
import org.apache.flume.event.EventBuilder;
import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestCensoringInterceptor {
- Logger logger = LoggerFactory.getLogger(TestCensoringInterceptor.class);
-
@Test
public void testCensor() {
diff --git a/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestSearchAndReplaceInterceptor.java b/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestSearchAndReplaceInterceptor.java
index 735c965975..3e4358978d 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestSearchAndReplaceInterceptor.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/interceptor/TestSearchAndReplaceInterceptor.java
@@ -22,13 +22,13 @@
import org.apache.flume.Context;
import org.apache.flume.Event;
import org.apache.flume.event.EventBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestSearchAndReplaceInterceptor {
- private static final Logger logger = LoggerFactory.getLogger(TestSearchAndReplaceInterceptor.class);
+ private static final Logger logger = LogManager.getLogger();
private void testSearchReplace(Context context, String input, String output) throws Exception {
Interceptor.Builder builder = InterceptorBuilderFactory.newInstance(InterceptorType.SEARCH_REPLACE.toString());
diff --git a/flume-ng-core/src/test/java/org/apache/flume/sink/TestRollingFileSink.java b/flume-ng-core/src/test/java/org/apache/flume/sink/TestRollingFileSink.java
index f4b9d9c5d2..c419a37b18 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/sink/TestRollingFileSink.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/sink/TestRollingFileSink.java
@@ -33,17 +33,17 @@
import org.apache.flume.exception.ChannelException;
import org.apache.flume.instrumentation.SinkCounter;
import org.apache.flume.util.Whitebox;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestRollingFileSink {
- private static final Logger logger = LoggerFactory.getLogger(TestRollingFileSink.class);
+ private static final Logger logger = LogManager.getLogger();
private File tmpDir;
private RollingFileSink sink;
diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestNetcatSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestNetcatSource.java
index 48bee9357b..0fde49a4a7 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/TestNetcatSource.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestNetcatSource.java
@@ -41,14 +41,14 @@
import org.apache.flume.conf.Configurables;
import org.apache.flume.lifecycle.LifecycleController;
import org.apache.flume.lifecycle.LifecycleState;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestNetcatSource {
- private static final Logger logger = LoggerFactory.getLogger(TestNetcatSource.class);
+ private static final Logger logger = LogManager.getLogger();
private static int getFreePort() {
try (ServerSocket socket = new ServerSocket(0)) {
diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestPollableSourceRunner.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestPollableSourceRunner.java
index 7649a6dc17..6a8200d521 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/TestPollableSourceRunner.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestPollableSourceRunner.java
@@ -31,14 +31,14 @@
import org.apache.flume.conf.Configurables;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.lifecycle.LifecycleState;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestPollableSourceRunner {
- private static final Logger logger = LoggerFactory.getLogger(TestPollableSourceRunner.class);
+ private static final Logger logger = LogManager.getLogger();
private PollableSourceRunner sourceRunner;
diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java
index b5fa384163..c1ce170dbe 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java
@@ -45,7 +45,7 @@ public void setUp() {
}
@Test
- public void testLifecycle() throws org.apache.flume.EventDeliveryException {
+ public void testLifecycle() throws EventDeliveryException {
final int DOPROCESS_LOOPS = 5;
Context context = new Context();
Configurables.configure(source, context);
diff --git a/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java b/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java
index 09cbe10b3e..a71a0801b0 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java
@@ -18,13 +18,13 @@
import static org.junit.Assert.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestVersionInfo {
- private static final Logger logger = LoggerFactory.getLogger(TestVersionInfo.class);
+ private static final Logger logger = LogManager.getLogger();
/**
* Make sure that Unknown is expected when no version info
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index 0f328cb819..6e92bc1d6c 100644
--- a/flume-ng-dist/pom.xml
+++ b/flume-ng-dist/pom.xml
@@ -205,11 +205,7 @@
org.apache.logging.log4j
- log4j-slf4j-impl
-
-
- org.apache.logging.log4j
- log4j-1.2-api
+ log4j-slf4j2-impl
diff --git a/flume-ng-instrumentation/flume-ganglia-monitor/src/main/java/org/apache/flume/instrumentation/ganglia/GangliaServer.java b/flume-ng-instrumentation/flume-ganglia-monitor/src/main/java/org/apache/flume/instrumentation/ganglia/GangliaServer.java
index 367557eff2..947242463d 100644
--- a/flume-ng-instrumentation/flume-ganglia-monitor/src/main/java/org/apache/flume/instrumentation/ganglia/GangliaServer.java
+++ b/flume-ng-instrumentation/flume-ganglia-monitor/src/main/java/org/apache/flume/instrumentation/ganglia/GangliaServer.java
@@ -34,8 +34,8 @@
import org.apache.flume.conf.ConfigurationException;
import org.apache.flume.instrumentation.MonitorService;
import org.apache.flume.instrumentation.util.JMXPollUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* A Ganglia server that polls JMX based at a configured frequency (defaults to
@@ -59,7 +59,7 @@ public class GangliaServer implements MonitorService {
* from Hadoop. All hail the yellow elephant!
*/
- private static final Logger logger = LoggerFactory.getLogger(GangliaServer.class);
+ private static final Logger logger = LogManager.getLogger();
public static final int BUFFER_SIZE = 1500; // as per libgmond.c
protected byte[] buffer = new byte[BUFFER_SIZE];
protected int offset;
diff --git a/flume-ng-instrumentation/flume-http-monitor/src/main/java/org/apache/flume/instrumentation/http/HTTPMetricsServer.java b/flume-ng-instrumentation/flume-http-monitor/src/main/java/org/apache/flume/instrumentation/http/HTTPMetricsServer.java
index 4272de4ea4..2e7c272c97 100644
--- a/flume-ng-instrumentation/flume-http-monitor/src/main/java/org/apache/flume/instrumentation/http/HTTPMetricsServer.java
+++ b/flume-ng-instrumentation/flume-http-monitor/src/main/java/org/apache/flume/instrumentation/http/HTTPMetricsServer.java
@@ -25,6 +25,8 @@
import org.apache.flume.Context;
import org.apache.flume.instrumentation.MonitorService;
import org.apache.flume.instrumentation.util.JMXPollUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -33,8 +35,6 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.Callback;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A Monitor service implementation that runs a web server on a configurable
@@ -50,7 +50,7 @@ public class HTTPMetricsServer implements MonitorService {
private Server jettyServer;
private int port;
- private static Logger LOG = LoggerFactory.getLogger(HTTPMetricsServer.class);
+ private static final Logger logger = LogManager.getLogger();
private static int DEFAULT_PORT = 41414;
public static String CONFIG_PORT = "port";
@@ -76,7 +76,7 @@ public void start() {
Thread.sleep(500);
}
} catch (Exception ex) {
- LOG.error("Error starting Jetty. JSON Metrics may not be available.", ex);
+ logger.error("Error starting Jetty. JSON Metrics may not be available.", ex);
}
}
@@ -86,7 +86,7 @@ public void stop() {
jettyServer.stop();
jettyServer.join();
} catch (Exception ex) {
- LOG.error("Error stopping Jetty. JSON Metrics may not be available.", ex);
+ logger.error("Error stopping Jetty. JSON Metrics may not be available.", ex);
}
}
diff --git a/flume-ng-instrumentation/flume-prometheus-monitor/src/main/java/org/apache/flume/instrumentation/prometheus/PrometheusHTTPMetricsServer.java b/flume-ng-instrumentation/flume-prometheus-monitor/src/main/java/org/apache/flume/instrumentation/prometheus/PrometheusHTTPMetricsServer.java
index b243bee6a9..e7da64a730 100644
--- a/flume-ng-instrumentation/flume-prometheus-monitor/src/main/java/org/apache/flume/instrumentation/prometheus/PrometheusHTTPMetricsServer.java
+++ b/flume-ng-instrumentation/flume-prometheus-monitor/src/main/java/org/apache/flume/instrumentation/prometheus/PrometheusHTTPMetricsServer.java
@@ -38,14 +38,14 @@
import javax.management.ObjectName;
import javax.management.ReflectionException;
import org.apache.flume.instrumentation.http.HTTPMetricsServer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
import org.eclipse.jetty.ee11.servlet.ServletHolder;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A Monitor service implementation that runs a web server on a configurable
@@ -57,7 +57,7 @@ public class PrometheusHTTPMetricsServer extends HTTPMetricsServer {
private static final String PROM_DEFAULT_PREFIX = "Flume_";
private Server jettyServer;
- private static Logger LOG = LoggerFactory.getLogger(PrometheusHTTPMetricsServer.class);
+ private static final Logger logger = LogManager.getLogger();
private static MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
private FlumePrometheusCollector metricsCollector;
@@ -91,7 +91,7 @@ public void start() {
Thread.sleep(500);
}
} catch (Exception ex) {
- LOG.error("Error starting Jetty. Prometheus Metrics may not be available.", ex);
+ logger.error("Error starting Jetty. Prometheus Metrics may not be available.", ex);
}
}
@@ -120,12 +120,12 @@ private void collectMetrics() {
}
} catch (Exception e) {
- LOG.error("Unable to poll JMX for metrics.", e);
+ logger.error("Unable to poll JMX for metrics.", e);
}
}
} catch (Exception ex) {
- LOG.error("Could not get Mbeans for monitoring", ex);
+ logger.error("Could not get Mbeans for monitoring", ex);
Throwables.propagate(ex);
}
}
@@ -224,7 +224,7 @@ private void processKafkaMetric(ObjectInstance obj)
.set(value);
}
} catch (Exception e) {
- LOG.warn("Metric {} could not be monitored", metricKey, e);
+ logger.warn("Metric {} could not be monitored", metricKey, e);
}
}
}
@@ -263,7 +263,7 @@ public void stop() {
jettyServer.stop();
jettyServer.join();
} catch (Exception ex) {
- LOG.error("Error stopping Jetty. Prometheus Metrics may not be available.", ex);
+ logger.error("Error stopping Jetty. Prometheus Metrics may not be available.", ex);
}
}
}
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index 58d893388c..c746cc4f68 100644
--- a/flume-ng-node/pom.xml
+++ b/flume-ng-node/pom.xml
@@ -80,15 +80,9 @@
flume-spillable-memory-channel
-
- org.slf4j
- slf4j-api
-
-
org.apache.logging.log4j
log4j-api
- test
@@ -99,13 +93,7 @@
org.apache.logging.log4j
- log4j-1.2-api
- test
-
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
+ log4j-slf4j2-impl
test
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/AbstractConfigurationProvider.java b/flume-ng-node/src/main/java/org/apache/flume/node/AbstractConfigurationProvider.java
index 1c93e92a2a..58179eeb2b 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/AbstractConfigurationProvider.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/AbstractConfigurationProvider.java
@@ -64,13 +64,13 @@
import org.apache.flume.sink.DefaultSinkProcessor;
import org.apache.flume.sink.SinkGroup;
import org.apache.flume.source.DefaultSourceFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@SuppressFBWarnings("REC_CATCH_EXCEPTION")
public abstract class AbstractConfigurationProvider implements ConfigurationProvider {
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractConfigurationProvider.class);
+ private static final Logger logger = LogManager.getLogger();
private final String agentName;
private final SourceFactory sourceFactory;
@@ -107,7 +107,7 @@ public MaterializedConfiguration getConfiguration() {
for (String channelName : channelNames) {
ChannelComponent channelComponent = channelComponentMap.get(channelName);
if (channelComponent.components.isEmpty()) {
- LOGGER.warn(String.format(
+ logger.warn(String.format(
"Channel %s has no components connected" + " and has been removed.", channelName));
channelComponentMap.remove(channelName);
Map nameChannelMap = channelCache.get(channelComponent.channel.getClass());
@@ -115,7 +115,7 @@ public MaterializedConfiguration getConfiguration() {
nameChannelMap.remove(channelName);
}
} else {
- LOGGER.info(String.format(
+ logger.info(String.format(
"Channel %s connected to %s", channelName, channelComponent.components.toString()));
conf.addChannel(channelName, channelComponent.channel);
}
@@ -127,14 +127,14 @@ public MaterializedConfiguration getConfiguration() {
conf.addSinkRunner(entry.getKey(), entry.getValue());
}
} catch (InstantiationException ex) {
- LOGGER.error("Failed to instantiate component", ex);
+ logger.error("Failed to instantiate component", ex);
} finally {
channelComponentMap.clear();
sourceRunnerMap.clear();
sinkRunnerMap.clear();
}
} else {
- LOGGER.warn("No configuration found for this host:{}", getAgentName());
+ logger.warn("No configuration found for this host:{}", getAgentName());
}
return conf;
}
@@ -145,7 +145,7 @@ public String getAgentName() {
private void loadChannels(AgentConfiguration agentConf, Map channelComponentMap)
throws InstantiationException {
- LOGGER.info("Creating channels");
+ logger.info("Creating channels");
/*
* Some channels will be reused across re-configurations. To handle this,
@@ -175,11 +175,11 @@ private void loadChannels(AgentConfiguration agentConf, Map lastChange) {
- LOGGER.info("Reloading configuration file:{}", path.toString());
+ logger.info("Reloading configuration file:{}", path.toString());
counterGroup.incrementAndGet("file.loads");
@@ -89,14 +89,14 @@ public boolean isModified() {
data = Files.readAllBytes(path);
return true;
} catch (Exception e) {
- LOGGER.error("Failed to load configuration data. Exception follows.", e);
+ logger.error("Failed to load configuration data. Exception follows.", e);
} catch (NoClassDefFoundError e) {
- LOGGER.error(
+ logger.error(
"Failed to start agent because dependencies were not found in classpath." + "Error follows.",
e);
} catch (Throwable t) {
// caught because the caller does not handle or log Throwables
- LOGGER.error("Unhandled error", t);
+ logger.error("Unhandled error", t);
}
}
return false;
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java b/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
index d23a1e493c..0d610be4b0 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
@@ -27,12 +27,12 @@
import org.apache.flume.conf.ConfigurationException;
import org.apache.flume.node.net.AuthorizationProvider;
import org.apache.flume.node.net.UrlConnectionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class HttpConfigurationSource implements ConfigurationSource {
- private static final Logger LOGGER = LoggerFactory.getLogger(HttpConfigurationSource.class);
+ private static final Logger logger = LogManager.getLogger();
private static final int NOT_MODIFIED = 304;
private static final int NOT_AUTHORIZED = 401;
private static final int NOT_FOUND = 404;
@@ -75,17 +75,17 @@ public String getExtension() {
@Override
public boolean isModified() {
- LOGGER.debug("Checking {} for changes", uri);
+ logger.debug("Checking {} for changes", uri);
counterGroup.incrementAndGet("uri.checks");
try {
- LOGGER.info("Reloading configuration from:{}", uri);
+ logger.info("Reloading configuration from:{}", uri);
if (readInputStream()) {
counterGroup.incrementAndGet("uri.loads");
return true;
}
} catch (ConfigurationException ex) {
- LOGGER.error("Unable to access configuration due to {}: ", ex.getMessage());
+ logger.error("Unable to access configuration due to {}: ", ex.getMessage());
}
return false;
}
@@ -99,20 +99,20 @@ private boolean readInputStream() {
int code = connection.getResponseCode();
switch (code) {
case NOT_MODIFIED: {
- LOGGER.debug("Configuration Not Modified");
+ logger.debug("Configuration Not Modified");
return false;
}
case OK: {
try (InputStream is = connection.getInputStream()) {
lastModified = connection.getLastModified();
- LOGGER.debug("Content was modified for {}. lastModified: {}", uri.toString(), lastModified);
+ logger.debug("Content was modified for {}. lastModified: {}", uri.toString(), lastModified);
data = IOUtils.toByteArray(is);
return true;
} catch (final IOException e) {
try (InputStream es = connection.getErrorStream()) {
- LOGGER.info("Error accessing configuration at {}: {}", uri, readStream(es));
+ logger.info("Error accessing configuration at {}: {}", uri, readStream(es));
} catch (final IOException ioe) {
- LOGGER.error("Error accessing configuration at {}: {}", uri, e.getMessage());
+ logger.error("Error accessing configuration at {}: {}", uri, e.getMessage());
}
throw new ConfigurationException("Unable to access " + uri.toString(), e);
}
@@ -125,9 +125,9 @@ private boolean readInputStream() {
}
default: {
if (code < 0) {
- LOGGER.info("Invalid response code returned");
+ logger.info("Invalid response code returned");
} else {
- LOGGER.info("Unexpected response code returned {}", code);
+ logger.info("Unexpected response code returned {}", code);
}
return false;
}
@@ -136,7 +136,7 @@ private boolean readInputStream() {
connection.disconnect();
}
} catch (IOException e) {
- LOGGER.warn("Error accessing {}: {}", uri.toString(), e.getMessage());
+ logger.warn("Error accessing {}: {}", uri.toString(), e.getMessage());
throw new ConfigurationException("Unable to access " + uri.toString(), e);
}
}
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/MapResolver.java b/flume-ng-node/src/main/java/org/apache/flume/node/MapResolver.java
index 3c40943fad..a07b21dfc9 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/MapResolver.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/MapResolver.java
@@ -29,8 +29,8 @@
import org.apache.commons.text.lookup.DefaultStringLookup;
import org.apache.commons.text.lookup.StringLookup;
import org.apache.commons.text.lookup.StringLookupFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Resolves replaceable tokens to create a Map.
@@ -39,7 +39,7 @@
*/
final class MapResolver {
- private static final Logger LOGGER = LoggerFactory.getLogger(MapResolver.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String DEFAULT_LOOKUPS = "lookups.properties";
private static final String CUSTOM_LOOKUPS_KEY = "lookups";
private static final String PROPS_IMPL_KEY = "propertiesImplementation";
@@ -87,7 +87,7 @@ private static Map createLookupMap() {
DefaultStringLookup.valueOf(lookupEnum).getStringLookup();
map.put(key.toLowerCase(Locale.ROOT), stringLookup);
} catch (IllegalArgumentException ex) {
- LOGGER.warn("{} is not a DefaultStringLookup enum value, ignoring", key);
+ logger.warn("{} is not a DefaultStringLookup enum value, ignoring", key);
}
} else {
try {
@@ -96,10 +96,10 @@ private static Map createLookupMap() {
StringLookup stringLookup = (StringLookup) clazz.newInstance();
map.put(k.toString().toLowerCase(Locale.ROOT), stringLookup);
} else {
- LOGGER.warn("{} is not a StringLookup, ignoring", v);
+ logger.warn("{} is not a StringLookup, ignoring", v);
}
} catch (Exception ex) {
- LOGGER.warn("Unable to load {} due to {}, ignoring", v, ex.getMessage());
+ logger.warn("Unable to load {} due to {}, ignoring", v, ex.getMessage());
}
}
});
@@ -146,7 +146,7 @@ private static Properties loadProperties() {
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName)) {
properties.load(inputStream);
} catch (final IOException ex) {
- LOGGER.warn("Unable to load {} due to {}", fileName, ex.getMessage());
+ logger.warn("Unable to load {} due to {}", fileName, ex.getMessage());
}
}
}
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/PollingZooKeeperConfigurationProvider.java b/flume-ng-node/src/main/java/org/apache/flume/node/PollingZooKeeperConfigurationProvider.java
index edee6b6b37..ec29874e3d 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/PollingZooKeeperConfigurationProvider.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/PollingZooKeeperConfigurationProvider.java
@@ -26,13 +26,13 @@
import org.apache.flume.conf.FlumeConfiguration;
import org.apache.flume.lifecycle.LifecycleAware;
import org.apache.flume.lifecycle.LifecycleState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class PollingZooKeeperConfigurationProvider extends AbstractZooKeeperConfigurationProvider
implements LifecycleAware {
- private static final Logger LOGGER = LoggerFactory.getLogger(PollingZooKeeperConfigurationProvider.class);
+ private static final Logger logger = LogManager.getLogger();
private final EventBus eventBus;
@@ -61,7 +61,7 @@ protected FlumeConfiguration getFlumeConfiguration() {
@Override
public void start() {
- LOGGER.debug("Starting...");
+ logger.debug("Starting...");
try {
client.start();
try {
@@ -89,7 +89,7 @@ public void nodeChanged() throws Exception {
}
private void refreshConfiguration() throws IOException {
- LOGGER.info("Refreshing configuration from ZooKeeper");
+ logger.info("Refreshing configuration from ZooKeeper");
byte[] data = null;
ChildData childData = agentNodeCache.getCurrentData();
if (childData != null) {
@@ -101,12 +101,12 @@ private void refreshConfiguration() throws IOException {
@Override
public void stop() {
- LOGGER.debug("Stopping...");
+ logger.debug("Stopping...");
if (agentNodeCache != null) {
try {
agentNodeCache.close();
} catch (IOException e) {
- LOGGER.warn("Encountered exception while stopping", e);
+ logger.warn("Encountered exception while stopping", e);
lifecycleState = LifecycleState.ERROR;
}
}
@@ -114,7 +114,7 @@ public void stop() {
try {
client.close();
} catch (Exception e) {
- LOGGER.warn("Error stopping Curator client", e);
+ logger.warn("Error stopping Curator client", e);
lifecycleState = LifecycleState.ERROR;
}
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/StaticZooKeeperConfigurationProvider.java b/flume-ng-node/src/main/java/org/apache/flume/node/StaticZooKeeperConfigurationProvider.java
index de8d34de0e..b40a6feea3 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/StaticZooKeeperConfigurationProvider.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/StaticZooKeeperConfigurationProvider.java
@@ -19,12 +19,12 @@
import org.apache.curator.framework.CuratorFramework;
import org.apache.flume.FlumeException;
import org.apache.flume.conf.FlumeConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class StaticZooKeeperConfigurationProvider extends AbstractZooKeeperConfigurationProvider {
- private static final Logger LOGGER = LoggerFactory.getLogger(StaticZooKeeperConfigurationProvider.class);
+ private static final Logger logger = LogManager.getLogger();
public StaticZooKeeperConfigurationProvider(String agentName, String zkConnString, String basePath) {
super(agentName, zkConnString, basePath);
@@ -42,7 +42,7 @@ protected FlumeConfiguration getFlumeConfiguration() {
cf.close();
}
} catch (Exception e) {
- LOGGER.error("Error getting configuration info from Zookeeper", e);
+ logger.error("Error getting configuration info from Zookeeper", e);
throw new FlumeException(e);
}
}
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/UriConfigurationProvider.java b/flume-ng-node/src/main/java/org/apache/flume/node/UriConfigurationProvider.java
index c8c73909da..dda78d11ed 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/UriConfigurationProvider.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/UriConfigurationProvider.java
@@ -36,8 +36,8 @@
import org.apache.flume.conf.FlumeConfiguration;
import org.apache.flume.lifecycle.LifecycleAware;
import org.apache.flume.lifecycle.LifecycleState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -179,7 +179,7 @@
*/
public class UriConfigurationProvider extends AbstractConfigurationProvider implements LifecycleAware {
- private static final Logger LOGGER = LoggerFactory.getLogger(UriConfigurationProvider.class);
+ private static final Logger logger = LogManager.getLogger();
private final List configurationSources;
private final File backupDirectory;
@@ -223,14 +223,14 @@ public void stop() {
executorService.shutdown();
try {
if (!executorService.awaitTermination(500, TimeUnit.MILLISECONDS)) {
- LOGGER.debug("File watcher has not terminated. Forcing shutdown of executor.");
+ logger.debug("File watcher has not terminated. Forcing shutdown of executor.");
executorService.shutdownNow();
while (!executorService.awaitTermination(500, TimeUnit.MILLISECONDS)) {
- LOGGER.debug("Waiting for file watcher to terminate");
+ logger.debug("Waiting for file watcher to terminate");
}
}
} catch (InterruptedException e) {
- LOGGER.debug("Interrupted while waiting for file watcher to terminate");
+ logger.debug("Interrupted while waiting for file watcher to terminate");
Thread.currentThread().interrupt();
}
}
@@ -257,7 +257,7 @@ public FlumeConfiguration getFlumeConfiguration() {
case ConfigurationSource.JSON:
case ConfigurationSource.YAML:
case ConfigurationSource.XML: {
- LOGGER.warn("File extension type {} is unsupported", configurationSource.getExtension());
+ logger.warn("File extension type {} is unsupported", configurationSource.getExtension());
break;
}
default: {
@@ -267,7 +267,7 @@ public FlumeConfiguration getFlumeConfiguration() {
}
}
} catch (IOException ioe) {
- LOGGER.warn("Unable to load properties from {}: {}", configurationSource.getUri(), ioe.getMessage());
+ logger.warn("Unable to load properties from {}: {}", configurationSource.getUri(), ioe.getMessage());
}
if (properties.size() > 0) {
configMap = MapResolver.resolveProperties(properties);
@@ -279,13 +279,13 @@ public FlumeConfiguration getFlumeConfiguration() {
if (backupDirectory != null) {
if (backupDirectory.mkdirs()) {
// This is only being logged to keep Spotbugs happy. We can't ignore the result of mkdirs.
- LOGGER.debug("Created directories for {}", backupDirectory.toString());
+ logger.debug("Created directories for {}", backupDirectory.toString());
}
File backupFile = getBackupFile(backupDirectory, getAgentName());
try (OutputStream os = new FileOutputStream(backupFile)) {
props.store(os, "Backup created at " + LocalDateTime.now().toString());
} catch (IOException ioe) {
- LOGGER.warn("Unable to create backup properties file: {}" + ioe.getMessage());
+ logger.warn("Unable to create backup properties file: {}" + ioe.getMessage());
}
}
} else {
@@ -294,11 +294,11 @@ public FlumeConfiguration getFlumeConfiguration() {
if (backup.exists()) {
Properties props = new Properties();
try (InputStream is = new FileInputStream(backup)) {
- LOGGER.warn("Unable to access primary configuration. Trying backup");
+ logger.warn("Unable to access primary configuration. Trying backup");
props.load(is);
configMap = MapResolver.resolveProperties(props);
} catch (IOException ex) {
- LOGGER.warn("Error reading backup file: {}", ex.getMessage());
+ logger.warn("Error reading backup file: {}", ex.getMessage());
}
}
}
@@ -306,7 +306,7 @@ public FlumeConfiguration getFlumeConfiguration() {
if (configMap != null) {
return new FlumeConfiguration(configMap);
} else {
- LOGGER.error("No configuration could be found");
+ logger.error("No configuration could be found");
return null;
}
}
@@ -332,7 +332,7 @@ public WatcherRunnable(List sources, CounterGroup counterGr
@Override
public void run() {
- LOGGER.debug("Checking for changes to sources");
+ logger.debug("Checking for changes to sources");
counterGroup.incrementAndGet("uri.checks");
try {
@@ -346,7 +346,7 @@ public void run() {
eventBus.post(getConfiguration());
}
} catch (ConfigurationException ex) {
- LOGGER.warn("Unable to update configuration: {}", ex.getMessage());
+ logger.warn("Unable to update configuration: {}", ex.getMessage());
}
}
}
diff --git a/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java b/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
index 058115fe65..a5b987129f 100644
--- a/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
+++ b/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
@@ -30,6 +30,8 @@
import org.apache.flume.conf.ConfigurationException;
import org.apache.flume.node.net.AuthorizationProvider;
import org.apache.flume.node.net.BasicAuthorizationProvider;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.ee11.servlet.DefaultServlet;
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
import org.eclipse.jetty.ee11.servlet.ServletHolder;
@@ -40,14 +42,12 @@
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Tests that files can be loaded via http.
*/
public class TestHttpConfigurationSource {
- private static final Logger LOGGER = LoggerFactory.getLogger(TestHttpConfigurationSource.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String BASIC = "Basic ";
private static final String expectedCreds = "flume:flume";
private static Server server;
@@ -130,7 +130,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
File file = new File("target/test-classes/flume-conf.properties");
long modifiedSince = request.getDateHeader(HttpHeader.IF_MODIFIED_SINCE.toString());
long lastModified = (file.lastModified() / 1000) * 1000;
- LOGGER.debug("LastModified: {}, modifiedSince: {}", lastModified, modifiedSince);
+ logger.debug("LastModified: {}, modifiedSince: {}", lastModified, modifiedSince);
if (modifiedSince > 0 && lastModified <= modifiedSince) {
response.setStatus(304);
return;
diff --git a/flume-ng-node/src/test/java/org/apache/flume/node/TestPropertiesFileConfigurationProvider.java b/flume-ng-node/src/test/java/org/apache/flume/node/TestPropertiesFileConfigurationProvider.java
index 85270fa1f3..08560c805e 100644
--- a/flume-ng-node/src/test/java/org/apache/flume/node/TestPropertiesFileConfigurationProvider.java
+++ b/flume-ng-node/src/test/java/org/apache/flume/node/TestPropertiesFileConfigurationProvider.java
@@ -26,15 +26,15 @@
import org.apache.flume.conf.FlumeConfiguration;
import org.apache.flume.conf.FlumeConfiguration.AgentConfiguration;
import org.apache.flume.conf.FlumeConfigurationError;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestPropertiesFileConfigurationProvider {
- private static final Logger LOGGER = LoggerFactory.getLogger(TestPropertiesFileConfigurationProvider.class);
+ private static final Logger logger = LogManager.getLogger();
private static final File TESTFILE = new File(TestPropertiesFileConfigurationProvider.class
.getClassLoader()
@@ -90,8 +90,8 @@ public void testPropertyRead() throws Exception {
AgentConfiguration agentConfiguration = configuration.getConfigurationFor("host1");
Assert.assertNotNull(agentConfiguration);
- LOGGER.info(agentConfiguration.getPrevalidationConfig());
- LOGGER.info(agentConfiguration.getPostvalidationConfig());
+ logger.info(agentConfiguration.getPrevalidationConfig());
+ logger.info(agentConfiguration.getPostvalidationConfig());
Set sources = Sets.newHashSet("source1");
Set sinks = Sets.newHashSet("sink1");
diff --git a/flume-ng-node/src/test/java/org/apache/flume/sink/NullInitSink.java b/flume-ng-node/src/test/java/org/apache/flume/sink/NullInitSink.java
index 547b2b8a20..136f36cf1b 100644
--- a/flume-ng-node/src/test/java/org/apache/flume/sink/NullInitSink.java
+++ b/flume-ng-node/src/test/java/org/apache/flume/sink/NullInitSink.java
@@ -29,8 +29,8 @@
import org.apache.flume.node.Initializable;
import org.apache.flume.node.MaterializedConfiguration;
import org.apache.flume.source.EventProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -52,7 +52,7 @@
*/
public class NullInitSink extends NullSink implements Initializable {
- private static final Logger logger = LoggerFactory.getLogger(NullInitSink.class);
+ private static final Logger logger = LogManager.getLogger();
private String sourceName = null;
private EventProcessor eventProcessor = null;
private long total = 0;
diff --git a/flume-ng-node/src/test/java/org/apache/flume/source/LocalSource.java b/flume-ng-node/src/test/java/org/apache/flume/source/LocalSource.java
index f67d07ce32..4b359b15e2 100644
--- a/flume-ng-node/src/test/java/org/apache/flume/source/LocalSource.java
+++ b/flume-ng-node/src/test/java/org/apache/flume/source/LocalSource.java
@@ -21,15 +21,15 @@
import org.apache.flume.EventDrivenSource;
import org.apache.flume.conf.Configurable;
import org.apache.flume.instrumentation.SourceCounter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Accepts an event from a local component and publishes it to a channel.
*/
public class LocalSource extends AbstractSource implements Configurable, EventDrivenSource, EventProcessor {
- private static final Logger logger = LoggerFactory.getLogger(LocalSource.class);
+ private static final Logger logger = LogManager.getLogger();
private SourceCounter sourceCounter;
diff --git a/flume-ng-node/src/test/java/org/apache/flume/source/TestNetcatSource.java b/flume-ng-node/src/test/java/org/apache/flume/source/TestNetcatSource.java
index 2f9abd56ae..b1ba98c2c2 100644
--- a/flume-ng-node/src/test/java/org/apache/flume/source/TestNetcatSource.java
+++ b/flume-ng-node/src/test/java/org/apache/flume/source/TestNetcatSource.java
@@ -42,14 +42,14 @@
import org.apache.flume.channel.ReplicatingChannelSelector;
import org.apache.flume.conf.Configurables;
import org.apache.flume.lifecycle.LifecycleException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@RunWith(value = Parameterized.class)
public class TestNetcatSource {
@@ -58,7 +58,7 @@ public class TestNetcatSource {
private EventDrivenSource source;
private boolean ackEveryEvent;
- private static final Logger logger = LoggerFactory.getLogger(TestNetcatSource.class);
+ private static final Logger logger = LogManager.getLogger();
public TestNetcatSource(boolean ackForEveryEvent) {
ackEveryEvent = ackForEveryEvent;
diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml
index 7ffb653bb3..a5c0a4a095 100644
--- a/flume-ng-sdk/pom.xml
+++ b/flume-ng-sdk/pom.xml
@@ -58,8 +58,8 @@
- org.slf4j
- slf4j-api
+ org.apache.logging.log4j
+ log4j-api
@@ -69,19 +69,7 @@
org.apache.logging.log4j
- log4j-slf4j-impl
- test
-
-
-
- org.apache.logging.log4j
- log4j-jul
- test
-
-
-
- org.apache.logging.log4j
- log4j-1.2-api
+ log4j-slf4j2-impl
test
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java b/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java
index 02c62e24c9..12043e2b14 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java
@@ -21,11 +21,11 @@
import org.apache.flume.Event;
import org.apache.flume.EventDeliveryException;
import org.apache.flume.FlumeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public abstract class AbstractRpcClient implements RpcClient {
- private static Logger logger = LoggerFactory.getLogger(AbstractRpcClient.class);
+ private static final Logger logger = LogManager.getLogger();
protected int batchSize = RpcClientConfigurationConstants.DEFAULT_BATCH_SIZE;
protected long connectTimeout = RpcClientConfigurationConstants.DEFAULT_CONNECT_TIMEOUT_MILLIS;
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java b/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java
index 90c2402bc2..8d03bb7301 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java
@@ -22,8 +22,8 @@
import org.apache.flume.Event;
import org.apache.flume.EventDeliveryException;
import org.apache.flume.FlumeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Avro/Netty implementation of {@link RpcClient} which supports failover. This
@@ -52,7 +52,7 @@ public class FailoverRpcClient extends AbstractRpcClient implements RpcClient {
private boolean isActive;
private Properties configurationProperties;
- private static final Logger logger = LoggerFactory.getLogger(FailoverRpcClient.class);
+ private static final Logger logger = LogManager.getLogger();
protected FailoverRpcClient() {
lastCheckedhost = -1;
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java b/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java
index 7981b5d161..9e4aa52c91 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java
@@ -20,8 +20,8 @@
import java.util.List;
import java.util.Properties;
import org.apache.flume.FlumeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* A convenience class that holds the property reference name along with the
@@ -31,7 +31,7 @@
*/
public class HostInfo {
- private static final Logger LOGGER = LoggerFactory.getLogger(HostInfo.class);
+ private static final Logger logger = LogManager.getLogger();
private final String referenceName;
private final String hostName;
@@ -73,14 +73,14 @@ public static List getHostInfoList(Properties properties) {
if (hostAndPortStr != null) {
String[] hostAndPort = hostAndPortStr.split(":");
if (hostAndPort.length != 2) {
- LOGGER.error("Invalid host address" + hostAndPortStr);
+ logger.error("Invalid host address" + hostAndPortStr);
throw new FlumeException("Invalid host address" + hostAndPortStr);
}
Integer port = null;
try {
port = Integer.parseInt(hostAndPort[1]);
} catch (NumberFormatException e) {
- LOGGER.error("Invalid port number" + hostAndPortStr, e);
+ logger.error("Invalid port number" + hostAndPortStr, e);
throw new FlumeException("Invalid port number" + hostAndPortStr);
}
HostInfo info = new HostInfo(hostList[i], hostAndPort[0].trim(), port);
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/api/LoadBalancingRpcClient.java b/flume-ng-sdk/src/main/java/org/apache/flume/api/LoadBalancingRpcClient.java
index 6f0cdd2a97..c12a0a4fc7 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/api/LoadBalancingRpcClient.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/api/LoadBalancingRpcClient.java
@@ -27,8 +27,8 @@
import org.apache.flume.util.OrderSelector;
import org.apache.flume.util.RandomOrderSelector;
import org.apache.flume.util.RoundRobinOrderSelector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* An implementation of RpcClient interface that uses NettyAvroRpcClient
@@ -47,7 +47,7 @@
*/
public class LoadBalancingRpcClient extends AbstractRpcClient {
- private static final Logger LOGGER = LoggerFactory.getLogger(LoadBalancingRpcClient.class);
+ private static final Logger logger = LogManager.getLogger();
private List hosts;
private HostSelector selector;
@@ -70,7 +70,7 @@ public void append(Event event) throws EventDeliveryException {
break;
} catch (Exception ex) {
selector.informFailure(host);
- LOGGER.warn("Failed to send event to host " + host, ex);
+ logger.warn("Failed to send event to host " + host, ex);
}
}
@@ -94,7 +94,7 @@ public void appendBatch(List events) throws EventDeliveryException {
break;
} catch (Exception ex) {
selector.informFailure(host);
- LOGGER.warn("Failed to send batch to host " + host, ex);
+ logger.warn("Failed to send batch to host " + host, ex);
}
}
@@ -126,7 +126,7 @@ public void close() throws FlumeException {
try {
client.close();
} catch (Exception ex) {
- LOGGER.warn("Failed to close client: " + name, ex);
+ logger.warn("Failed to close client: " + name, ex);
}
}
it.remove();
@@ -189,7 +189,7 @@ private synchronized RpcClient getClient(HostInfo info) throws FlumeException, E
try {
client.close();
} catch (Exception ex) {
- LOGGER.warn("Failed to close client for " + info, ex);
+ logger.warn("Failed to close client for " + info, ex);
}
client = createClient(name);
clientMap.put(name, client);
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/MonitoredCounterGroup.java b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/MonitoredCounterGroup.java
index 7029cf1d4a..db2a10462a 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/MonitoredCounterGroup.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/MonitoredCounterGroup.java
@@ -27,8 +27,8 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import javax.management.ObjectName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Used for keeping track of internal metrics using atomic integers
@@ -38,7 +38,7 @@
*/
public abstract class MonitoredCounterGroup {
- private static final Logger logger = LoggerFactory.getLogger(MonitoredCounterGroup.class);
+ private static final Logger logger = LogManager.getLogger();
// Key for component's start time in MonitoredCounterGroup.counterMap
private static final String COUNTER_GROUP_START_TIME = "start.time";
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/serialization/LineDeserializer.java b/flume-ng-sdk/src/main/java/org/apache/flume/serialization/LineDeserializer.java
index 14015898d5..ce52d6114c 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/serialization/LineDeserializer.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/serialization/LineDeserializer.java
@@ -25,8 +25,8 @@
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
import org.apache.flume.event.EventBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* A deserializer that parses text lines from a file.
@@ -35,7 +35,7 @@
@InterfaceStability.Evolving
public class LineDeserializer implements EventDeserializer {
- private static final Logger logger = LoggerFactory.getLogger(LineDeserializer.class);
+ private static final Logger logger = LogManager.getLogger();
private final ResettableInputStream in;
private final Charset outputCharset;
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java b/flume-ng-sdk/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
index 7d9d41a36f..7484063a1a 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
@@ -30,8 +30,8 @@
import java.nio.charset.CodingErrorAction;
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* This class makes the following assumptions:
@@ -83,7 +83,7 @@
@InterfaceStability.Evolving
public class ResettableFileInputStream extends ResettableInputStream implements RemoteMarkable, LengthMeasurable {
- Logger logger = LoggerFactory.getLogger(ResettableFileInputStream.class);
+ private static final Logger logger = LogManager.getLogger();
public static final int DEFAULT_BUF_SIZE = 16384;
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/util/SSLUtil.java b/flume-ng-sdk/src/main/java/org/apache/flume/util/SSLUtil.java
index 1273b863f1..0d969d45dd 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/util/SSLUtil.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/util/SSLUtil.java
@@ -16,12 +16,12 @@
*/
package org.apache.flume.util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class SSLUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(SSLUtil.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String SYS_PROP_KEYSTORE_PATH = "javax.net.ssl.keyStore";
private static final String SYS_PROP_KEYSTORE_PASSWORD = "javax.net.ssl.keyStorePassword";
@@ -71,14 +71,14 @@ public static void initGlobalSSLParameters() {
private static void initSysPropFromEnvVar(String sysPropName, String envVarName, String description) {
if (System.getProperty(sysPropName) != null) {
- LOGGER.debug("Global SSL " + description + " has been initialized from system property.");
+ logger.debug("Global SSL " + description + " has been initialized from system property.");
} else {
String envVarValue = System.getenv(envVarName);
if (envVarValue != null) {
System.setProperty(sysPropName, envVarValue);
- LOGGER.debug("Global SSL " + description + " has been initialized from environment variable.");
+ logger.debug("Global SSL " + description + " has been initialized from environment variable.");
} else {
- LOGGER.debug("No global SSL " + description + " specified.");
+ logger.debug("No global SSL " + description + " specified.");
}
}
}
diff --git a/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/BLOBHandler.java b/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/BLOBHandler.java
index 69f02e983d..667cde0838 100644
--- a/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/BLOBHandler.java
+++ b/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/BLOBHandler.java
@@ -29,8 +29,8 @@
import org.apache.flume.Event;
import org.apache.flume.conf.LogPrivacyUtil;
import org.apache.flume.event.EventBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
*
@@ -39,7 +39,7 @@
*/
public class BLOBHandler implements HTTPSourceHandler {
- private static final Logger LOG = LoggerFactory.getLogger(BLOBHandler.class);
+ private static final Logger logger = LogManager.getLogger();
private String commaSeparatedHeaders;
@@ -64,8 +64,8 @@ public List getEvents(HttpServletRequest request) throws Exception {
Map parameters = request.getParameterMap();
for (String parameter : parameters.keySet()) {
String value = parameters.get(parameter)[0];
- if (LOG.isDebugEnabled() && LogPrivacyUtil.allowLogRawData()) {
- LOG.debug("Setting Header [Key, Value] as [{},{}] ", parameter, value);
+ if (logger.isDebugEnabled() && LogPrivacyUtil.allowLogRawData()) {
+ logger.debug("Setting Header [Key, Value] as [{},{}] ", parameter, value);
}
headers.put(parameter, value);
}
@@ -78,7 +78,7 @@ public List getEvents(HttpServletRequest request) throws Exception {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
try {
IOUtils.copy(inputStream, outputStream);
- LOG.debug("Building an Event with stream of size -- {}", outputStream.size());
+ logger.debug("Building an Event with stream of size -- {}", outputStream.size());
Event event = EventBuilder.withBody(outputStream.toByteArray(), headers);
event.setHeaders(headers);
List eventList = new ArrayList();
diff --git a/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/HTTPSource.java b/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/HTTPSource.java
index 9d3b3c63fd..305eba849e 100644
--- a/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/HTTPSource.java
+++ b/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/HTTPSource.java
@@ -34,6 +34,8 @@
import org.apache.flume.instrumentation.SourceCounter;
import org.apache.flume.source.SslContextAwareAbstractSource;
import org.apache.flume.tools.FlumeBeanConfigurator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
import org.eclipse.jetty.ee11.servlet.ServletHolder;
import org.eclipse.jetty.http.HttpVersion;
@@ -46,8 +48,6 @@
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A source which accepts Flume Events by HTTP POST and GET. GET should be used
@@ -87,7 +87,7 @@ public class HTTPSource extends SslContextAwareAbstractSource implements EventDr
*
*/
- private static final Logger LOG = LoggerFactory.getLogger(HTTPSource.class);
+ private static final Logger logger = LogManager.getLogger();
private volatile Integer port;
private volatile Server srv;
private volatile String host;
@@ -122,14 +122,14 @@ public void configure(Context context) {
context.getSubProperties(HTTPSourceConfigurationConstants.CONFIG_HANDLER_PREFIX);
handler.configure(new Context(subProps));
} catch (ClassNotFoundException ex) {
- LOG.error("Error while configuring HTTPSource. Exception follows.", ex);
+ logger.error("Error while configuring HTTPSource. Exception follows.", ex);
Throwables.propagate(ex);
} catch (ClassCastException ex) {
- LOG.error("Deserializer is not an instance of HTTPSourceHandler."
+ logger.error("Deserializer is not an instance of HTTPSourceHandler."
+ "Deserializer must implement HTTPSourceHandler.");
Throwables.propagate(ex);
} catch (Exception ex) {
- LOG.error("Error configuring HTTPSource!", ex);
+ logger.error("Error configuring HTTPSource!", ex);
Throwables.propagate(ex);
}
if (sourceCounter == null) {
@@ -200,7 +200,7 @@ public void start() {
context.setSecurityHandler(HTTPServerConstraintUtil.enforceConstraints());
srv.start();
} catch (Exception ex) {
- LOG.error("Error while starting HTTPSource. Exception follows.", ex);
+ logger.error("Error while starting HTTPSource. Exception follows.", ex);
Throwables.propagate(ex);
}
Preconditions.checkArgument(srv.isRunning());
@@ -215,10 +215,10 @@ public void stop() {
srv.join();
srv = null;
} catch (Exception ex) {
- LOG.error("Error while stopping HTTPSource. Exception follows.", ex);
+ logger.error("Error while stopping HTTPSource. Exception follows.", ex);
}
sourceCounter.stop();
- LOG.info("Http source {} stopped. Metrics: {}", getName(), sourceCounter);
+ logger.info("Http source {} stopped. Metrics: {}", getName(), sourceCounter);
}
private class FlumeHTTPServlet extends HttpServlet {
@@ -231,12 +231,12 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
try {
events = handler.getEvents(request);
} catch (HTTPBadRequestException ex) {
- LOG.warn("Received bad request from client. ", ex);
+ logger.warn("Received bad request from client. ", ex);
sourceCounter.incrementEventReadFail();
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad request from client.");
return;
} catch (Exception ex) {
- LOG.warn("Deserializer threw unexpected exception. ", ex);
+ logger.warn("Deserializer threw unexpected exception. ", ex);
sourceCounter.incrementEventReadFail();
response.sendError(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Deserializer threw unexpected exception.");
@@ -247,7 +247,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
try {
getChannelProcessor().processEventBatch(events);
} catch (ChannelException ex) {
- LOG.warn(
+ logger.warn(
"Error appending event to channel. "
+ "Channel might be full. Consider increasing the channel "
+ "capacity or make sure the sinks perform faster.",
@@ -258,7 +258,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
"Error appending event to channel. Channel might be full.");
return;
} catch (Exception ex) {
- LOG.warn("Unexpected error appending event to channel. ", ex);
+ logger.warn("Unexpected error appending event to channel. ", ex);
sourceCounter.incrementGenericProcessingFail();
response.sendError(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
diff --git a/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/JSONHandler.java b/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/JSONHandler.java
index a6e10b8202..f4aec64b74 100644
--- a/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/JSONHandler.java
+++ b/flume-ng-sources/flume-http-source/src/main/java/org/apache/flume/source/http/JSONHandler.java
@@ -30,8 +30,8 @@
import org.apache.flume.Event;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.event.JSONEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* JSONHandler for HTTPSource that accepts an array of events.
@@ -72,7 +72,7 @@
*/
public class JSONHandler implements HTTPSourceHandler {
- private static final Logger LOG = LoggerFactory.getLogger(JSONHandler.class);
+ private static final Logger logger = LogManager.getLogger();
private final Type listType = new TypeToken>() {}.getType();
private final Gson gson;
@@ -90,12 +90,12 @@ public List getEvents(HttpServletRequest request) throws Exception {
// UTF-8 is default for JSON. If no charset is specified, UTF-8 is to
// be assumed.
if (charset == null) {
- LOG.debug("Charset is null, default charset of UTF-8 will be used.");
+ logger.debug("Charset is null, default charset of UTF-8 will be used.");
charset = "UTF-8";
} else if (!(charset.equalsIgnoreCase("utf-8")
|| charset.equalsIgnoreCase("utf-16")
|| charset.equalsIgnoreCase("utf-32"))) {
- LOG.error(
+ logger.error(
"Unsupported character set in request {}. "
+ "JSON handler supports UTF-8, "
+ "UTF-16 and UTF-32 only.",
diff --git a/flume-ng-sources/flume-http-source/src/test/java/org/apache/flume/source/http/TestHTTPSource.java b/flume-ng-sources/flume-http-source/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
index 9c674cbc87..42b63f6a8d 100644
--- a/flume-ng-sources/flume-http-source/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
+++ b/flume-ng-sources/flume-http-source/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
@@ -48,7 +48,9 @@
import javax.management.QueryExp;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManagerFactory;
import org.apache.flume.Channel;
import org.apache.flume.ChannelSelector;
@@ -515,7 +517,7 @@ public void testHttps() throws Exception {
doTestHttps(null, httpsPort, httpsChannel);
}
- @Test(expected = javax.net.ssl.SSLHandshakeException.class)
+ @Test(expected = SSLHandshakeException.class)
public void testHttpsSSLv3() throws Exception {
doTestHttps("SSLv3", httpsPort, httpsChannel);
}
@@ -546,7 +548,7 @@ private void doTestHttps(String protocol, int port, Channel channel) throws Exce
Transaction transaction = null;
try {
SSLContext sc = null;
- javax.net.ssl.SSLSocketFactory factory = null;
+ SSLSocketFactory factory = null;
if (System.getProperty("java.vendor").contains("IBM")) {
sc = SSLContext.getInstance("SSL_TLS");
} else {
@@ -664,12 +666,12 @@ public ResultWrapper(HttpResponse resp, List events) {
}
}
- private class DisabledProtocolsSocketFactory extends javax.net.ssl.SSLSocketFactory {
+ private class DisabledProtocolsSocketFactory extends SSLSocketFactory {
- private final javax.net.ssl.SSLSocketFactory socketFactory;
+ private final SSLSocketFactory socketFactory;
private final String[] protocols;
- DisabledProtocolsSocketFactory(javax.net.ssl.SSLSocketFactory factory, String protocol) {
+ DisabledProtocolsSocketFactory(SSLSocketFactory factory, String protocol) {
this.socketFactory = factory;
protocols = new String[1];
protocols[0] = protocol;
diff --git a/flume-ng-sources/flume-netcat-source/src/main/java/org/apache/flume/source/netcat/NetcatUdpSource.java b/flume-ng-sources/flume-netcat-source/src/main/java/org/apache/flume/source/netcat/NetcatUdpSource.java
index f16c3ab8f9..23b3d6b520 100644
--- a/flume-ng-sources/flume-netcat-source/src/main/java/org/apache/flume/source/netcat/NetcatUdpSource.java
+++ b/flume-ng-sources/flume-netcat-source/src/main/java/org/apache/flume/source/netcat/NetcatUdpSource.java
@@ -41,8 +41,8 @@
import org.apache.flume.event.EventBuilder;
import org.apache.flume.exception.ChannelException;
import org.apache.flume.source.AbstractSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class NetcatUdpSource extends AbstractSource implements EventDrivenSource, Configurable {
@@ -52,7 +52,7 @@ public class NetcatUdpSource extends AbstractSource implements EventDrivenSource
private String remoteHostHeader = "REMOTE_ADDRESS";
private EventLoopGroup group;
- private static final Logger logger = LoggerFactory.getLogger(NetcatUdpSource.class);
+ private static final Logger logger = LogManager.getLogger();
private CounterGroup counterGroup = new CounterGroup();
diff --git a/flume-ng-sources/flume-netcat-source/src/test/java/org/apache/flume/source/netcat/TestNetcatUdpSource.java b/flume-ng-sources/flume-netcat-source/src/test/java/org/apache/flume/source/netcat/TestNetcatUdpSource.java
index 3af5910dc9..191c0e9b72 100644
--- a/flume-ng-sources/flume-netcat-source/src/test/java/org/apache/flume/source/netcat/TestNetcatUdpSource.java
+++ b/flume-ng-sources/flume-netcat-source/src/test/java/org/apache/flume/source/netcat/TestNetcatUdpSource.java
@@ -32,12 +32,13 @@
import org.apache.flume.channel.MemoryChannel;
import org.apache.flume.channel.ReplicatingChannelSelector;
import org.apache.flume.conf.Configurables;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.LoggerFactory;
public class TestNetcatUdpSource {
- private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestNetcatUdpSource.class);
+ private static final Logger logger = LogManager.getLogger();
private NetcatUdpSource source;
private Channel channel;
private static final int TEST_NETCAT_PORT = 0;
diff --git a/flume-ng-sources/flume-syslog-source/pom.xml b/flume-ng-sources/flume-syslog-source/pom.xml
index 8f85d836f7..ec67429aef 100644
--- a/flume-ng-sources/flume-syslog-source/pom.xml
+++ b/flume-ng-sources/flume-syslog-source/pom.xml
@@ -98,7 +98,7 @@
org.apache.logging.log4j
- log4j-slf4j-impl
+ log4j-slf4j2-impl
test
diff --git a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/MultiportSyslogTCPSource.java b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/MultiportSyslogTCPSource.java
index 2a92c74686..6cf35285a1 100644
--- a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/MultiportSyslogTCPSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/MultiportSyslogTCPSource.java
@@ -39,14 +39,14 @@
import org.apache.flume.event.EventBuilder;
import org.apache.flume.instrumentation.SourceCounter;
import org.apache.flume.source.SslContextAwareAbstractSource;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
@@ -54,7 +54,7 @@
public class MultiportSyslogTCPSource extends SslContextAwareAbstractSource
implements EventDrivenSource, Configurable, BatchSizeSupported {
- public static final Logger logger = LoggerFactory.getLogger(MultiportSyslogTCPSource.class);
+ private static final Logger logger = LogManager.getLogger();
private final ConcurrentMap portCharsets;
diff --git a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java
index f18cb8eaa1..d41da4f194 100644
--- a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java
+++ b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java
@@ -41,14 +41,14 @@
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
import org.apache.flume.event.EventBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@InterfaceAudience.Private
@InterfaceStability.Evolving
public class SyslogParser {
- private static final Logger logger = LoggerFactory.getLogger(SyslogParser.class);
+ private static final Logger logger = LogManager.getLogger();
private static final int TS_CACHE_MAX = 1000; // timestamp cache size limit
private static final Pattern TWO_SPACES = Pattern.compile(" ");
diff --git a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogTcpSource.java b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogTcpSource.java
index 48c587a7b5..a7186ca104 100644
--- a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogTcpSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogTcpSource.java
@@ -46,15 +46,15 @@
import org.apache.flume.exception.ChannelException;
import org.apache.flume.instrumentation.SourceCounter;
import org.apache.flume.source.SslContextAwareAbstractSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* @deprecated use {@link MultiportSyslogTCPSource} instead.
*/
@Deprecated
public class SyslogTcpSource extends SslContextAwareAbstractSource implements EventDrivenSource, Configurable {
- private static final Logger logger = LoggerFactory.getLogger(SyslogTcpSource.class);
+ private static final Logger logger = LogManager.getLogger();
private int port;
private String host = null;
diff --git a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUDPSource.java b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUDPSource.java
index cb4862d392..bec5917787 100644
--- a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUDPSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUDPSource.java
@@ -38,15 +38,15 @@
import org.apache.flume.exception.ChannelException;
import org.apache.flume.instrumentation.SourceCounter;
import org.apache.flume.source.AbstractSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class SyslogUDPSource extends AbstractSource implements EventDrivenSource, Configurable {
// Default Min size
public static final int DEFAULT_MIN_SIZE = 2048;
public static final int DEFAULT_INITIAL_SIZE = DEFAULT_MIN_SIZE;
- private static final Logger logger = LoggerFactory.getLogger(SyslogUDPSource.class);
+ private static final Logger logger = LogManager.getLogger();
private final int maxsize = 1 << 16; // 64k is max allowable in RFC 5426
private int port;
private String host = null;
diff --git a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUtils.java b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUtils.java
index ac65eea27a..3ac1943d1e 100644
--- a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUtils.java
+++ b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogUtils.java
@@ -41,8 +41,8 @@
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
import org.apache.flume.event.EventBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@InterfaceAudience.Private
@InterfaceStability.Evolving
@@ -88,7 +88,7 @@ public class SyslogUtils {
private Mode m = Mode.START;
private StringBuilder prio = new StringBuilder();
private ByteArrayOutputStream baos;
- private static final Logger logger = LoggerFactory.getLogger(SyslogUtils.class);
+ private static final Logger logger = LogManager.getLogger();
public static final String SYSLOG_FACILITY = "Facility";
public static final String SYSLOG_SEVERITY = "Severity";
diff --git a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java
index 84d8d85334..b29d02edd4 100644
--- a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java
@@ -78,7 +78,7 @@
import org.mockito.Mockito;
public class TestMultiportSyslogTCPSource {
- private static final Logger LOGGER = LogManager.getLogger();
+ private static final Logger logger = LogManager.getLogger();
private static final String TEST_CLIENT_IP_HEADER = "testClientIPHeader";
private static final String TEST_CLIENT_HOSTNAME_HEADER = "testClientHostnameHeader";
private static final DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
@@ -114,7 +114,7 @@ private List testNPorts(
BiConsumer eventSenderFuncton,
Context additionalContext)
throws IOException {
- LOGGER.info("source: {}, channel: {}, numPorts: {}", source.toString(), channel.getName(), numPorts);
+ logger.info("source: {}, channel: {}, numPorts: {}", source.toString(), channel.getName(), numPorts);
Context channelContext = new Context();
channelContext.put("capacity", String.valueOf(2000));
channelContext.put("transactionCapacity", String.valueOf(2000));
@@ -144,7 +144,7 @@ private List testNPorts(
for (int i = 0; i < numPorts; i++) {
ports.append(String.valueOf(portList.get(i))).append(" ");
}
- LOGGER.info("ports: {}", ports.toString());
+ logger.info("ports: {}", ports.toString());
Context context = new Context();
context.put(
SyslogSourceConfigurationConstants.CONFIG_PORTS,
@@ -157,7 +157,7 @@ private List testNPorts(
for (int i = 0; i < numPorts; i++) {
byte[] data = getEvent(i);
eventSenderFuncton.accept(portList.get(i), data);
- LOGGER.info("Sent {} to port {}", new String(data), portList.get(i));
+ logger.info("Sent {} to port {}", new String(data), portList.get(i));
}
Transaction txn = channel.getTransaction();
@@ -165,7 +165,7 @@ private List testNPorts(
for (int i = 0; i < numPorts; i++) {
Event e = channel.take();
if (e == null) {
- LOGGER.error("Got a null event for port number: {}", i);
+ logger.error("Got a null event for port number: {}", i);
throw new NullPointerException("Event is null");
}
channelEvents.add(e);
@@ -265,7 +265,7 @@ private void closeSockets(List socketList) {
try {
socket.close();
} catch (IOException ioe) {
- LOGGER.warn("Error closing socket: {}", ioe.getMessage());
+ logger.warn("Error closing socket: {}", ioe.getMessage());
}
});
}
diff --git a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java
index 6c015af7dc..cbc6f40446 100644
--- a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java
@@ -49,16 +49,17 @@
import org.apache.flume.conf.Configurables;
import org.apache.flume.exception.ChannelException;
import org.apache.flume.util.TestKeyStores;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.Mockito;
-import org.slf4j.LoggerFactory;
public class TestSyslogTcpSource {
- private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestSyslogTcpSource.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String TEST_CLIENT_IP_HEADER = "testClientIPHeader";
private static final String TEST_CLIENT_HOSTNAME_HEADER = "testClientHostnameHeader";
diff --git a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUdpSource.java b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUdpSource.java
index 7d8ce85a27..e9ade851b9 100644
--- a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUdpSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUdpSource.java
@@ -42,13 +42,14 @@
import org.apache.flume.channel.ReplicatingChannelSelector;
import org.apache.flume.conf.Configurables;
import org.apache.flume.exception.ChannelException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
-import org.slf4j.LoggerFactory;
public class TestSyslogUdpSource {
- private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestSyslogUdpSource.class);
+ private static final Logger logger = LogManager.getLogger();
private static final String TEST_CLIENT_IP_HEADER = "testClientIPHeader";
private static final String TEST_CLIENT_HOSTNAME_HEADER = "testClientHostnameHeader";
diff --git a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/ReliableTaildirEventReader.java b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/ReliableTaildirEventReader.java
index a31bcb4a64..e3754d774d 100644
--- a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/ReliableTaildirEventReader.java
+++ b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/ReliableTaildirEventReader.java
@@ -37,13 +37,13 @@
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
import org.apache.flume.event.ReliableEventReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@InterfaceAudience.Private
@InterfaceStability.Evolving
public class ReliableTaildirEventReader implements ReliableEventReader {
- private static final Logger logger = LoggerFactory.getLogger(ReliableTaildirEventReader.class);
+ private static final Logger logger = LogManager.getLogger();
private final List taildirCache;
private final Table headerTable;
diff --git a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TailFile.java b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TailFile.java
index 1c2841e758..7823a95260 100644
--- a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TailFile.java
+++ b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TailFile.java
@@ -26,11 +26,11 @@
import java.util.Map;
import org.apache.flume.Event;
import org.apache.flume.event.EventBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class TailFile {
- private static final Logger logger = LoggerFactory.getLogger(TailFile.class);
+ private static final Logger logger = LogManager.getLogger();
private static final byte BYTE_NL = (byte) 10;
private static final byte BYTE_CR = (byte) 13;
diff --git a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirMatcher.java b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirMatcher.java
index a141dd645e..c63235721e 100644
--- a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirMatcher.java
+++ b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirMatcher.java
@@ -33,8 +33,8 @@
import java.util.concurrent.TimeUnit;
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Identifies and caches the files matched by single file pattern for {@code TAILDIR} source.
@@ -62,7 +62,7 @@
@InterfaceAudience.Private
@InterfaceStability.Evolving
public class TaildirMatcher {
- private static final Logger logger = LoggerFactory.getLogger(TaildirMatcher.class);
+ private static final Logger logger = LogManager.getLogger();
private static final FileSystem FS = FileSystems.getDefault();
// flag from configuration to switch off caching completely
diff --git a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java
index 8ff18d8588..9ae59e6810 100644
--- a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java
+++ b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java
@@ -51,12 +51,12 @@
import org.apache.flume.instrumentation.SourceCounter;
import org.apache.flume.source.AbstractSource;
import org.apache.flume.source.PollableSourceConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class TaildirSource extends AbstractSource implements PollableSource, Configurable, BatchSizeSupported {
- private static final Logger logger = LoggerFactory.getLogger(TaildirSource.class);
+ private static final Logger logger = LogManager.getLogger();
private Map filePaths;
private Table headerTable;
diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml
index c9f381ce4f..261737b658 100644
--- a/flume-parent/pom.xml
+++ b/flume-parent/pom.xml
@@ -233,6 +233,7 @@
1.28.0
2.22.0
3.20.0
+ 1.4.0
1.15.0
5.9.0
10.17.1.0
@@ -276,8 +277,8 @@
0.6.1
1.7.0
0.12
+ 2.0.17
1.1.10.8
- 1.7.32
4.9.3
1.19.0
1.53
@@ -340,12 +341,12 @@
test
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
+
+ commons-logging
+ commons-logging
+ ${commons-logging.version}
+
+
org.apache.commons
commons-lang3
@@ -397,10 +405,13 @@
import
+
org.slf4j
- slf4j-api
+ slf4j-bom
${slf4j.version}
+ pom
+ import
@@ -621,12 +632,12 @@
jasper-runtime
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
@@ -644,12 +655,8 @@