You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/08 12:34:32 UTC
svn commit: r1782151 - in
/jmeter/trunk/src/components/org/apache/jmeter/visualizers: ./ backend/
backend/graphite/ backend/influxdb/ utils/
Author: pmouawad
Date: Wed Feb 8 12:34:32 2017
New Revision: 1782151
URL: http://svn.apache.org/viewvc?rev=1782151&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Contributed by Woonsan Ko
This closes #266
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsDocument.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerContext.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java Wed Feb 8 12:34:32 2017
@@ -30,8 +30,6 @@ import javax.swing.JPanel;
import javax.swing.UIManager;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
import org.jCharts.axisChart.AxisChart;
import org.jCharts.axisChart.customRenderers.axisValue.renderers.ValueLabelPosition;
import org.jCharts.axisChart.customRenderers.axisValue.renderers.ValueLabelRenderer;
@@ -48,6 +46,8 @@ import org.jCharts.properties.LegendProp
import org.jCharts.properties.PropertyException;
import org.jCharts.properties.util.ChartFont;
import org.jCharts.types.ChartType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -56,9 +56,9 @@ import org.jCharts.types.ChartType;
*/
public class AxisGraph extends JPanel {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AxisGraph.class);
private static final String ELLIPSIS = "..."; //$NON-NLS-1$
private static final int ELLIPSIS_LEN = ELLIPSIS.length();
@@ -409,7 +409,7 @@ public class AxisGraph extends JPanel {
yaxis.setNumItems((int) (topValue / 500)+1);
yaxis.setShowGridLines(1);
} catch (PropertyException e) {
- log.warn("",e);
+ log.warn("Chart property exception occurred.", e);
}
AxisProperties axisProperties= new AxisProperties(xaxis, yaxis);
@@ -430,7 +430,7 @@ public class AxisGraph extends JPanel {
axisChart.setGraphics2D((Graphics2D) g);
axisChart.render();
} catch (ChartDataException | PropertyException e) {
- log.warn("",e);
+ log.warn("Exception occurred while rendering chart.", e);
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java Wed Feb 8 12:34:32 2017
@@ -25,8 +25,8 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.BSFTestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Needs to implement Visualizer so that TestBeanGUI can find the correct GUI class
@@ -34,7 +34,7 @@ import org.apache.log.Logger;
public class BSFListener extends BSFTestElement
implements Cloneable, SampleListener, TestBean, Visualizer {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BSFListener.class);
private static final long serialVersionUID = 234L;
@@ -52,7 +52,7 @@ public class BSFListener extends BSFTest
mgr.declareBean("sampleResult", result, SampleResult.class);
processFileOrScript(mgr);
} catch (BSFException e) {
- log.warn("Problem in BSF script "+e);
+ log.warn("Problem in BSF script. {}", e.toString());
} finally {
if (mgr != null) {
mgr.terminate();
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java Wed Feb 8 12:34:32 2017
@@ -25,9 +25,9 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.BeanShellInterpreter;
import org.apache.jmeter.util.BeanShellTestElement;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterException;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* We must implement Visualizer so that TestBeanGUI can find the correct GUI class
@@ -36,7 +36,7 @@ import org.apache.log.Logger;
public class BeanShellListener extends BeanShellTestElement
implements Cloneable, SampleListener, TestBean, Visualizer, UnsharedComponent {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BeanShellListener.class);
private static final long serialVersionUID = 4;
@@ -62,7 +62,7 @@ public class BeanShellListener extends B
bshInterpreter.set("sampleResult", samp);//$NON-NLS-1$
processFileOrScript(bshInterpreter);
} catch (JMeterException e) {
- log.warn("Problem in BeanShell script "+e);
+ log.warn("Problem in BeanShell script. {}", e.toString());
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java Wed Feb 8 12:34:32 2017
@@ -31,17 +31,17 @@ import javax.swing.SwingUtilities;
import org.apache.jmeter.gui.util.JMeterColor;
import org.apache.jmeter.samplers.Clearable;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements a simple graph for displaying performance results.
*
*/
public class Graph extends JComponent implements Scrollable, Clearable {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Graph.class);
private boolean wantData = true;
@@ -208,7 +208,7 @@ public class Graph extends JComponent im
private void drawSample(long x, Sample oneSample, Graphics g) {
int height = getHeight();
- log.debug("Drawing a sample at " + x);
+ log.debug("Drawing a sample at {}", x);
int adjustedWidth = (int)(x % WIDTH); // will always be within range of an int: as must be < width
if (wantData) {
int data = (int) (oneSample.getData() * height / graphMax);
@@ -220,7 +220,7 @@ public class Graph extends JComponent im
}
g.drawLine(adjustedWidth, height - data, adjustedWidth, height - data - 1);
if (log.isDebugEnabled()) {
- log.debug("Drawing coords = " + adjustedWidth + "," + (height - data));
+ log.debug("Drawing coords = {}, {}", adjustedWidth, (height - data));
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java Wed Feb 8 12:34:32 2017
@@ -29,8 +29,8 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.JSR223TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Needs to implement Visualizer so that TestBeanGUI can find the correct GUI class
@@ -39,9 +39,9 @@ import org.apache.log.Logger;
public class JSR223Listener extends JSR223TestElement
implements Cloneable, SampleListener, TestBean, Visualizer {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JSR223Listener.class);
- private static final long serialVersionUID = 234L;
+ private static final long serialVersionUID = 235L;
@Override
public void sampleOccurred(SampleEvent event) {
@@ -52,7 +52,7 @@ public class JSR223Listener extends JSR2
bindings.put("sampleResult", event.getResult());
processFileOrScript(scriptEngine, bindings);
} catch (ScriptException | IOException e) {
- log.error("Problem in JSR223 script "+getName(), e);
+ log.error("Problem in JSR223 script, {}", getName(), e);
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java Wed Feb 8 12:34:32 2017
@@ -29,8 +29,6 @@ import java.awt.Stroke;
import javax.swing.JPanel;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
import org.jCharts.axisChart.AxisChart;
import org.jCharts.chartData.AxisChartDataSet;
import org.jCharts.chartData.DataSeries;
@@ -41,6 +39,8 @@ import org.jCharts.properties.LegendProp
import org.jCharts.properties.LineChartProperties;
import org.jCharts.properties.PointChartProperties;
import org.jCharts.types.ChartType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -49,9 +49,9 @@ import org.jCharts.types.ChartType;
*/
public class LineGraph extends JPanel {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(LineGraph.class);
protected double[][] data = null;
protected String title;
@@ -182,7 +182,7 @@ public class LineGraph extends JPanel {
axisChart.setGraphics2D((Graphics2D) g);
axisChart.render();
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error("Error while rendering axis chart. {}", e.getMessage());
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java Wed Feb 8 12:34:32 2017
@@ -49,8 +49,8 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* TODO : - Create a subpanel for other visualizers - connect to the properties. -
@@ -63,9 +63,9 @@ import org.apache.log.Logger;
*
*/
public class MailerVisualizer extends AbstractVisualizer implements ActionListener, Clearable, ChangeListener {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(MailerVisualizer.class);
private JButton testerButton;
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsDocument.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsDocument.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsDocument.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsDocument.java Wed Feb 8 12:34:32 2017
@@ -22,12 +22,12 @@ package org.apache.jmeter.visualizers;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.Document;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RenderAsDocument extends SamplerResultTab implements ResultRenderer {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RenderAsDocument.class);
/** {@inheritDoc} */
@Override
@@ -36,7 +36,7 @@ public class RenderAsDocument extends Sa
showDocumentResponse(sampleResult);
} catch (Exception e) {
results.setText(e.toString());
- log.error("Error:", e); // $NON-NLS-1$
+ log.error("Error while rendering document.", e); // $NON-NLS-1$
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java Wed Feb 8 12:34:32 2017
@@ -32,11 +32,11 @@ import javax.swing.text.html.HTMLEditorK
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RenderAsHTML extends SamplerResultTab implements ResultRenderer {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RenderAsHTML.class);
private static final String TEXT_HTML = "text/html"; // $NON-NLS-1$
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java Wed Feb 8 12:34:32 2017
@@ -36,9 +36,9 @@ import javax.swing.tree.TreeSelectionMod
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.XPathUtil;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.tidy.Tidy;
@@ -47,7 +47,7 @@ import org.xml.sax.SAXException;
public class RenderAsXML extends SamplerResultTab
implements ResultRenderer {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RenderAsXML.class);
private static final byte[] XML_PFX = {'<','?','x','m','l',' '};//"<?xml "
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java Wed Feb 8 12:34:32 2017
@@ -50,9 +50,9 @@ import org.apache.jmeter.util.TidyExcept
import org.apache.jmeter.util.XPathUtil;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledTextField;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -62,7 +62,7 @@ import org.xml.sax.SAXException;
*/
public class RenderAsXPath implements ResultRenderer, ActionListener {
- private static final Logger logger = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RenderAsXPath.class);
private static final String XPATH_TESTER_COMMAND = "xpath_tester"; // $NON-NLS-1$
@@ -186,7 +186,7 @@ public class RenderAsXPath implements Re
xmlDataField.setText(response == null ? "" : response);
xmlDataField.setCaretPosition(0);
} catch (Exception e) {
- logger.error("Exception converting to XML:"+response+ ", message:"+e.getMessage(),e);
+ log.error("Exception converting to XML: {}, message: {}", response, e.getMessage(), e);
xmlDataField.setText("Exception converting to XML:"+response+ ", message:"+e.getMessage());
xmlDataField.setCaretPosition(0);
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java Wed Feb 8 12:34:32 2017
@@ -30,8 +30,8 @@ import javax.swing.SwingConstants;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manipulate all classes which implements request view panel interface
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
*/
public class RequestPanel {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RequestPanel.class);
private final LinkedList<RequestView> listRequestView;
@@ -70,7 +70,7 @@ public class RequestPanel {
listRequestView.add(requestView);
}
} catch (Exception e) {
- log.warn("Error in load result render:" + clazz, e); // $NON-NLS-1$
+ log.warn("Error in load result render: {}", clazz, e); // $NON-NLS-1$
}
}
// place raw tab in first position (first tab)
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java Wed Feb 8 12:34:32 2017
@@ -34,8 +34,6 @@ import java.math.BigDecimal;
import javax.swing.JPanel;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
import org.jCharts.axisChart.AxisChart;
import org.jCharts.chartData.AxisChartDataSet;
import org.jCharts.chartData.ChartDataException;
@@ -51,12 +49,14 @@ import org.jCharts.properties.PointChart
import org.jCharts.properties.PropertyException;
import org.jCharts.properties.util.ChartFont;
import org.jCharts.types.ChartType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RespTimeGraphChart extends JPanel {
- private static final long serialVersionUID = 280L;
+ private static final long serialVersionUID = 281L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RespTimeGraphChart.class);
protected double[][] data;
@@ -342,7 +342,7 @@ public class RespTimeGraphChart extends
yaxis.setNumItems((int)(max / incrTopValue) + 1);
yaxis.setShowGridLines(1);
} catch (PropertyException e) {
- log.warn("",e);
+ log.warn("Exception while setting Y axis properties.", e);
}
AxisProperties axisProperties= new AxisProperties(xaxis, yaxis);
@@ -366,7 +366,7 @@ public class RespTimeGraphChart extends
axisChart.setGraphics2D((Graphics2D) g);
axisChart.render();
} catch (ChartDataException | PropertyException e) {
- log.warn("", e);
+ log.warn("Exception while rendering axis chart.", e);
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java Wed Feb 8 12:34:32 2017
@@ -71,15 +71,15 @@ import org.apache.jmeter.visualizers.gui
import org.apache.jmeter.visualizers.utils.Colors;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledTextField;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.math.StatCalculatorLong;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RespTimeGraphVisualizer extends AbstractVisualizer implements ActionListener, Clearable {
- private static final long serialVersionUID = 280L;
+ private static final long serialVersionUID = 281L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RespTimeGraphVisualizer.class);
private static final Font FONT_DEFAULT = UIManager.getDefaults().getFont("TextField.font"); //$NON-NLS-1$
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java Wed Feb 8 12:34:32 2017
@@ -52,12 +52,12 @@ import javax.swing.text.Highlighter;
import org.apache.jmeter.gui.action.KeyStrokes;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SearchTextExtension implements ActionListener, DocumentListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SearchTextExtension.class);
private static final Font FONT_DEFAULT = UIManager.getDefaults().getFont("TextField.font");
@@ -207,7 +207,7 @@ public class SearchTextExtension impleme
}
private class EnterAction extends AbstractAction {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
@Override
public void actionPerformed(ActionEvent ev) {
executeAndShowTextFind();
@@ -302,10 +302,8 @@ public class SearchTextExtension impleme
if (results != null && results.getText().length() > 0
&& pattern != null) {
- if (log.isDebugEnabled()) {
- log.debug("lastPosition=" + lastPosition);
- }
-
+ log.debug("lastPosition={}", lastPosition);
+
Matcher matcher = null;
try {
Document contentDoc = results.getDocument();
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java Wed Feb 8 12:34:32 2017
@@ -37,8 +37,8 @@ import org.apache.jmeter.gui.action.Rege
import org.apache.jmeter.gui.action.Searcher;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.JLabeledTextField;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Panel used by {@link ViewResultsFullVisualizer} to search for data within the Tree
@@ -46,9 +46,9 @@ import org.apache.log.Logger;
*/
public class SearchTreePanel extends JPanel implements ActionListener {
- private static final long serialVersionUID = -4436834972710248247L;
+ private static final long serialVersionUID = 1L;
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SearchTreePanel.class);
private static final Font FONT_DEFAULT = UIManager.getDefaults().getFont("TextField.font");
@@ -175,7 +175,7 @@ public class SearchTreePanel extends JPa
node.updateState();
return node.isNodeHasMatched() || node.isChildrenNodesHaveMatched();
} catch (Exception e) {
- LOG.error("Error extracting data from tree node");
+ log.error("Error extracting data from tree node");
return false;
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Wed Feb 8 12:34:32 2017
@@ -83,9 +83,9 @@ import org.apache.jorphan.gui.ObjectTabl
import org.apache.jorphan.gui.ObjectTableSorter;
import org.apache.jorphan.gui.RateRenderer;
import org.apache.jorphan.gui.RendererUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.Functor;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Aggregrate Table-Based Reporting Visualizer for JMeter. Props to the people
@@ -95,7 +95,7 @@ import org.apache.log.Logger;
*
*/
public class StatGraphVisualizer extends AbstractVisualizer implements Clearable, ActionListener {
- private static final long serialVersionUID = 241L;
+ private static final long serialVersionUID = 242L;
private static final String PCT1_LABEL = JMeterUtils.getPropDefault("aggregate_rpt_pct1", "90");
private static final String PCT2_LABEL = JMeterUtils.getPropDefault("aggregate_rpt_pct2", "95");
@@ -105,7 +105,7 @@ public class StatGraphVisualizer extends
private static final Float PCT2_VALUE = new Float(Float.parseFloat(PCT2_LABEL)/100);
private static final Float PCT3_VALUE = new Float(Float.parseFloat(PCT3_LABEL)/100);
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(StatGraphVisualizer.class);
private static final String[] COLUMNS = {
"sampler_label", //$NON-NLS-1$
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java Wed Feb 8 12:34:32 2017
@@ -20,8 +20,8 @@ package org.apache.jmeter.visualizers;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
@@ -37,9 +37,9 @@ import org.xml.sax.SAXException;
*
*/
public class XMLDefaultMutableTreeNode extends DefaultMutableTreeNode {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(XMLDefaultMutableTreeNode.class);
private transient Node xmlNode;
/**
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java Wed Feb 8 12:34:32 2017
@@ -23,8 +23,8 @@ import java.util.concurrent.ConcurrentHa
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An abstract implementation of the BackendListenerClient interface. This
@@ -53,7 +53,7 @@ import org.apache.log.Logger;
*/
public abstract class AbstractBackendListenerClient implements BackendListenerClient {
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AbstractBackendListenerClient.class);
private UserMetric userMetrics = new UserMetric();
private ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<>();
@@ -61,7 +61,9 @@ public abstract class AbstractBackendLis
/* Implements BackendListenerClient.setupTest(BackendListenerContext) */
@Override
public void setupTest(BackendListenerContext context) throws Exception {
- LOGGER.debug(getClass().getName() + ": setupTest");
+ if(log.isDebugEnabled()) {
+ log.debug("{}: setupTest", getClass().getName());
+ }
metricsPerSampler.clear();
userMetrics.clear();
}
@@ -69,7 +71,9 @@ public abstract class AbstractBackendLis
/* Implements BackendListenerClient.teardownTest(BackendListenerContext) */
@Override
public void teardownTest(BackendListenerContext context) throws Exception {
- LOGGER.debug(getClass().getName() + ": teardownTest");
+ if(log.isDebugEnabled()) {
+ log.debug("{}: teardownTest", getClass().getName());
+ }
metricsPerSampler.clear();
userMetrics.clear();
}
@@ -87,7 +91,7 @@ public abstract class AbstractBackendLis
* @return a Logger instance which can be used for logging
*/
protected Logger getLogger() {
- return LOGGER;
+ return log;
}
/**
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java Wed Feb 8 12:34:32 2017
@@ -40,8 +40,8 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.visualizers.backend.graphite.GraphiteBackendListenerClient;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Async Listener that delegates SampleResult handling to implementations of {@link BackendListenerClient}
@@ -67,9 +67,9 @@ public class BackendListener extends Abs
/**
*
*/
- private static final long serialVersionUID = 8184103677832024335L;
+ private static final long serialVersionUID = 1L;
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BackendListener.class);
/**
* Property key representing the classname of the BackendListenerClient to user.
@@ -143,7 +143,7 @@ public class BackendListener extends Abs
try {
return Class.forName(name, false, Thread.currentThread().getContextClassLoader());
} catch (Exception e) {
- LOGGER.error(whoAmI() + "\tException initialising: " + name, e);
+ log.error("{}\tException initialising: {}", whoAmI(), name, e);
}
return null;
}
@@ -174,8 +174,8 @@ public class BackendListener extends Abs
SampleResult sr = listenerClientData.client.createSampleResult(context, event.getResult());
if(sr == null) {
- if(LOGGER.isDebugEnabled()) {
- LOGGER.debug(getName()+"=>Dropping SampleResult:"+event.getResult());
+ if (log.isDebugEnabled()) {
+ log.debug("{} => Dropping SampleResult: {}", getName(), event.getResult());
}
return;
}
@@ -188,7 +188,7 @@ public class BackendListener extends Abs
listenerClientData.queueWaitTime.addAndGet(t2-t1);
}
} catch (Exception err) {
- LOGGER.error("sampleOccurred, failed to queue the sample", err);
+ log.error("sampleOccurred, failed to queue the sample", err);
}
}
@@ -210,34 +210,38 @@ public class BackendListener extends Abs
@Override
public void run() {
- boolean isDebugEnabled = LOGGER.isDebugEnabled();
+ final boolean isDebugEnabled = log.isDebugEnabled();
List<SampleResult> sampleResults = new ArrayList<>(listenerClientData.queue.size());
try {
try {
boolean endOfLoop = false;
while (!endOfLoop) {
- if(isDebugEnabled) {
- LOGGER.debug("Thread:"+Thread.currentThread().getName()+" taking SampleResult from queue:"+listenerClientData.queue.size());
+ if (isDebugEnabled) {
+ log.debug("Thread: {} taking SampleResult from queue: {}", Thread.currentThread().getName(),
+ listenerClientData.queue.size());
}
SampleResult sampleResult = listenerClientData.queue.take();
- if(isDebugEnabled) {
- LOGGER.debug("Thread:"+Thread.currentThread().getName()+" took SampleResult:"+sampleResult+", isFinal:" + (sampleResult==FINAL_SAMPLE_RESULT));
+ if (isDebugEnabled) {
+ log.debug("Thread: {} took SampleResult: {}, isFinal: {}", Thread.currentThread().getName(),
+ sampleResult, (sampleResult == FINAL_SAMPLE_RESULT));
}
while (!(endOfLoop = (sampleResult == FINAL_SAMPLE_RESULT)) && sampleResult != null ) { // try to process as many as possible
sampleResults.add(sampleResult);
- if(isDebugEnabled) {
- LOGGER.debug("Thread:"+Thread.currentThread().getName()+" polling from queue:"+listenerClientData.queue.size());
+ if (isDebugEnabled) {
+ log.debug("Thread: {} polling from queue: {}", Thread.currentThread().getName(),
+ listenerClientData.queue.size());
}
sampleResult = listenerClientData.queue.poll(); // returns null if nothing on queue currently
- if(isDebugEnabled) {
- LOGGER.debug("Thread:"+Thread.currentThread().getName()+" took from queue:"+sampleResult+", isFinal:" + (sampleResult==FINAL_SAMPLE_RESULT));
+ if (isDebugEnabled) {
+ log.debug("Thread: {} took from queue: {}, isFinal:", Thread.currentThread().getName(),
+ sampleResult, (sampleResult == FINAL_SAMPLE_RESULT));
}
}
- if(isDebugEnabled) {
- LOGGER.debug("Thread:"+Thread.currentThread().getName()+
- " exiting with FINAL EVENT:"+(sampleResult == FINAL_SAMPLE_RESULT)
- +", null:" + (sampleResult==null));
+ if (isDebugEnabled) {
+ log.debug("Thread: {} exiting with FINAL EVENT: {}, null: {}",
+ Thread.currentThread().getName(), sampleResult == FINAL_SAMPLE_RESULT,
+ sampleResult == null);
}
sendToListener(backendListenerClient, context, sampleResults);
if(!endOfLoop) {
@@ -249,7 +253,7 @@ public class BackendListener extends Abs
}
// We may have been interrupted
sendToListener(backendListenerClient, context, sampleResults);
- LOGGER.info("Worker ended");
+ log.info("Worker ended");
} finally {
listenerClientData.latch.countDown();
}
@@ -284,7 +288,7 @@ public class BackendListener extends Abs
try {
return (BackendListenerClient) clientClass.newInstance();
} catch (Exception e) {
- LOGGER.error("Exception creating: " + clientClass, e);
+ log.error("Exception creating: {}", clientClass, e);
return new ErrorBackendListenerClient();
}
}
@@ -302,8 +306,8 @@ public class BackendListener extends Abs
**/
@Override
public void testStarted(String host) {
- if(LOGGER.isDebugEnabled()){
- LOGGER.debug(whoAmI() + "\ttestStarted(" + host + ")");
+ if (log.isDebugEnabled()) {
+ log.debug("{}\ttestStarted({})", whoAmI(), host);
}
int queueSize;
@@ -311,7 +315,7 @@ public class BackendListener extends Abs
try {
queueSize = Integer.parseInt(size);
} catch (NumberFormatException nfe) {
- LOGGER.warn("Invalid queue size '" + size + "' defaulting to " + DEFAULT_QUEUE_SIZE);
+ log.warn("Invalid queue size '{}' defaulting to {}", size, DEFAULT_QUEUE_SIZE);
queueSize = Integer.parseInt(DEFAULT_QUEUE_SIZE);
}
@@ -331,11 +335,12 @@ public class BackendListener extends Abs
listenerClientData.queueWaitTime = new AtomicLong(0L);
listenerClientData.latch = new CountDownLatch(1);
listenerClientData.client = backendListenerClient;
- LOGGER.info(getName()+":Starting worker with class:"+clientClass +" and queue capacity:"+getQueueSize());
+ log.info("{}: Starting worker with class: {} and queue capacity: {}", getName(), clientClass,
+ getQueueSize());
Worker worker = new Worker(backendListenerClient, (Arguments) getArguments().clone(), listenerClientData);
worker.setDaemon(true);
worker.start();
- LOGGER.info(getName()+": Started worker with class:"+clientClass);
+ log.info("{}: Started worker with class: {}", getName(), clientClass);
try {
backendListenerClient.setupTest(context);
} catch (Exception e) {
@@ -359,8 +364,8 @@ public class BackendListener extends Abs
public void testEnded(String host) {
synchronized (LOCK) {
ListenerClientData listenerClientDataForName = queuesByTestElementName.get(myName);
- if(LOGGER.isDebugEnabled()) {
- LOGGER.debug("testEnded called on instance "+myName+"#"+listenerClientDataForName.instanceCount);
+ if (log.isDebugEnabled()) {
+ log.debug("testEnded called on instance {}#{}", myName, listenerClientDataForName.instanceCount);
}
listenerClientDataForName.instanceCount--;
if (listenerClientDataForName.instanceCount > 0){
@@ -371,11 +376,12 @@ public class BackendListener extends Abs
try {
listenerClientData.queue.put(FINAL_SAMPLE_RESULT);
} catch (Exception ex) {
- LOGGER.warn("testEnded() with exception:"+ex.getMessage(), ex);
+ log.warn("testEnded() with exception: {}", ex.getMessage(), ex);
}
if (listenerClientData.queueWaits.get() > 0) {
- LOGGER.warn("QueueWaits: "+listenerClientData.queueWaits+"; QueueWaitTime: "+listenerClientData.queueWaitTime+
- " (nanoseconds), you may need to increase queue capacity, see property 'backend_queue_capacity'");
+ log.warn(
+ "QueueWaits: {}; QueueWaitTime: {} (nanoseconds), you may need to increase queue capacity, see property 'backend_queue_capacity'",
+ listenerClientData.queueWaits, listenerClientData.queueWaitTime);
}
try {
listenerClientData.latch.await();
@@ -408,7 +414,7 @@ public class BackendListener extends Abs
*/
@Override
public void handleSampleResults(List<SampleResult> sampleResults, BackendListenerContext context) {
- LOGGER.warn("ErrorBackendListenerClient#handleSampleResult called, noop");
+ log.warn("ErrorBackendListenerClient#handleSampleResult called, noop");
Thread.yield();
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerContext.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerContext.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerContext.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerContext.java Wed Feb 8 12:34:32 2017
@@ -23,8 +23,8 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.jmeter.config.Arguments;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* BackendListenerContext is used to provide context information to a
@@ -45,7 +45,7 @@ public class BackendListenerContext {
*/
/** Logging */
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BackendListenerContext.class);
/**
* Map containing the initialization parameters for the BackendListenerClient.
@@ -164,8 +164,8 @@ public class BackendListenerContext {
try {
return Integer.parseInt(params.get(name));
} catch (NumberFormatException e) {
- LOGGER.warn("Value for parameter '" + name + "' not an integer: '" + params.get(name) + "'. Using default: '"
- + defaultValue + "'.", e);
+ log.warn("Value for parameter '{}' not an integer: '{}'. Using default: '{}'.", name, params.get(name),
+ defaultValue, e);
return defaultValue;
}
}
@@ -216,8 +216,8 @@ public class BackendListenerContext {
try {
return Long.decode(params.get(name)).longValue();
} catch (NumberFormatException e) {
- LOGGER.warn("Value for parameter '" + name + "' not a long: '" + params.get(name) + "'. Using default: '"
- + defaultValue + "'.", e);
+ log.warn("Value for parameter '{}' not a long: '{}'. Using default: '{}'.", name, params.get(name),
+ defaultValue, e);
return defaultValue;
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java Wed Feb 8 12:34:32 2017
@@ -42,9 +42,9 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractListenerGui;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.ClassFinder;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The {@link BackendListenerGui} class provides the user interface for the
@@ -56,10 +56,10 @@ public class BackendListenerGui extends
/**
*
*/
- private static final long serialVersionUID = 4331668988576438604L;
+ private static final long serialVersionUID = 1L;
/** Logging */
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BackendListenerGui.class);
/** A combo box allowing the user to choose a backend class. */
private JComboBox<String> classnameCombo;
@@ -123,7 +123,7 @@ public class BackendListenerGui extends
possibleClasses.remove(BackendListener.class.getName() + "$ErrorBackendListenerClient");
} catch (Exception e) {
- LOGGER.debug("Exception getting interfaces.", e);
+ log.debug("Exception getting interfaces.", e);
}
JLabel label = new JLabel(JMeterUtils.getResString("backend_listener_classname")); // $NON-NLS-1$
@@ -175,9 +175,9 @@ public class BackendListenerGui extends
try {
testParams = client.getDefaultParameters();
} catch (AbstractMethodError e) {
- LOGGER.warn("BackendListenerClient doesn't implement "
+ log.warn("BackendListenerClient doesn't implement "
+ "getDefaultParameters. Default parameters won't "
- + "be shown. Please update your client class: " + className);
+ + "be shown. Please update your client class: {}", className);
}
if (testParams != null) {
@@ -202,7 +202,7 @@ public class BackendListenerGui extends
argsPanel.configure(newArgs);
} catch (Exception e) {
- LOGGER.error("Error getting argument list for " + className, e);
+ log.error("Error getting argument list for {}", className, e);
}
}
}
@@ -229,8 +229,9 @@ public class BackendListenerGui extends
if(checkContainsClassName(classnameCombo.getModel(), className)) {
classnameCombo.setSelectedItem(className);
} else {
- LOGGER.error("Error setting class:'"+className+"' in BackendListener: "+getName()+
- ", check for a missing jar in your jmeter 'search_paths' and 'plugin_dependency_paths' properties");
+ log.error(
+ "Error setting class: '{}' in BackendListener: {}, check for a missing jar in your jmeter 'search_paths' and 'plugin_dependency_paths' properties",
+ className, getName());
}
queueSize.setText(((BackendListener)config).getQueueSize());
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java Wed Feb 8 12:34:32 2017
@@ -40,8 +40,8 @@ import org.apache.jmeter.visualizers.bac
import org.apache.jmeter.visualizers.backend.BackendListenerContext;
import org.apache.jmeter.visualizers.backend.SamplerMetric;
import org.apache.jmeter.visualizers.backend.UserMetric;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Graphite based Listener using Pickle Protocol
@@ -67,7 +67,7 @@ public class GraphiteBackendListenerClie
private static final String TEST_CONTEXT_NAME = "test";
private static final String ALL_CONTEXT_NAME = "all";
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(GraphiteBackendListenerClient.class);
private static final String DEFAULT_METRICS_PREFIX = "jmeter."; //$NON-NLS-1$
private static final String CUMULATED_METRICS = "__cumulated__"; //$NON-NLS-1$
// User Metrics
@@ -294,7 +294,7 @@ public class GraphiteBackendListenerClie
percentileValue);
} catch (Exception e) {
- LOGGER.error("Error parsing percentile:'" + percentilesString + "'", e);
+ log.error("Error parsing percentile: '{}'", percentilesString, e);
}
}
}
@@ -316,14 +316,12 @@ public class GraphiteBackendListenerClie
@Override
public void teardownTest(BackendListenerContext context) throws Exception {
boolean cancelState = timerHandle.cancel(false);
- if(LOGGER.isDebugEnabled()) {
- LOGGER.debug("Canceled state:"+cancelState);
- }
+ log.debug("Canceled state: {}", cancelState);
scheduler.shutdown();
try {
scheduler.awaitTermination(30, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- LOGGER.error("Error waiting for end of scheduler");
+ log.error("Error waiting for end of scheduler");
Thread.currentThread().interrupt();
}
// Send last set of data before ending
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java Wed Feb 8 12:34:32 2017
@@ -25,8 +25,8 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Pickle Graphite format
@@ -35,7 +35,7 @@ import org.apache.log.Logger;
* @since 2.13
*/
class PickleGraphiteMetricsSender extends AbstractGraphiteMetricsSender {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(PickleGraphiteMetricsSender.class);
/**
* Pickle opcodes needed for implementation
@@ -77,9 +77,8 @@ class PickleGraphiteMetricsSender extend
this.socketConnectionInfos = new SocketConnectionInfos(graphiteHost, graphitePort);
this.socketOutputStreamPool = createSocketOutputStreamPool();
- if(LOG.isInfoEnabled()) {
- LOG.info("Created PickleGraphiteMetricsSender with host:"+graphiteHost+", port:"+graphitePort+", prefix:"+prefix);
- }
+ log.info("Created PickleGraphiteMetricsSender with host: {}, port: {}, prefix: {}", graphiteHost, graphitePort,
+ prefix);
}
/* (non-Javadoc)
@@ -132,16 +131,17 @@ class PickleGraphiteMetricsSender extend
try {
socketOutputStreamPool.invalidateObject(socketConnectionInfos, out);
} catch (Exception e1) {
- LOG.warn("Exception invalidating socketOutputStream connected to graphite server '"+socketConnectionInfos.getHost()+"':"+socketConnectionInfos.getPort(), e1);
+ log.warn("Exception invalidating socketOutputStream connected to graphite server. '{}':{}",
+ socketConnectionInfos.getHost(), socketConnectionInfos.getPort(), e1);
}
}
- LOG.error("Error writing to Graphite:"+e.getMessage());
+ log.error("Error writing to Graphite: {}", e.getMessage());
}
// if there was an error, we might miss some data. for now, drop those on the floor and
// try to keep going.
- if(LOG.isDebugEnabled()) {
- LOG.debug("Wrote "+ copyMetrics.size() +" metrics");
+ if (log.isDebugEnabled()) {
+ log.debug("Wrote {} metrics", copyMetrics.size());
}
copyMetrics.clear();
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java Wed Feb 8 12:34:32 2017
@@ -24,15 +24,15 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* PlainText Graphite sender
* @since 2.13
*/
class TextGraphiteMetricsSender extends AbstractGraphiteMetricsSender {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(TextGraphiteMetricsSender.class);
private String prefix;
@@ -60,9 +60,8 @@ class TextGraphiteMetricsSender extends
this.socketConnectionInfos = new SocketConnectionInfos(graphiteHost, graphitePort);
this.socketOutputStreamPool = createSocketOutputStreamPool();
- if(LOG.isInfoEnabled()) {
- LOG.info("Created TextGraphiteMetricsSender with host:"+graphiteHost+", port:"+graphitePort+", prefix:"+prefix);
- }
+ log.info("Created TextGraphiteMetricsSender with host: {}, port: {}, prefix: {}", graphiteHost, graphitePort,
+ prefix);
}
/* (non-Javadoc)
@@ -107,8 +106,8 @@ class TextGraphiteMetricsSender extends
pw.flush();
// if there was an error, we might miss some data. for now, drop those on the floor and
// try to keep going.
- if(LOG.isDebugEnabled()) {
- LOG.debug("Wrote "+ copyMetrics.size() +" metrics");
+ if (log.isDebugEnabled()) {
+ log.debug("Wrote {} metrics", copyMetrics.size());
}
socketOutputStreamPool.returnObject(socketConnectionInfos, out);
} catch (Exception e) {
@@ -116,11 +115,11 @@ class TextGraphiteMetricsSender extends
try {
socketOutputStreamPool.invalidateObject(socketConnectionInfos, out);
} catch (Exception e1) {
- LOG.warn("Exception invalidating socketOutputStream connected to graphite server '"+
- socketConnectionInfos.getHost()+"':"+socketConnectionInfos.getPort(), e1);
+ log.warn("Exception invalidating socketOutputStream connected to graphite server '{}':{}",
+ socketConnectionInfos.getHost(), socketConnectionInfos.getPort(), e1);
}
}
- LOG.error("Error writing to Graphite:"+e.getMessage());
+ log.error("Error writing to Graphite: {}", e.getMessage());
}
// We drop metrics in all cases
copyMetrics.clear();
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java Wed Feb 8 12:34:32 2017
@@ -41,8 +41,8 @@ import org.apache.http.impl.nio.reactor.
import org.apache.http.impl.nio.reactor.IOReactorConfig;
import org.apache.http.nio.reactor.ConnectingIOReactor;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Influxdb sender base on The Line Protocol. The Line Protocol is a text based
@@ -54,7 +54,7 @@ import org.apache.log.Logger;
* @since 3.2
*/
class HttpMetricsSender extends AbstractInfluxdbMetricsSender {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(HttpMetricsSender.class);
private final Object lock = new Object();
@@ -124,9 +124,7 @@ class HttpMetricsSender extends Abstract
HttpPost httpRequest = new HttpPost(url.toURI());
httpRequest.setConfig(defaultRequestConfig);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Created InfluxDBMetricsSender with url:" + url);
- }
+ log.debug("Created InfluxDBMetricsSender with url: {}", url);
return httpRequest;
}
@@ -184,28 +182,26 @@ class HttpMetricsSender extends Abstract
*/
switch (code) {
case 204:
- if(LOG.isDebugEnabled()) {
- LOG.debug("Success, number of metrics written : " + copyMetrics.size());
+ if (log.isDebugEnabled()) {
+ log.debug("Success, number of metrics written: {}", copyMetrics.size());
}
break;
default:
- if(LOG.isDebugEnabled()) {
- LOG.debug("Error writing metrics to influxDB Url: "+ url+", responseCode: " + code);
- }
+ log.debug("Error writing metrics to influxDB Url: {}, responseCode: {}", url, code);
}
}
@Override
public void failed(final Exception ex) {
- LOG.error("failed to send data to influxDB server : " + ex.getMessage());
+ log.error("failed to send data to influxDB server : {}", ex.getMessage());
}
@Override
public void cancelled() {
- LOG.warn("Request to influxDB server was cancelled");
+ log.warn("Request to influxDB server was cancelled");
}
});
}catch (URISyntaxException ex ) {
- LOG.error(ex.getMessage());
+ log.error(ex.getMessage());
}
}
@@ -220,11 +216,11 @@ class HttpMetricsSender extends Abstract
@Override
public void destroy() {
// Give some time to send last metrics before shutting down
- LOG.info("Destroying ");
+ log.info("Destroying ");
try {
lastRequest.get(5, TimeUnit.SECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
- LOG.error("Error waiting for last request to be send to InfluxDB", e);
+ log.error("Error waiting for last request to be send to InfluxDB", e);
}
if(httpRequest != null) {
httpRequest.abort();
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java Wed Feb 8 12:34:32 2017
@@ -40,8 +40,8 @@ import org.apache.jmeter.visualizers.bac
import org.apache.jmeter.visualizers.backend.BackendListenerContext;
import org.apache.jmeter.visualizers.backend.SamplerMetric;
import org.apache.jmeter.visualizers.backend.UserMetric;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of {@link AbstractBackendListenerClient} to write in an InfluxDB using
@@ -50,7 +50,7 @@ import org.apache.log.Logger;
*/
public class InfluxdbBackendListenerClient extends AbstractBackendListenerClient implements Runnable {
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(InfluxdbBackendListenerClient.class);
private ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<>();
// Name of the measurement
private static final String EVENTS_FOR_ANNOTATION = "events";
@@ -289,7 +289,7 @@ public class InfluxdbBackendListenerClie
percentileValue);
} catch (Exception e) {
- LOGGER.error("Error parsing percentile:'" + percentilesStringArray[i] + "'", e);
+ log.error("Error parsing percentile: '{}'", percentilesStringArray[i], e);
}
}
}
@@ -324,21 +324,19 @@ public class InfluxdbBackendListenerClie
@Override
public void teardownTest(BackendListenerContext context) throws Exception {
boolean cancelState = timerHandle.cancel(false);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Canceled state:" + cancelState);
- }
+ log.debug("Canceled state: {}", cancelState);
scheduler.shutdown();
try {
scheduler.awaitTermination(30, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- LOGGER.error("Error waiting for end of scheduler");
+ log.error("Error waiting for end of scheduler");
Thread.currentThread().interrupt();
}
addAnnotation(false);
// Send last set of data before ending
- LOGGER.info("Sending last metrics");
+ log.info("Sending last metrics");
sendMetrics();
influxdbMetricsManager.destroy();
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java?rev=1782151&r1=1782150&r2=1782151&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java Wed Feb 8 12:34:32 2017
@@ -27,12 +27,12 @@ import java.util.Properties;
import javax.swing.JOptionPane;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Colors {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Colors.class);
private static final String ENTRY_SEP = ","; //$NON-NLS-1$
@@ -87,7 +87,7 @@ public class Colors {
Color itb = new Color(Integer.parseInt(lcol[0]), Integer.parseInt(lcol[1]), Integer.parseInt(lcol[2]));
listColors.add(itb);
} catch (java.lang.Exception e) {
- log.warn("Error in colors.properties, current property=" + property); // $NON-NLS-1$
+ log.warn("Error in colors.properties, current property={}", property); // $NON-NLS-1$
}
}
return listColors;