removed dependency on guava (#803)

replaced any methods used with apache-commons

Author: littleaj

Diff for: ApplicationInsightsInternalLogger/build.gradle

@@ -7,7 +7,6 @@ dependencies {
     testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
     testCompile group:'org.hamcrest', name:'hamcrest-library', version:'1.3'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
-    compile group: 'com.google.guava', name: 'guava', version: '20.0'
     compile group: 'commons-io', name: 'commons-io', version: '2.6'
 }
 

Diff for: ApplicationInsightsInternalLogger/src/main/java/com/microsoft/applicationinsights/internal/logger/FileLoggerOutput.java

@@ -21,13 +21,12 @@
 
 package com.microsoft.applicationinsights.internal.logger;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -88,7 +87,7 @@ private FileAndDate(File file, Date date) {
 
     public FileLoggerOutput(Map<String, String> loggerData) {
         uniquePrefix = loggerData.get(UNIQUE_LOG_FILE_PREFIX_ATTRIBUTE);
-        if (Strings.isNullOrEmpty(uniquePrefix)) {
+        if (StringUtils.isEmpty(uniquePrefix)) {
             throw new IllegalArgumentException(String.format("Unique log file prefix is not defined"));
         }
 
@@ -107,7 +106,7 @@ public FileLoggerOutput(Map<String, String> loggerData) {
     private int getRequest(Map<String, String> loggerData, String requestName, int defaultValue) {
         int requestValue = defaultValue;
         String requestValueAsString = loggerData.get(requestName);
-        if (!Strings.isNullOrEmpty(requestValueAsString)) {
+        if (StringUtils.isNotEmpty(requestValueAsString)) {
             try {
                 requestValue = Integer.valueOf(loggerData.get(requestName));
             } catch (Exception e) {
@@ -122,7 +121,7 @@ private void initialize(String baseFolderPath, int numberOfFiles, int numberOfTo
         currentLogFileIndex = 0;
         Path logFilePath;
 
-        if (Strings.isNullOrEmpty(baseFolderPath)) {
+        if (StringUtils.isEmpty(baseFolderPath)) {
             baseFolderPath = SDK_LOGS_BASE_FOLDER_PATH;
 
             // If no path is specified by user create log file directory in temp with default folder
@@ -284,7 +283,7 @@ private List<FileAndDate> getExistingLogsFromNewToOld() {
             Collection<File> oldLogs = FileUtils.listFiles(baseFolder, new String[]{LOG_FILE_SUFFIX_FOR_LISTING}, false);
             List<File> asList;
             if (!(oldLogs instanceof List)) {
-                asList = Lists.newArrayList(oldLogs);
+                asList = new ArrayList<>(oldLogs);
             } else {
                 asList = (List<File>)oldLogs;
             }

Diff for: ApplicationInsightsInternalLogger/src/main/java/com/microsoft/applicationinsights/internal/logger/InternalLogger.java

@@ -21,7 +21,7 @@
 
 package com.microsoft.applicationinsights.internal.logger;
 
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -88,7 +88,7 @@ public synchronized void initialize(String loggerOutputType, Map<String, String>
         if (!initialized) {
             try {
                 String loggerLevel = loggerData.get(LOGGER_LEVEL);
-                if (Strings.isNullOrEmpty(loggerLevel)) {
+                if (StringUtils.isEmpty(loggerLevel)) {
                     // The user didn't specify the logging level, therefore by default we set that to 'TRACE'
                     loggingLevel = LoggingLevel.TRACE;
                     setLoggerOutput(loggerOutputType, loggerData);
@@ -251,7 +251,7 @@ private void setLoggerOutput(String loggerOutputType, Map<String, String> logger
         }
 
         LoggerOutputType type = LoggerOutputType.CONSOLE;
-        if (!Strings.isNullOrEmpty(loggerOutputType)) {
+        if (StringUtils.isNotEmpty(loggerOutputType)) {
             try {
                 // If the user asked for a logger type
                 type = LoggerOutputType.valueOf(loggerOutputType.toUpperCase());

Diff for: agent/src/main/java/com/microsoft/applicationinsights/agent/internal/config/XmlAgentConfigurationBuilder.java

@@ -21,7 +21,6 @@
 
 package com.microsoft.applicationinsights.agent.internal.config;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.microsoft.applicationinsights.agent.internal.agent.ClassInstrumentationData;
 import com.microsoft.applicationinsights.agent.internal.common.StringUtils;
 import com.microsoft.applicationinsights.agent.internal.coresync.InstrumentedClassType;
@@ -60,13 +59,14 @@ final class XmlAgentConfigurationBuilder implements AgentConfigurationBuilder {
     private final static String JMX_TAG = "AgentJmx";
     private final static String MAX_STATEMENT_QUERY_LIMIT_TAG = "MaxStatementQueryLimitInMS";
 
-    @VisibleForTesting final static String AGENT_LOGGER_TAG = "AgentLogger";
-    @VisibleForTesting final static String SDK_LOGGER_TYPE_TAG = "type";
-    @VisibleForTesting final static String SDK_LOG_LEVEL_TAG = "Level";
-    @VisibleForTesting final static String SDK_LOGGER_UNIQUE_PREFIX_TAG = "UniquePrefix";
-    @VisibleForTesting final static String SDK_LOGGER_BASE_FOLDER_PATH_TAG = "BaseFolderPath";
-    @VisibleForTesting final static String SDK_LOGGER_MAX_NUMBER_OF_LOG_FILES = "NumberOfFiles";
-    @VisibleForTesting final static String SDK_LOGGER_NUMBER_OF_TOTAL_SIZE_IN_MB = "NumberOfTotalSizeInMB";
+    // visible for testing
+    final static String AGENT_LOGGER_TAG = "AgentLogger";
+    final static String SDK_LOGGER_TYPE_TAG = "type";
+    final static String SDK_LOG_LEVEL_TAG = "Level";
+    final static String SDK_LOGGER_UNIQUE_PREFIX_TAG = "UniquePrefix";
+    final static String SDK_LOGGER_BASE_FOLDER_PATH_TAG = "BaseFolderPath";
+    final static String SDK_LOGGER_MAX_NUMBER_OF_LOG_FILES = "NumberOfFiles";
+    final static String SDK_LOGGER_NUMBER_OF_TOTAL_SIZE_IN_MB = "NumberOfTotalSizeInMB";
 
     private final static long JEDIS_ARGS_THRESHOLD_IN_MS = 10000L;
     private final static String W3C_ENABLED = "W3C";

Diff for: core/build.gradle

@@ -121,7 +121,6 @@ dependencies {
     compile ([group: 'commons-io', name: 'commons-io', version: '2.6' ])
     compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
     compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'])
-    compile ([group: 'com.google.guava', name: 'guava', version: '20.0'])
     compile ([group: 'com.google.code.gson', name: 'gson', version: '2.8.2'])
     compile ([group: 'com.google.protobuf', name:'protobuf-java', version:'3.6.1'])
     compile ([group: 'io.grpc', name: 'grpc-stub', version: '1.16.1'])
@@ -174,7 +173,7 @@ whenPomConfigured = { p ->
     p.dependencies = p.dependencies.findAll { dep ->
         dep.scope == "test" || dep.artifactId != agentArtifactId && dep.artifactId != loggerArtifactId &&
                 !(dep.groupId in ['org.apache.http', 'eu.infomas', 'org.apache.commons', 'commons-io',
-                                  'com.google.guava', 'com.google.code.gson', 'org.apache.httpcomponents',
+                                  'com.google.code.gson', 'org.apache.httpcomponents',
                                   'io.grpc', 'com.google.protobuf'])
     }
 }

Diff for: web/src/main/java/com/microsoft/applicationinsights/web/internal/correlation/TraceContextCorrelation.java

@@ -1,6 +1,5 @@
 package com.microsoft.applicationinsights.web.internal.correlation;
 
-import com.google.common.base.Joiner;
 import com.microsoft.applicationinsights.TelemetryConfiguration;
 import com.microsoft.applicationinsights.internal.logger.InternalLogger;
 import com.microsoft.applicationinsights.telemetry.RequestTelemetry;
@@ -13,6 +12,8 @@
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 /**
@@ -206,7 +207,7 @@ private static Tracestate getTracestate(HttpServletRequest request, Traceparent
             List<String> tracestateList = getEnumerationAsCollection(tracestates);
             try {
                 //create tracestate from incoming header
-                tracestate = Tracestate.fromString(Joiner.on(",").join(tracestateList));
+                tracestate = Tracestate.fromString(StringUtils.join(tracestateList, ","));
                 // add appId to it if it's resolved
                 if (appId != null && !appId.isEmpty()) {
                     tracestate = new Tracestate(tracestate, AZURE_TRACEPARENT_COMPONENT_INITIAL,

Diff for: web/src/main/java/com/microsoft/applicationinsights/web/internal/correlation/tracecontext/Traceparent.java

@@ -2,7 +2,6 @@
 
 import java.util.concurrent.ThreadLocalRandom;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.apache.http.annotation.Experimental;
 
 /**
@@ -18,25 +17,21 @@ public class Traceparent {
     /**
      * Version number between range [0,255] inclusive
      */
-    @VisibleForTesting
     final int version;
 
     /**
      * 16 byte trace-id that is used to uniquely identify a distributed trace
      */
-    @VisibleForTesting
     final String traceId;
 
     /**
      * It is a 8 byte ID that represents the caller span
      */
-    @VisibleForTesting
     final String spanId;
 
     /**
      * An 8-bit field that controls tracing flags such as sampling, trace level etc.
      */
-    @VisibleForTesting
     final int traceFlags;
 
     private Traceparent(int version, String traceId, String spanId, int traceFlags, boolean check) {
@@ -119,7 +114,6 @@ public String toString() {
      *
      * @return n byte hexadecimal string
      */
-    @VisibleForTesting
     static String randomHex(int n) {
         byte[] bytes = new byte[n];
         ThreadLocalRandom.current().nextBytes(bytes);