Remove support for text based API support log(#2975)

gocd · Dec 12, 2016 · f2ac6b1 · f2ac6b1
1 parent 40abe40
commit f2ac6b1
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 364 deletions.
diff --git a/server/src/com/thoughtworks/go/server/service/support/AbstractMemoryInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/AbstractMemoryInformationProvider.java
@@ -29,13 +29,4 @@ Map<String, Object> formatInJson(MemoryUsage heapMemoryUsage) {
         json.put("max", heapMemoryUsage.getMax());
         return json;
     }
-
-    String format(MemoryUsage memoryUsage) {
-        long init = memoryUsage.getInit();
-        long used = memoryUsage.getUsed();
-        long committed = memoryUsage.getCommitted();
-        long max = memoryUsage.getMax();
-
-        return String.format("  init:      %s\n  used:      %s\n  committed: %s\n  max:       %s\n", init, used, committed, max);
-    }
 }
diff --git a/server/src/com/thoughtworks/go/server/service/support/CacheInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/CacheInformationProvider.java
@@ -42,14 +42,6 @@ public double priority() {
         return 5.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder infoCollector) {
-        infoCollector.addSection("Cache information");
-
-        appendCacheConfigurationInformation(infoCollector, goCache);
-        appendLiveCacheStatisticsInformation(infoCollector, goCache);
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();
@@ -63,31 +55,6 @@ public String name() {
         return "Cache Information";
     }
 
-    private void appendCacheConfigurationInformation(InformationStringBuilder infoCollector, GoCache cache) {
-        CacheConfiguration configuration = cache.configuration();
-
-        infoCollector.addSubSection("Cache configuration information");
-        infoCollector.append(reflectionToString(configuration, ToStringStyle.MULTI_LINE_STYLE)).append("\n");
-    }
-
-    private void appendLiveCacheStatisticsInformation(InformationStringBuilder infoCollector, GoCache cache) {
-        LiveCacheStatistics statistics = cache.statistics();
-
-        infoCollector.addSubSection("Cache runtime information");
-        infoCollector.append(String.format("Statistics enabled? %s\n", statistics.isStatisticsEnabled()));
-        infoCollector.append(String.format("Average get time in milliseconds: %s [Min: %s, Max: %s]\n", statistics.getAverageGetTimeMillis(),
-                statistics.getMinGetTimeMillis(), statistics.getMaxGetTimeMillis()));
-        infoCollector.append(String.format("Cache size: %s (Accuracy: %s)\n", statistics.getSize(), statistics.getStatisticsAccuracyDescription()));
-        infoCollector.append(String.format("Cache counts: [Hits: %s, Miss: %s, Expired: %s, Eviction: %s, Put: %s, Remove: %s]\n\n",
-                statistics.getCacheHitCount(), statistics.getCacheMissCount(), statistics.getExpiredCount(), statistics.getEvictedCount(),
-                statistics.getPutCount(), statistics.getRemovedCount()));
-
-        infoCollector.append(String.format("Cache size (in-memory): %s\n", statistics.getInMemorySize()));
-        infoCollector.append(String.format("Cache hit count (in-memory): %s\n", statistics.getInMemoryHitCount()));
-        infoCollector.append(String.format("Cache size (disk): %s\n", statistics.getOnDiskSize()));
-        infoCollector.append(String.format("Cache hit count (disk): %s\n", statistics.getOnDiskHitCount()));
-    }
-
     public Map<String, Object> getCacheRuntimeInformationAsJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();
         LiveCacheStatistics statistics = goCache.statistics();

diff --git a/server/src/com/thoughtworks/go/server/service/support/ConfigInfoProvider.java b/server/src/com/thoughtworks/go/server/service/support/ConfigInfoProvider.java
@@ -40,29 +40,6 @@ public double priority() {
         return 1.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder infoCollector) {
-        infoCollector.addSection("Config Statistics");
-        GoConfigValidity goConfigValidity = service.checkConfigFileValid();
-        if (!goConfigValidity.isValid()) {
-            infoCollector.append(String.format("Config is invalid. Reason: %s", goConfigValidity.errorMessage()));
-        } else {
-            infoCollector.append("Valid Config.\n");
-        }
-        infoCollector.append("Number of pipelines: ").append(service.getAllPipelineConfigs().size())
-                .append("\n").append("Number of agents: ").append(service.agents().size()).append("\n");
-
-        CruiseConfig currentConfig = service.getCurrentConfig();
-        infoCollector.append(String.format("Number of environments: %s\n", currentConfig.getEnvironments().size()));
-        infoCollector.append(String.format("Number of unique materials: %s\n", currentConfig.getAllUniqueMaterials().size()));
-        infoCollector.append(String.format("Number of schedulable materials: %s\n", service.getSchedulableMaterials().size()));
-
-        boolean ldapEnabled = service.security().ldapConfig().isEnabled();
-        boolean passwordEnabled = service.security().passwordFileConfig().isEnabled();
-
-        infoCollector.append(String.format("Security:\nLDAP: %s, Password: %s\n", ldapEnabled, passwordEnabled));
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();

diff --git a/server/src/com/thoughtworks/go/server/service/support/ConfigRepositoryProvider.java b/server/src/com/thoughtworks/go/server/service/support/ConfigRepositoryProvider.java
@@ -41,19 +41,6 @@ public double priority() {
         return 6.5;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder infoCollector) {
-        infoCollector.addSection(name());
-        try {
-            infoCollector.append("Number of commits :" + configRepository.commitCountOnMaster()).append("\n");
-
-            infoCollector.addSubSection("GC Statistics");
-            infoCollector.append(configRepository.getStatistics().toString());
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();

diff --git a/server/src/com/thoughtworks/go/server/service/support/FileLocationProvider.java b/server/src/com/thoughtworks/go/server/service/support/FileLocationProvider.java
@@ -41,13 +41,6 @@ public double priority() {
         return 2.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder infoCollector) {
-        infoCollector.addSection("Config file locations");
-        infoCollector.append("loc.config.dir: ").append(systemEnvironment.configDir().getAbsolutePath()).append("\n");
-        populateLogFileInfo(infoCollector);
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();
@@ -84,32 +77,6 @@ public String name() {
         return "Config file locations";
     }
 
-    private void populateLogFileInfo(InformationStringBuilder infoCollector) {
-        List<Logger> loggers = new ArrayList<>();
-        Logger rootLogger = Logger.getRootLogger();
-        loggers.add(rootLogger);
-        Enumeration currentLoggers = rootLogger.getLoggerRepository().getCurrentLoggers();
-        while (currentLoggers.hasMoreElements()) {
-            loggers.add((Logger) currentLoggers.nextElement());
-        }
-
-        int index = 0;
-        for (Logger logger : loggers) {
-            Enumeration appenders = logger.getAllAppenders();
-            while (appenders.hasMoreElements()) {
-                Appender appender = (Appender) appenders.nextElement();
-                if (!isFileAppender(appender)) {
-                    continue;
-                }
-                FileAppender fileAppender = (FileAppender) appender;
-                File logFile = new File(fileAppender.getFile());
-                infoCollector.append("loc.log.root.").append(index).append(": ").append(new File(logFile.getAbsolutePath()).getParent()).append("\n");
-                infoCollector.append("loc.log.basename.").append(index).append(": ").append(logFile.getName()).append("\n");
-                ++index;
-            }
-        }
-    }
-
     private boolean isFileAppender(Appender appender) {
         return appender instanceof FileAppender;
     }

diff --git a/server/src/com/thoughtworks/go/server/service/support/GCInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/GCInformationProvider.java
@@ -32,15 +32,6 @@ public double priority() {
         return 8.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder builder) {
-        List<GarbageCollectorMXBean> garbageCollectorMXBeans = ManagementFactory.getGarbageCollectorMXBeans();
-        builder.addSection("GC information");
-        for (GarbageCollectorMXBean gcBean : garbageCollectorMXBeans) {
-            builder.append(String.format("%s %s %s : %s (Count : Time)\n", gcBean.getName(), Arrays.toString(gcBean.getMemoryPoolNames()), gcBean.getCollectionCount(), gcBean.getCollectionTime()));
-        }
-    }
-
     @Override
     public Map<String, Object> asJson() {
         List<GarbageCollectorMXBean> garbageCollectorMXBeans = ManagementFactory.getGarbageCollectorMXBeans();

diff --git a/server/src/com/thoughtworks/go/server/service/support/HibernateInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/HibernateInformationProvider.java
@@ -40,13 +40,6 @@ public double priority() {
         return 7.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder builder) {
-        builder.addSection(name());
-        Statistics statistics = sessionFactory.getStatistics();
-        builder.append(statistics);
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();

diff --git a/server/src/com/thoughtworks/go/server/service/support/InformationStringBuilder.java b/server/src/com/thoughtworks/go/server/service/support/InformationStringBuilder.java
diff --git a/server/src/com/thoughtworks/go/server/service/support/MemoryInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/MemoryInformationProvider.java
@@ -30,15 +30,6 @@ public double priority() {
         return 9.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder builder) {
-        MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
-        builder.addSection("Memory information");
-
-        builder.append(String.format("Heap:\n%s\nNon-Heap:\n%s\nPending Finalization: %s\n", format(memoryMXBean.getHeapMemoryUsage()), format(memoryMXBean.getNonHeapMemoryUsage()),
-                memoryMXBean.getObjectPendingFinalizationCount()));
-    }
-
     @Override
     public Map<String, Object> asJson() {
         MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();

diff --git a/server/src/com/thoughtworks/go/server/service/support/MemoryPoolInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/MemoryPoolInformationProvider.java
@@ -31,16 +31,6 @@ public double priority() {
         return 10.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder builder) {
-        builder.addSection("Memory pool information");
-
-        List<MemoryPoolMXBean> memoryPoolMXBeans = ManagementFactory.getMemoryPoolMXBeans();
-        for (MemoryPoolMXBean memoryPoolMXBean : memoryPoolMXBeans) {
-            builder.append(String.format("Name: %s, Type: %s\n%s\n", memoryPoolMXBean.getName(), memoryPoolMXBean.getType(), format(memoryPoolMXBean.getUsage())));
-        }
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();

diff --git a/server/src/com/thoughtworks/go/server/service/support/OSInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/OSInformationProvider.java
@@ -30,14 +30,6 @@ public double priority() {
         return 6.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder builder) {
-        OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();
-        builder.addSection("OS information");
-        builder.append(String.format("%s, %s, %s, %s, %s\n", operatingSystemMXBean.getName(), operatingSystemMXBean.getArch(), operatingSystemMXBean.getVersion(),
-                operatingSystemMXBean.getAvailableProcessors(), operatingSystemMXBean.getSystemLoadAverage()));
-    }
-
     @Override
     public Map<String, Object> asJson() {
         OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();

diff --git a/server/src/com/thoughtworks/go/server/service/support/RuntimeInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/RuntimeInformationProvider.java
@@ -29,44 +29,6 @@ public double priority() {
         return 7.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder builder) {
-        RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
-        builder.addSection("Runtime information");
-        builder.append(String.format("Name - %s\n", runtimeMXBean.getName()));
-
-        long uptime = runtimeMXBean.getUptime();
-        long uptimeInSeconds = uptime / 1000;
-        long numberOfHours = uptimeInSeconds / (60 * 60);
-        long numberOfMinutes = (uptimeInSeconds / 60) - (numberOfHours * 60);
-        long numberOfSeconds = uptimeInSeconds % 60;
-
-        builder.append(String.format("Uptime - %s [About %s hours, %s minutes, %s seconds]\n", uptime, numberOfHours, numberOfMinutes, numberOfSeconds));
-        builder.append(String.format("Spec Name - %s\n", runtimeMXBean.getSpecName()));
-        builder.append(String.format("Spec Vendor - %s\n", runtimeMXBean.getSpecVendor()));
-        builder.append(String.format("Spec Version - %s\n", runtimeMXBean.getSpecVersion()));
-        builder.addSubSection("Input Arguments").append(asIndentedMultilineValues(runtimeMXBean.getInputArguments(), ""));
-        builder.addSubSection("System Properties").append(asIndentedMultilineValues(runtimeMXBean.getSystemProperties()));
-        builder.addSubSection("Classpath").append(prettyClassPath(runtimeMXBean.getClassPath()));
-        builder.addSubSection("Boot Classpath").append(prettyClassPath(runtimeMXBean.getBootClassPath()));
-    }
-
-    private String asIndentedMultilineValues(List<String> values, String prefix) {
-        StringBuilder builder = new StringBuilder();
-        for (String value : values) {
-            builder.append("  -> ").append(prefix).append(value).append("\n");
-        }
-        return builder.toString();
-    }
-
-    private String asIndentedMultilineValues(Map<String, String> properties) {
-        StringBuilder builder = new StringBuilder();
-        for (Map.Entry<String, String> entry : properties.entrySet()) {
-            builder.append("  -> ").append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
-        }
-        return builder.toString();
-    }
-
     private Map<String, Object> asIndentedMultilineValuesAsJson(Map<String, String> inputArguments) {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();
         for (Map.Entry<String, String> entry : inputArguments.entrySet()) {
@@ -75,11 +37,6 @@ private Map<String, Object> asIndentedMultilineValuesAsJson(Map<String, String>
         return json;
     }
 
-    private String prettyClassPath(String classPath) {
-        String[] classpathValues = classPath.split(System.getProperty("path.separator"));
-        return asIndentedMultilineValues(Arrays.asList(classpathValues), "file:");
-    }
-
     @Override
     public Map<String, Object> asJson() {
         RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();

diff --git a/server/src/com/thoughtworks/go/server/service/support/ServerBasicInfoProvider.java b/server/src/com/thoughtworks/go/server/service/support/ServerBasicInfoProvider.java
@@ -37,13 +37,6 @@ public double priority() {
         return 3.0;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder infoCollector) {
-        infoCollector.addSection("Go Server Version");
-        infoCollector.append(serverVersion.version());
-        infoCollector.append("\n");
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();

diff --git a/server/src/com/thoughtworks/go/server/service/support/ServerHealthInformationProvider.java b/server/src/com/thoughtworks/go/server/service/support/ServerHealthInformationProvider.java
@@ -46,16 +46,6 @@ public ServerHealthInformationProvider(ServerHealthService service) {
         this.service = service;
     }
 
-    @Override
-    public void appendInformation(InformationStringBuilder infoCollector) {
-        infoCollector.addSection("Server health information");
-        ServerHealthStates allLogs = service.getAllLogs();
-        infoCollector.append(String.format("Server Health Messages: [%d messages]\n", allLogs.size()));
-        for (ServerHealthState log : allLogs) {
-            infoCollector.append(String.format("%s\n", render(log.asJson())));
-        }
-    }
-
     @Override
     public Map<String, Object> asJson() {
         LinkedHashMap<String, Object> json = new LinkedHashMap<>();

diff --git a/server/src/com/thoughtworks/go/server/service/support/ServerInfoProvider.java b/server/src/com/thoughtworks/go/server/service/support/ServerInfoProvider.java
@@ -24,8 +24,7 @@
 public interface ServerInfoProvider {
     double priority();
 
-    void appendInformation(InformationStringBuilder infoCollector);
-
     Map<String, Object> asJson();
+
     String name();
 }