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

alstanchev · web-flow · commit 94a364c332b5 · 2025-03-05T08:25:41.000+02:00
fix kamon.conf to be loaded in config
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 number	Diff line change
`@@ -1361,5 +1361,6 @@ blocked-namespaces-dispatcher {`
`1361`	`1361`	`throughput = 5`
`1362`	`1362`	`}`
`1363`	`1363`
	`1364`	`+include "kamon.conf"`
`1364`	`1365`	`include "connectivity-extension.conf"`
`1365`	`1366`	`include file("/opt/ditto/connectivity-extension.conf")`
Original file line number	Diff line number	Diff line change
`@@ -624,5 +624,6 @@ signal-enrichment-cache-dispatcher {`
`624`	`624`	`executor = "org.eclipse.ditto.internal.utils.metrics.service.executor.InstrumentedThreadPoolExecutorServiceConfigurator"`
`625`	`625`	`}`
`626`	`626`
	`627`	`+include "kamon.conf"`
`627`	`628`	`include "gateway-extension.conf"`
`628`	`629`	`include file("/opt/ditto/gateway-extension.conf")`
-Original file line number
+Diff line change
 .5,
 .75,
 ,
 +        1.25,
 +        1.5,
 +        1.75,
 +        2.0,
 .5,
 +        3,
 ,
 .5,
 ,
Original file line number	Diff line number	Diff line change
`@@ -399,5 +399,6 @@ pekko.contrib.persistence.mongodb.mongo {`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`
	`402`	`+include "kamon.conf"`
`402`	`403`	`include "policies-extension.conf"`
`403`	`404`	`include file("/opt/ditto/policies-extension.conf")`
Original file line number	Diff line number	Diff line change
`@@ -624,5 +624,6 @@ pekko.contrib.persistence.mongodb.mongo {`
`624`	`624`	`}`
`625`	`625`	`}`
`626`	`626`
	`627`	`+include "kamon.conf"`
`627`	`628`	`include "things-extension.conf"`
`628`	`629`	`include file("/opt/ditto/things-extension.conf")`
Original file line number	Diff line number	Diff line change
`@@ -409,5 +409,6 @@ thing-cache-dispatcher {`
`409`	`409`	`executor = "org.eclipse.ditto.internal.utils.metrics.service.executor.InstrumentedThreadPoolExecutorServiceConfigurator"`
`410`	`410`	`}`
`411`	`411`
	`412`	`+include "kamon.conf"`
`412`	`413`	`include "search-extension.conf"`
`413`	`414`	`include file("/opt/ditto/search-extension.conf")`