diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/Check.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/Check.java index 984abc12..8718d619 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/Check.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/Check.java @@ -13,7 +13,6 @@ import fr.neatmonster.nocheatplus.components.MCAccessHolder; import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager; import fr.neatmonster.nocheatplus.hooks.NCPHookManager; import fr.neatmonster.nocheatplus.logging.LogUtil; -import fr.neatmonster.nocheatplus.metrics.MetricsData; import fr.neatmonster.nocheatplus.players.DataManager; import fr.neatmonster.nocheatplus.players.ExecutionHistory; import fr.neatmonster.nocheatplus.utilities.TickTask; @@ -129,9 +128,6 @@ public abstract class Check implements MCAccessHolder{ if (NCPHookManager.shouldCancelVLProcessing(violationData)) // One of the hooks has decided to cancel the VL processing, return false. return false; - - // Add this failed check to the Metrics data (async!). - MetricsData.addFailed(violationData.check.type); final boolean hasCancel = violationData.hasCancel(); diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java index 3ccca400..357a799a 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java @@ -72,8 +72,6 @@ public abstract class ConfPaths { private static final String MISCELLANEOUS = "miscellaneous."; //public static final String MISCELLANEOUS_CHECKFORUPDATES = MISCELLANEOUS + "checkforupdates"; //public static final String MISCELLANEOUS_UPDATETIMEOUT = MISCELLANEOUS + "updatetimeout"; - public static final String MISCELLANEOUS_REPORTTOMETRICS = MISCELLANEOUS + "reporttometrics"; - /** TEMP: hidden flag to disable all lag adaption with one flag. */ public static final String MISCELLANEOUS_LAG = MISCELLANEOUS + "lag"; @@ -686,4 +684,7 @@ public abstract class ConfPaths { public static final String MISCELLANEOUS_MANAGELISTENERS = "miscellaneous.managelisteners"; @Moved(newPath = INVENTORY_OPEN_CHECK) public static final String INVENTORY_ENSURECLOSE = "inventory.ensureclose"; + @Deprecated + public static final String MISCELLANEOUS_REPORTTOMETRICS = "miscellaneous.reporttometrics"; + } diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java index 9dbaab46..2293c21e 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java @@ -73,7 +73,7 @@ public class DefaultConfig extends ConfigFile { * d888b Y8b Y8b 888 d,dP "88,e8' "YeeP" 888 888 "88 888 888 888 "YeeP" "88 88" "88 88" d,dP */ // set(ConfPaths.MISCELLANEOUS_CHECKFORUPDATES, true); - set(ConfPaths.MISCELLANEOUS_REPORTTOMETRICS, true); +// set(ConfPaths.MISCELLANEOUS_REPORTTOMETRICS, true); // set(ConfPaths.MISCELLANEOUS_NOMOVEDTOOQUICKLY_ENABLED, false); // set(ConfPaths.MISCELLANEOUS_NOMOVEDTOOQUICKLY_USEPROXY, false); diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/Metrics.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/Metrics.java deleted file mode 100644 index 70684fa7..00000000 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/Metrics.java +++ /dev/null @@ -1,18 +0,0 @@ -package fr.neatmonster.nocheatplus.metrics; - -import java.io.IOException; - -import org.bukkit.plugin.Plugin; - -/** - * Extend modified Metrics class, might one day route to multiple backends. - * @author mc_dev - * - */ -public class Metrics extends fr.neatmonster.nocheatplus.metrics.org.mcstats.Metrics{ - - public Metrics(Plugin plugin) throws IOException { - super(plugin); - } - -} \ No newline at end of file diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/MetricsData.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/MetricsData.java deleted file mode 100644 index a1e4a40a..00000000 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/MetricsData.java +++ /dev/null @@ -1,101 +0,0 @@ -package fr.neatmonster.nocheatplus.metrics; - -import java.util.HashMap; -import java.util.Map; - -import fr.neatmonster.nocheatplus.checks.CheckType; -import fr.neatmonster.nocheatplus.hooks.APIUtils; - -/* - * M"""""`'"""`YM dP oo M""""""'YMM dP - * M mm. mm. M 88 M mmmm. `M 88 - * M MMM MMM M .d8888b. d8888P 88d888b. dP .d8888b. .d8888b. M MMMMM M .d8888b. d8888P .d8888b. - * M MMM MMM M 88ooood8 88 88' `88 88 88' `"" Y8ooooo. M MMMMM M 88' `88 88 88' `88 - * M MMM MMM M 88. ... 88 88 88 88. ... 88 M MMMM' .M 88. .88 88 88. .88 - * M MMM MMM M `88888P' dP dP dP `88888P' `88888P' M .MM `88888P8 dP `88888P8 - * MMMMMMMMMMMMMM MMMMMMMMMMM - */ -/** - * This class is used to store the data that will be sent to Metrics later. - */ -public class MetricsData { - - /** Is data collecting enabled? */ - private static boolean enabled = false; - - /** The map containing the number of fails per check. */ - private static final Map checksFailed = new HashMap(); - - /** The map containing the number of seconds per number of ticks this seconds contain. */ - private static final Map ticksNumbers = new HashMap(); - - /** - * Adds a failed check to the specified check type. - * - * @param type - * the check type - */ - public static void addFailed(final CheckType type) { - if (enabled && type.getParent() != null){ - if (APIUtils.needsSynchronization(type)){ - // (Synchronization prevents the rare case of adding up without ever resetting, in effect). - synchronized (checksFailed) { - checksFailed.put(type, checksFailed.get(type) + 1); - } - } - else checksFailed.put(type, checksFailed.get(type) + 1); - } - } - - /** - * Adds a seconds to the number of ticks it has contained. - * - * @param ticks - * the ticks number - */ - public static void addTicks(final int ticks) { - if (enabled) - ticksNumbers.put(ticks, ticksNumbers.get(ticks) + 1); - } - - /** - * Gets the number of failed checks for the specified check type. - * - * @param type - * the check type - * @return the failed - */ - public static int getFailed(final CheckType type) { - final int failed = checksFailed.get(type); - checksFailed.put(type, 0); - return failed; - } - - /** - * Gets the number of seconds which have contained the specified number of ticks. - * - * @param ticks - * the ticks number - * @return the ticks - */ - public static int getTicks(final int ticks) { - final int number = ticksNumbers.get(ticks); - ticksNumbers.put(ticks, 0); - return number; - } - - /** - * Initialize the class. - */ - public static void initialize() { - // (Synchronization prevents the rare case of adding up without ever resetting, in effect). - synchronized (checksFailed) { - enabled = true; - for (final CheckType type : CheckType.values()) - if (type.getParent() != null) - checksFailed.put(type, 0); - for (int ticks = 0; ticks < 21; ticks++) - ticksNumbers.put(ticks, 0); - } - } -} diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/org/mcstats/Metrics.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/org/mcstats/Metrics.java deleted file mode 100644 index ddd1606d..00000000 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/metrics/org/mcstats/Metrics.java +++ /dev/null @@ -1,803 +0,0 @@ -/* - * Copyright 2011-2013 Tyler Blair. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and contributors and should not be interpreted as representing official policies, - * either expressed or implied, of anybody else. - */ -package fr.neatmonster.nocheatplus.metrics.org.mcstats; - -import org.bukkit.Bukkit; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.scheduler.BukkitTask; - -import fr.neatmonster.nocheatplus.config.ConfPaths; -import fr.neatmonster.nocheatplus.config.ConfigManager; -import fr.neatmonster.nocheatplus.logging.LogUtil; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.Proxy; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; -import java.util.logging.Level; -import java.util.zip.GZIPOutputStream; - -/** - * Few modifications for NoCheatPlus: - *
  • Cancel the task on start(), just in case.
    • - *
  • Do not post plugin if task is null.
    • - *
  • Set task to null, if not scheduled successfully.
    • - *
  • Add method to cancel the task without setting opt-out.
    • - *
  • Add try-catch-finally for closing streams.
    • - * - */ -public class Metrics { - - /** - * The current revision number - */ - private final static int REVISION = 7; - - /** - * The base url of the metrics domain - */ - private static final String BASE_URL = "http://report.mcstats.org"; - - /** - * The url used to report a server's status - */ - private static final String REPORT_URL = "/plugin/%s"; - - /** - * Interval of time to ping (in minutes) - */ - private static final int PING_INTERVAL = 15; - - /** - * The plugin this metrics submits for - */ - private final Plugin plugin; - - /** - * All of the custom graphs to submit to metrics - */ - private final Set graphs = Collections.synchronizedSet(new HashSet()); - - /** - * The plugin configuration file - */ - private final YamlConfiguration configuration; - - /** - * The plugin configuration file - */ - private final File configurationFile; - - /** - * Unique server id - */ - private final String guid; - - /** - * Debug mode - */ - private final boolean debug; - - /** - * Lock for synchronization - */ - private final Object optOutLock = new Object(); - - /** - * The scheduled task - */ - private volatile BukkitTask task = null; - - public Metrics(final Plugin plugin) throws IOException { - if (plugin == null) { - throw new IllegalArgumentException("Plugin cannot be null"); - } - - this.plugin = plugin; - - // load the config - configurationFile = getConfigFile(); - configuration = YamlConfiguration.loadConfiguration(configurationFile); - - // add some defaults - configuration.addDefault("opt-out", false); - configuration.addDefault("guid", UUID.randomUUID().toString()); - configuration.addDefault("debug", false); - - // Do we need to create the file? - if (configuration.get("guid", null) == null) { - configuration.options().header("http://mcstats.org").copyDefaults(true); - configuration.save(configurationFile); - } - - // Load the guid then - guid = configuration.getString("guid"); - debug = configuration.getBoolean("debug", false); - } - - /** - * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics - * website. Plotters can be added to the graph object returned. - * - * @param name The name of the graph - * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given - */ - public Graph createGraph(final String name) { - if (name == null) { - throw new IllegalArgumentException("Graph name cannot be null"); - } - - // Construct the graph object - final Graph graph = new Graph(name); - - // Now we can add our graph - graphs.add(graph); - - // and return back - return graph; - } - - /** - * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend - * - * @param graph The name of the graph - */ - public void addGraph(final Graph graph) { - if (graph == null) { - throw new IllegalArgumentException("Graph cannot be null"); - } - - graphs.add(graph); - } - - /** - * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the - * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200 - * ticks. - * - * @return True if statistics measuring is running, otherwise false. - */ - public boolean start() { - cancel(); // NCP: Ensure no task is running. - synchronized (optOutLock) { - // Did we opt out? - if (isOptOut()) { - return false; - } - - // Is metrics already running? - if (task != null) { - return true; - } - - // Begin hitting the server with glorious data - task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() { - - private boolean firstPost = true; - - public void run() { - try { - // This has to be synchronized or it can collide with the disable method. - synchronized (optOutLock) { - // Disable Task, if it is running and the server owner decided to opt-out - if (isOptOut() || task == null){ // NCP: && task != null) { - task.cancel(); - task = null; - // Tell all plotters to stop gathering information. - for (Graph graph : graphs) { - graph.onOptOut(); - } - return; // NCP: Add return. - } - } - - // We use the inverse of firstPost because if it is the first time we are posting, - // it is not a interval ping, so it evaluates to FALSE - // Each time thereafter it will evaluate to TRUE, i.e PING! - postPlugin(!firstPost); - - // After the first post we set firstPost to false - // Each post thereafter will be a ping - firstPost = false; - } catch (IOException e) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage()); - } - } - } - }, 0, PING_INTERVAL * 1200); - if (task == null || task.getTaskId() == -1){ - // NCP: Just in case. - task = null; - return false; - } - return true; - } - } - - /** - * Has the server owner denied plugin metrics? - * - * @return true if metrics should be opted out of it - */ - public boolean isOptOut() { - synchronized (optOutLock) { - try { - // Reload the metrics file - configuration.load(getConfigFile()); - } catch (IOException ex) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); - } - return true; - } catch (InvalidConfigurationException ex) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); - } - return true; - } - return configuration.getBoolean("opt-out", false); - } - } - - /** - * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task. - * - * @throws java.io.IOException - */ - public void enable() throws IOException { - // This has to be synchronized or it can collide with the check in the task. - synchronized (optOutLock) { - // Check if the server owner has already set opt-out, if not, set it. - if (isOptOut()) { - configuration.set("opt-out", false); - configuration.save(configurationFile); - } - - // Enable Task, if it is not running - if (task == null) { - start(); - } - } - } - - /** - * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task. - * - * @throws java.io.IOException - */ - public void disable() throws IOException { - // This has to be synchronized or it can collide with the check in the task. - synchronized (optOutLock) { - // Check if the server owner has already set opt-out, if not, set it. - if (!isOptOut()) { - configuration.set("opt-out", true); - configuration.save(configurationFile); - } - - // Disable Task, if it is running - if (task != null) { - task.cancel(); - task = null; - } - } - } - - /** - * NCP: Just cancel the task, not setting opt-out. - */ - public void cancel(){ - synchronized (optOutLock) { - if (task != null){ - task.cancel(); - task = null; - } - } - } - - /** - * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status - * - * @return the File object for the config file - */ - public File getConfigFile() { - // I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use - // is to abuse the plugin object we already have - // plugin.getDataFolder() => base/plugins/PluginA/ - // pluginsFolder => base/plugins/ - // The base is not necessarily relative to the startup directory. - File pluginsFolder = plugin.getDataFolder().getParentFile(); - - // return => base/plugins/PluginMetrics/config.yml - return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml"); - } - - /** - * Generic method that posts a plugin to the metrics website - */ - private void postPlugin(final boolean isPing) throws IOException { - // Server software specific section - PluginDescriptionFile description = plugin.getDescription(); - String pluginName = description.getName(); - boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled - String pluginVersion = description.getVersion(); - String serverVersion = Bukkit.getVersion(); - int playersOnline = Bukkit.getServer().getOnlinePlayers().length; - - // END server software specific section -- all code below does not use any code outside of this class / Java - - // Construct the post data - StringBuilder json = new StringBuilder(1024); - json.append('{'); - - // The plugin's description file containg all of the plugin data such as name, version, author, etc - appendJSONPair(json, "guid", guid); - appendJSONPair(json, "plugin_version", pluginVersion); - appendJSONPair(json, "server_version", serverVersion); - appendJSONPair(json, "players_online", Integer.toString(playersOnline)); - - // New data as of R6 - String osname = System.getProperty("os.name"); - String osarch = System.getProperty("os.arch"); - String osversion = System.getProperty("os.version"); - String java_version = System.getProperty("java.version"); - int coreCount = Runtime.getRuntime().availableProcessors(); - - // normalize os arch .. amd64 -> x86_64 - if (osarch.equals("amd64")) { - osarch = "x86_64"; - } - - appendJSONPair(json, "osname", osname); - appendJSONPair(json, "osarch", osarch); - appendJSONPair(json, "osversion", osversion); - appendJSONPair(json, "cores", Integer.toString(coreCount)); - appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0"); - appendJSONPair(json, "java_version", java_version); - - // If we're pinging, append it - if (isPing) { - appendJSONPair(json, "ping", "1"); - } - - if (graphs.size() > 0) { - synchronized (graphs) { - json.append(','); - json.append('"'); - json.append("graphs"); - json.append('"'); - json.append(':'); - json.append('{'); - - boolean firstGraph = true; - - final Iterator iter = graphs.iterator(); - - while (iter.hasNext()) { - Graph graph = iter.next(); - - StringBuilder graphJson = new StringBuilder(); - graphJson.append('{'); - - for (Plotter plotter : graph.getPlotters()) { - appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue())); - } - - graphJson.append('}'); - - if (!firstGraph) { - json.append(','); - } - - json.append(escapeJSON(graph.getName())); - json.append(':'); - json.append(graphJson); - - firstGraph = false; - } - - json.append('}'); - } - } - - // close json - json.append('}'); - - // Create the url - URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName))); - - // Connect to the website - URLConnection connection; - - // Mineshafter creates a socks proxy, so we can safely bypass it - // It does not reroute POST requests so we need to go around it - if (isMineshafterPresent()) { - connection = url.openConnection(Proxy.NO_PROXY); - } else { - connection = url.openConnection(); - } - - - byte[] uncompressed = json.toString().getBytes(); - byte[] compressed = gzip(json.toString()); - - // Headers - connection.addRequestProperty("User-Agent", "MCStats/" + REVISION); - connection.addRequestProperty("Content-Type", "application/json"); - connection.addRequestProperty("Content-Encoding", "gzip"); - connection.addRequestProperty("Content-Length", Integer.toString(compressed.length)); - connection.addRequestProperty("Accept", "application/json"); - connection.addRequestProperty("Connection", "close"); - - connection.setDoOutput(true); - - if (debug) { - System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length); - } - - // NCP: try-catch-finally for streams. - OutputStream os = null; - BufferedReader reader = null; - String response = null; - try{ - // Write the data - os = connection.getOutputStream(); - os.write(compressed); - os.flush(); - - // Now read the response - reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); - response = reader.readLine(); - } - catch (IOException e){ - response = "ERR (" + e.getClass().getSimpleName() + "): " + e.getMessage(); - } - finally{ - // close resources - if (os != null) try{os.close();} catch (IOException e){}; - if (reader != null) try{reader.close();} catch (IOException e){}; - - } - - if (response == null || response.startsWith("ERR") || response.startsWith("7")) { - if (response == null) { - response = "null"; - } else if (response.startsWith("7")) { - response = response.substring(response.startsWith("7,") ? 2 : 1); - } - if (debug || ConfigManager.getConfigFile().getBoolean(ConfPaths.LOGGING_DEBUG)) { // NCP: Log response. - LogUtil.scheduleLogWarning("[NoCheatPlus] Metrics error: " + response); - } - throw new IOException(response); - } else { - // Is this the first update this hour? - if (response.equals("1") || response.contains("This is your first update this hour")) { - synchronized (graphs) { - final Iterator iter = graphs.iterator(); - - while (iter.hasNext()) { - final Graph graph = iter.next(); - - for (Plotter plotter : graph.getPlotters()) { - plotter.reset(); - } - } - } - } - } - } - - /** - * GZip compress a string of bytes - * - * @param input - * @return - */ - public static byte[] gzip(String input) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gzos = null; - - try { - gzos = new GZIPOutputStream(baos); - gzos.write(input.getBytes("UTF-8")); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (gzos != null) try { - gzos.close(); - } catch (IOException ignore) { - } - } - - return baos.toByteArray(); - } - - /** - * Check if mineshafter is present. If it is, we need to bypass it to send POST requests - * - * @return true if mineshafter is installed on the server - */ - private boolean isMineshafterPresent() { - try { - Class.forName("mineshafter.MineServer"); - return true; - } catch (Exception e) { - return false; - } - } - - /** - * Appends a json encoded key/value pair to the given string builder. - * - * @param json - * @param key - * @param value - * @throws UnsupportedEncodingException - */ - private static void appendJSONPair(StringBuilder json, String key, String value) throws UnsupportedEncodingException { - boolean isValueNumeric = false; - - try { - if (value.equals("0") || !value.endsWith("0")) { - Double.parseDouble(value); - isValueNumeric = true; - } - } catch (NumberFormatException e) { - isValueNumeric = false; - } - - if (json.charAt(json.length() - 1) != '{') { - json.append(','); - } - - json.append(escapeJSON(key)); - json.append(':'); - - if (isValueNumeric) { - json.append(value); - } else { - json.append(escapeJSON(value)); - } - } - - /** - * Escape a string to create a valid JSON string - * - * @param text - * @return - */ - private static String escapeJSON(String text) { - StringBuilder builder = new StringBuilder(); - - builder.append('"'); - for (int index = 0; index < text.length(); index++) { - char chr = text.charAt(index); - - switch (chr) { - case '"': - case '\\': - builder.append('\\'); - builder.append(chr); - break; - case '\b': - builder.append("\\b"); - break; - case '\t': - builder.append("\\t"); - break; - case '\n': - builder.append("\\n"); - break; - case '\r': - builder.append("\\r"); - break; - default: - if (chr < ' ') { - String t = "000" + Integer.toHexString(chr); - builder.append("\\u" + t.substring(t.length() - 4)); - } else { - builder.append(chr); - } - break; - } - } - builder.append('"'); - - return builder.toString(); - } - - /** - * Encode text as UTF-8 - * - * @param text the text to encode - * @return the encoded text, as UTF-8 - */ - private static String urlEncode(final String text) throws UnsupportedEncodingException { - return URLEncoder.encode(text, "UTF-8"); - } - - /** - * Represents a custom graph on the website - */ - public static class Graph { - - /** - * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is - * rejected - */ - private final String name; - - /** - * The set of plotters that are contained within this graph - */ - private final Set plotters = new LinkedHashSet(); - - private Graph(final String name) { - this.name = name; - } - - /** - * Gets the graph's name - * - * @return the Graph's name - */ - public String getName() { - return name; - } - - /** - * Add a plotter to the graph, which will be used to plot entries - * - * @param plotter the plotter to add to the graph - */ - public void addPlotter(final Plotter plotter) { - plotters.add(plotter); - } - - /** - * Remove a plotter from the graph - * - * @param plotter the plotter to remove from the graph - */ - public void removePlotter(final Plotter plotter) { - plotters.remove(plotter); - } - - /** - * Gets an unmodifiable set of the plotter objects in the graph - * - * @return an unmodifiable {@link java.util.Set} of the plotter objects - */ - public Set getPlotters() { - return Collections.unmodifiableSet(plotters); - } - - @Override - public int hashCode() { - return name.hashCode(); - } - - @Override - public boolean equals(final Object object) { - if (!(object instanceof Graph)) { - return false; - } - - final Graph graph = (Graph) object; - return graph.name.equals(name); - } - - /** - * Called when the server owner decides to opt-out of BukkitMetrics while the server is running. - */ - protected void onOptOut() { - } - } - - /** - * Interface used to collect custom data for a plugin - */ - public static abstract class Plotter { - - /** - * The plot's name - */ - private final String name; - - /** - * Construct a plotter with the default plot name - */ - public Plotter() { - this("Default"); - } - - /** - * Construct a plotter with a specific plot name - * - * @param name the name of the plotter to use, which will show up on the website - */ - public Plotter(final String name) { - this.name = name; - } - - /** - * Get the current value for the plotted point. Since this function defers to an external function it may or may - * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called - * from any thread so care should be taken when accessing resources that need to be synchronized. - * - * @return the current value for the point to be plotted. - */ - public abstract int getValue(); - - /** - * Get the column name for the plotted point - * - * @return the plotted point's column name - */ - public String getColumnName() { - return name; - } - - /** - * Called after the website graphs have been updated - */ - public void reset() { - } - - @Override - public int hashCode() { - return getColumnName().hashCode(); - } - - @Override - public boolean equals(final Object object) { - if (!(object instanceof Plotter)) { - return false; - } - - final Plotter plotter = (Plotter) object; - return plotter.name.equals(name) && plotter.getValue() == getValue(); - } - } -} \ No newline at end of file diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/TickTask.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/TickTask.java index 86b0a0a6..de5637fc 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/TickTask.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/TickTask.java @@ -16,7 +16,6 @@ import fr.neatmonster.nocheatplus.checks.ViolationData; import fr.neatmonster.nocheatplus.checks.access.ICheckData; import fr.neatmonster.nocheatplus.components.TickListener; import fr.neatmonster.nocheatplus.logging.LogUtil; -import fr.neatmonster.nocheatplus.metrics.MetricsData; import fr.neatmonster.nocheatplus.players.DataManager; /** @@ -474,12 +473,6 @@ public class TickTask implements Runnable { updatePermissions(); // Listeners. notifyListeners(); - // Metrics - if (tick > 0 && (tick % 20) == 0){ - // Count every second. - final int ticks = Math.min(20, (int) Math.round((1000f / (50f * getLag(1000, true))))); - MetricsData.addTicks(ticks); - } // Measure time after heavy stuff. final long time = System.currentTimeMillis(); diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java index 7e008a36..a2967466 100644 --- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java +++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java @@ -34,7 +34,6 @@ import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitScheduler; -import fr.neatmonster.nocheatplus.checks.CheckType; import fr.neatmonster.nocheatplus.checks.blockbreak.BlockBreakListener; import fr.neatmonster.nocheatplus.checks.blockinteract.BlockInteractListener; import fr.neatmonster.nocheatplus.checks.blockplace.BlockPlaceListener; @@ -71,10 +70,6 @@ import fr.neatmonster.nocheatplus.event.ListenerManager; import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager; import fr.neatmonster.nocheatplus.logging.LogUtil; import fr.neatmonster.nocheatplus.logging.StaticLogFile; -import fr.neatmonster.nocheatplus.metrics.Metrics; -import fr.neatmonster.nocheatplus.metrics.MetricsData; -import fr.neatmonster.nocheatplus.metrics.org.mcstats.Metrics.Graph; -import fr.neatmonster.nocheatplus.metrics.org.mcstats.Metrics.Plotter; import fr.neatmonster.nocheatplus.permissions.PermissionUtil; import fr.neatmonster.nocheatplus.permissions.PermissionUtil.CommandProtectionEntry; import fr.neatmonster.nocheatplus.permissions.Permissions; @@ -140,8 +135,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI { protected final DataManager dataMan = new DataManager(); private int dataManTaskId = -1; - - protected Metrics metrics = null; /** * Commands that were changed for protecting them against tab complete or @@ -572,13 +565,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI { TickTask.cancel(); TickTask.removeAllTickListeners(); // (Keep the tick task locked!) - - // Stop metrics task. - if (metrics != null){ - if (verbose) LogUtil.logInfo("[NoCheatPlus] Stop Metrics..."); - metrics.cancel(); - metrics = null; - } // Stop consistency checking task. if (consistencyCheckerTaskId != -1){ @@ -829,9 +815,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI { // Set up consistency checking. scheduleConsistencyCheckers(); - - // Setup the graphs, plotters and start Metrics. - setMetrics(); // if (config.getBoolean(ConfPaths.MISCELLANEOUS_CHECKFORUPDATES)){ // // Is a new update available? @@ -904,64 +887,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI { // TODO: if (online.lenght > 0) LogUtils.logInfo("[NCP] Updated " + online.length + "players (post-enable).") LogUtil.logInfo("[NoCheatPlus] Post-enable finished."); } - - /** - * Start or cancel metrics according to settings. - */ - private void setMetrics() { - final ConfigFile config = ConfigManager.getConfigFile(); - if (config.getBoolean(ConfPaths.MISCELLANEOUS_REPORTTOMETRICS)) { - if (metrics != null){ - // Assume reload during runtime, ignore. - return; - } - else{ - // Really start metrics. - startMetrics(); - } - } - else{ - // Stop metrics, if present. - if (metrics != null){ - metrics.cancel(); - metrics = null; - } - } - } - - private void startMetrics() { - MetricsData.initialize(); - try { - this.metrics = new Metrics(this); - final Graph checksFailed = metrics.createGraph("Checks Failed"); - for (final CheckType type : CheckType.values()) - if (type.getParent() != null) - checksFailed.addPlotter(new Plotter(type.name()) { - @Override - public int getValue() { - return MetricsData.getFailed(type); - } - }); - final Graph serverTicks = metrics.createGraph("Server Ticks"); - for (int i = 0; i <= 20; i++){ - final int ticks = i; - serverTicks.addPlotter(new Plotter(ticks + " tick(s)") { - @Override - public int getValue() { - return MetricsData.getTicks(ticks); - } - }); - } - metrics.start(); - } catch (final Exception e) { - LogUtil.logWarning("[NoCheatPlus] Failed to initialize metrics:"); - LogUtil.logWarning(e); - if (metrics != null){ - metrics.cancel(); - metrics = null; - } - } - } /** * Empties and registers the subComponentHolders list. @@ -995,8 +920,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI { scheduleConsistencyCheckers(); // Cache some things. useSubscriptions = config.getBoolean(ConfPaths.LOGGING_BACKEND_INGAMECHAT_SUBSCRIPTIONS); - - setMetrics(); } @Override