and config dir

Author: trask

agent/runtime-attach/src/main/java/com/microsoft/applicationinsights/attach/ApplicationInsights.java

@@ -56,7 +56,7 @@ public static void attach() {
     try {
       Optional<String> jsonConfig = findJsonConfigFromClasspath();
       if (!jsonConfig.isPresent()) {
-        jsonConfig = findJsonConfigFromDefaultFileInCurrentDir();
+        jsonConfig = findJsonConfigFromFileSystem();
       }
       if (jsonConfig.isPresent()) {
         System.setProperty(RUNTIME_ATTACHED_JSON_PROPERTY, jsonConfig.get());
@@ -85,7 +85,7 @@ private static Optional<String> findJsonConfigFromClasspath() {
     return Optional.of(json);
   }
 
-  private static Optional<String> findJsonConfigFromDefaultFileInCurrentDir() {
+  private static Optional<String> findJsonConfigFromFileSystem() {
 
     InputStream configContentAsInputStream = findDefaultFileInCurrentDirAsStream();
 
@@ -118,7 +118,10 @@ private static InputStream findResourceAsStream(String fileName) {
   }
 
   private static InputStream findDefaultFileInCurrentDirAsStream() {
-    File defaultFile = new File("applicationinsights.json");
+    File defaultFile = new File("config/applicationinsights.json");
+    if (!defaultFile.exists()) {
+      defaultFile = new File("applicationinsights.json");
+    }
     if (!defaultFile.exists()) {
       return null;
     }