! core: special treatment of settings.

1 files changed, 15 insertions, 29 deletions

diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf
index 746652eb..a648c01a 100644
--- a/kamon-core/src/main/resources/reference.conf
+++ b/kamon-core/src/main/resources/reference.conf
@@ -82,15 +82,6 @@ kamon {
     instrument-settings {
 
     }
-
-    dispatchers {
-
-      # Dispatcher for the actor that will collect all recorded metrics on every tick and dispatch them to all subscribers.
-      metric-collection = kamon.default-dispatcher
-
-      # Dispatcher for the Kamon refresh scheduler, used by all MinMaxCounters and Gaugues to update their values.
-      refresh-scheduler = kamon.default-dispatcher
-    }
   }
 
 
@@ -140,35 +131,30 @@ kamon {
       # open after this point.
       max-incubation-time = 20 seconds
     }
-
-    # Default dispatcher for all trace module operations
-    dispatcher = kamon.default-dispatcher
   }
 
-  default-dispatcher {
-    # Dispatcher is the name of the event-based dispatcher
-    type = Dispatcher
 
-    # What kind of ExecutionService to use
-    executor = "fork-join-executor"
+  # All settings included under the internal-config key will be used to repleace the akka.* and spray.* settings. By
+  # doing this we avoid applying custom settings that might make sense for the user application to the internal actor
+  # system and Spray facilities used by Kamon.
+  internal-config {
 
-    # Configuration for the fork join pool
-    fork-join-executor {
-      # Min number of threads to cap factor-based parallelism number to
-      parallelism-min = 2
+    akka.actor.default-dispatcher {
+      fork-join-executor {
+        parallelism-min = 2
+        parallelism-factor = 2.0
+        parallelism-max = 10
+      }
+    }
 
-      # The parallelism factor is used to determine thread pool size using the
-      # following formula: ceil(available processors * factor). Resulting size
-      # is then bounded by the parallelism-min and parallelism-max values.
-      parallelism-factor = 2.0
+    spray {
 
-      # Max number of threads to cap factor-based parallelism number to
-      parallelism-max = 10
     }
   }
 
-
-  disable-aspectj-missing-warning = false
+  # Controls whether the AspectJ Weaver missing warning should be displayed if any Kamon module requiring AspectJ is
+  # found in the classpath but the application is started without the AspectJ Weaver.
+  show-aspectj-missing-warning = yes
 
   modules {
     # Just a place holder to ensure that the key is always available. Non-core Kamon modules should provide their