Merge pull request #2140 from bosch-io/fix/kamon-conf

fix kamon.conf to be loaded in config
eclipse-ditto · Mar 5, 2025 · 94a364c · 94a364c
2 parents 8d7f126 + 87bc658
commit 94a364c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 0 deletions.
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -1361,5 +1361,6 @@ blocked-namespaces-dispatcher {
   throughput = 5
 }
 
+include "kamon.conf"
 include "connectivity-extension.conf"
 include file("/opt/ditto/connectivity-extension.conf")
diff --git a/gateway/service/src/main/resources/gateway.conf b/gateway/service/src/main/resources/gateway.conf
@@ -624,5 +624,6 @@ signal-enrichment-cache-dispatcher {
   executor = "org.eclipse.ditto.internal.utils.metrics.service.executor.InstrumentedThreadPoolExecutorServiceConfigurator"
 }
 
+include "kamon.conf"
 include "gateway-extension.conf"
 include file("/opt/ditto/gateway-extension.conf")
diff --git a/internal/utils/config/src/main/resources/ditto-kamon.conf b/internal/utils/config/src/main/resources/ditto-kamon.conf
@@ -48,7 +48,12 @@ kamon {
         0.5,
         0.75,
         1,
+        1.25,
+        1.5,
+        1.75,
+        2.0,
         2.5,
+        3,
         5,
         7.5,
         10,

diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
@@ -399,5 +399,6 @@ pekko.contrib.persistence.mongodb.mongo {
   }
 }
 
+include "kamon.conf"
 include "policies-extension.conf"
 include file("/opt/ditto/policies-extension.conf")
diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
@@ -624,5 +624,6 @@ pekko.contrib.persistence.mongodb.mongo {
   }
 }
 
+include "kamon.conf"
 include "things-extension.conf"
 include file("/opt/ditto/things-extension.conf")
diff --git a/thingsearch/service/src/main/resources/search.conf b/thingsearch/service/src/main/resources/search.conf
@@ -409,5 +409,6 @@ thing-cache-dispatcher {
   executor = "org.eclipse.ditto.internal.utils.metrics.service.executor.InstrumentedThreadPoolExecutorServiceConfigurator"
 }
 
+include "kamon.conf"
 include "search-extension.conf"
 include file("/opt/ditto/search-extension.conf")
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,12 @@ kamon { @@
 .5,
 .75,
 ,
+.25,
+.5,
+.75,
+.0,
 .5,
+,
 ,
 .5,
 ,
@@ Expand Down @@