From 3f5d234f24ec9d0432d5d2127ce7c772db9ba6aa Mon Sep 17 00:00:00 2001 From: Marko Elezovic Date: Fri, 10 Jun 2022 16:32:18 +0200 Subject: [PATCH 1/3] Standardize the 'within' patterns of Kanela modules --- .../src/main/resources/reference.conf | 2 +- .../src/main/resources/reference.conf | 8 ++-- .../src/common/resources/reference.conf | 36 ++++++++-------- .../test-common/resources/application.conf | 4 +- .../src/main/resources/reference.conf | 6 +-- .../src/test/resources/application.conf | 4 +- .../src/main/resources/reference.conf | 4 +- .../src/main/resources/reference.conf | 4 +- .../src/main/resources/reference.conf | 6 +-- .../src/main/resources/reference.conf | 2 +- .../src/main/resources/reference.conf | 8 ++-- .../src/test/resources/application.conf | 14 +++---- .../src/test/resources/application.conf | 2 +- .../src/main/resources/reference.conf | 42 +++++++++---------- .../src/main/resources/reference.conf | 2 +- .../src/main/resources/reference.conf | 6 +-- .../src/main/resources/reference.conf | 8 ++-- .../src/main/resources/reference.conf | 10 ++--- .../src/main/resources/reference.conf | 2 +- .../src/main/resources/reference.conf | 2 +- .../src/main/resources/reference.conf | 6 +-- .../src/main/resources/reference.conf | 4 +- .../src/main/resources/reference.conf | 2 +- .../src/main/resources/reference.conf | 8 ++-- .../src/main/resources/reference.conf | 2 +- .../src/main/resources/reference.conf | 10 ++--- 26 files changed, 101 insertions(+), 103 deletions(-) diff --git a/instrumentation/kamon-akka-grpc/src/main/resources/reference.conf b/instrumentation/kamon-akka-grpc/src/main/resources/reference.conf index 38986993b..aa215560c 100644 --- a/instrumentation/kamon-akka-grpc/src/main/resources/reference.conf +++ b/instrumentation/kamon-akka-grpc/src/main/resources/reference.conf @@ -13,7 +13,7 @@ kanela.modules { ] within = [ - "^akka.grpc.internal..*" + "akka\\.grpc\\.internal\\..*", ] } } diff --git a/instrumentation/kamon-akka-http/src/main/resources/reference.conf b/instrumentation/kamon-akka-http/src/main/resources/reference.conf index f4c6c54c9..5f992f403 100644 --- a/instrumentation/kamon-akka-http/src/main/resources/reference.conf +++ b/instrumentation/kamon-akka-http/src/main/resources/reference.conf @@ -244,10 +244,10 @@ kanela.modules { ] within = [ - "akka.http.*", - "akka.grpc.internal.*", - "akka.stream.scaladsl.Flow", - "akka.stream.scaladsl.FlowOps" + "akka\\.http\\..*", + "akka\\.grpc\\.internal\\..*", + "akka\\.stream\\.scaladsl\\.Flow", + "akka\\.stream\\.scaladsl\\.FlowOps", ] } } diff --git a/instrumentation/kamon-akka/src/common/resources/reference.conf b/instrumentation/kamon-akka/src/common/resources/reference.conf index ce6d686c6..77d716fc6 100644 --- a/instrumentation/kamon-akka/src/common/resources/reference.conf +++ b/instrumentation/kamon-akka/src/common/resources/reference.conf @@ -148,12 +148,12 @@ kanela.modules { ] within = [ - "^akka.dispatch..*", - "^akka.event..*", - "^akka.actor..*", - "^akka.pattern..*", - "^akka.routing..*", - "kamon.instrumentation.akka.instrumentations..*" + "akka\\.actor\\..*" + "akka\\.dispatch\\..*", + "akka\\.event\\..*", + "akka\\.pattern\\..*", + "akka\\.routing\\..*", + "kamon\\.instrumentation\\.akka\\.instrumentations\\..*", ] } @@ -169,12 +169,12 @@ kanela.modules { ] within = [ - "akka.dispatch..*", - "akka.util..*", - "akka.remote..*", - "akka.actor..*", - "akka.cluster..*", - "akka.serialization..*" + "akka\\.actor\\..*", + "akka\\.cluster\\..*", + "akka\\.dispatch\\..*", + "akka\\.remote\\..*", + "akka\\.serialization\\..*", + "akka\\.util\\..*", ] } @@ -188,12 +188,12 @@ kanela.modules { ] within = [ - "akka.dispatch..*", - "akka.util..*", - "akka.remote..*", - "akka.actor..*" - "akka.cluster..*" - "akka.serialization..*" + "akka\\.actor\\..*", + "akka\\.cluster\\..*", + "akka\\.dispatch\\..*", + "akka\\.remote\\..*", + "akka\\.serialization\\..*", + "akka\\.util\\..*", ] } } diff --git a/instrumentation/kamon-akka/src/test-common/resources/application.conf b/instrumentation/kamon-akka/src/test-common/resources/application.conf index 0e8f95654..1350fe02f 100644 --- a/instrumentation/kamon-akka/src/test-common/resources/application.conf +++ b/instrumentation/kamon-akka/src/test-common/resources/application.conf @@ -161,6 +161,6 @@ kanela.modules.akka-testkit { ] within = [ - "^akka.testkit.*" + "akka\\.testkit\\..*", ] -} \ No newline at end of file +} diff --git a/instrumentation/kamon-alpakka-kafka/src/main/resources/reference.conf b/instrumentation/kamon-alpakka-kafka/src/main/resources/reference.conf index ca4d8c51a..4e4b27ebe 100644 --- a/instrumentation/kamon-alpakka-kafka/src/main/resources/reference.conf +++ b/instrumentation/kamon-alpakka-kafka/src/main/resources/reference.conf @@ -17,9 +17,9 @@ kanela { ] within = [ - "akka.kafka.ProducerMessage\\$Message", - "akka.kafka.ProducerMessage\\$MultiMessage", - "akka.kafka.internal.DefaultProducerStageLogic" + "akka\\.kafka\\.ProducerMessage\\$Message", + "akka\\.kafka\\.ProducerMessage\\$MultiMessage", + "akka\\.kafka\\.internal\\.DefaultProducerStageLogic", ] } } diff --git a/instrumentation/kamon-annotation/src/test/resources/application.conf b/instrumentation/kamon-annotation/src/test/resources/application.conf index 014327d1a..cfe1b4d80 100644 --- a/instrumentation/kamon-annotation/src/test/resources/application.conf +++ b/instrumentation/kamon-annotation/src/test/resources/application.conf @@ -4,7 +4,7 @@ kanela { show-banner = true modules { annotation.within = [ - "kamon.annotation..*" + "kamon\\.annotation\\..*", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-caffeine/src/main/resources/reference.conf b/instrumentation/kamon-caffeine/src/main/resources/reference.conf index 93543f1a5..be5e41044 100644 --- a/instrumentation/kamon-caffeine/src/main/resources/reference.conf +++ b/instrumentation/kamon-caffeine/src/main/resources/reference.conf @@ -14,8 +14,8 @@ kanela.modules { ] within = [ - "com.github.benmanes.caffeine.cache.LocalCache", - "com.github.benmanes.caffeine.cache.LocalManualCache", + "com\\.github\\.benmanes\\.caffeine\\.cache\\.LocalCache", + "com\\.github\\.benmanes\\.caffeine\\.cache\\.LocalManualCache", ] } } diff --git a/instrumentation/kamon-cassandra/src/main/resources/reference.conf b/instrumentation/kamon-cassandra/src/main/resources/reference.conf index 247b46c95..60039ec86 100644 --- a/instrumentation/kamon-cassandra/src/main/resources/reference.conf +++ b/instrumentation/kamon-cassandra/src/main/resources/reference.conf @@ -54,8 +54,8 @@ kanela { ] within = [ - "com.datastax.driver.core..*", - "com.datastax.oss.driver.internal.core..*" + "com\\.datastax\\.driver\\.core\\..*", + "com\\.datastax\\.oss\\.driver\\.internal\\.core\\..*", ] } } diff --git a/instrumentation/kamon-cats-io/src/main/resources/reference.conf b/instrumentation/kamon-cats-io/src/main/resources/reference.conf index 9d31317c2..ee4261c41 100644 --- a/instrumentation/kamon-cats-io/src/main/resources/reference.conf +++ b/instrumentation/kamon-cats-io/src/main/resources/reference.conf @@ -4,7 +4,7 @@ kanela.modules { executor-service { - within += "cats.effect.internals.IOShift\\$Tick" - within += "cats.effect.internals.IOTimer\\$ShiftTick" + within += "cats\\.effect\\.internals\\.IOShift\\$Tick" + within += "cats\\.effect\\.internals\\.IOTimer\\$ShiftTick" } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-elasticsearch/src/main/resources/reference.conf b/instrumentation/kamon-elasticsearch/src/main/resources/reference.conf index d033f03b8..4d6d7f577 100644 --- a/instrumentation/kamon-elasticsearch/src/main/resources/reference.conf +++ b/instrumentation/kamon-elasticsearch/src/main/resources/reference.conf @@ -16,7 +16,7 @@ kanela { ] within = [ - "org.elasticsearch.client..*" + "org\\.elasticsearch\\.client\\..*", ] } } diff --git a/instrumentation/kamon-executors/src/main/resources/reference.conf b/instrumentation/kamon-executors/src/main/resources/reference.conf index ff401f83c..2cc8e758a 100644 --- a/instrumentation/kamon-executors/src/main/resources/reference.conf +++ b/instrumentation/kamon-executors/src/main/resources/reference.conf @@ -53,9 +53,9 @@ kanela.modules { } within = [ - "java.util.concurrent..*", - "com.google.common.util.concurrent..*", - "scala.concurrent.forkjoin.ForkJoinPool" + "java\\.util\\.concurrent\\..*", + "com\\.google\\.common\\.util\\.concurrent\\..*", + "scala\\.concurrent\\.forkjoin\\.ForkJoinPool", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-executors/src/test/resources/application.conf b/instrumentation/kamon-executors/src/test/resources/application.conf index 65cd7fa1f..c5e676c34 100644 --- a/instrumentation/kamon-executors/src/test/resources/application.conf +++ b/instrumentation/kamon-executors/src/test/resources/application.conf @@ -7,13 +7,11 @@ kanela.modules { executor-service-capture-on-submit { within = ${?kanela.modules.executor-service-capture-on-submit.within} [ - "com.google.common.util.concurrent..*", - "java.util.concurrent..*", - "scala.concurrent..*", - "scala.concurrent.impl..*" - "scala.concurrent.forkjoin.ForkJoinPool", - "akka.actor..*", - "play.api.libs.streams..*", + "com\\.google\\.common\\.util\\.concurrent\\..*", + "java\\.util\\.concurrent\\..*", + "scala\\.concurrent\\..*", + "akka\\.actor\\..*", + "play\\.api\\.libs\\.streams\\..*", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf b/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf index d92850637..d765663db 100644 --- a/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf +++ b/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf @@ -90,7 +90,7 @@ kanela.modules { ] within = [ - "kamon.instrumentation.context.*" + "kamon\\.instrumentation\\.context\\..*", ] } } \ No newline at end of file diff --git a/instrumentation/kamon-jdbc/src/main/resources/reference.conf b/instrumentation/kamon-jdbc/src/main/resources/reference.conf index 45fca4c2e..c1b92607a 100644 --- a/instrumentation/kamon-jdbc/src/main/resources/reference.conf +++ b/instrumentation/kamon-jdbc/src/main/resources/reference.conf @@ -59,27 +59,27 @@ kanela.modules { ] within = [ - "^org.h2..*", - "^org.sqlite..*", - "^oracle.jdbc..*", - "^com.amazon.redshift.jdbc42..*", - "^com.amazon.redshift.core.jdbc42..*", - "^com.mysql.jdbc..*", - "^com.mysql.cj.jdbc..*", - "^org.h2.Driver", - "^org.h2.jdbc..*", - "^org.hsqldb.jdbc.*", - "^net.sf.log4jdbc..*", - "^org.mariadb.jdbc..*", - "^org.postgresql.jdbc..*", - "^com.microsoft.sqlserver.jdbc..*", - "^com.zaxxer.hikari.pool.PoolBase", - "^com.zaxxer.hikari.pool.PoolEntry", - "^com.zaxxer.hikari.pool.HikariPool", - "^com.zaxxer.hikari.pool.ProxyConnection", - "^com.zaxxer.hikari.pool.HikariProxyStatement", - "^com.zaxxer.hikari.pool.HikariProxyPreparedStatement", - "^com.zaxxer.hikari.pool.HikariProxyCallableStatement", + "org\\.h2\\..*", + "org\\.sqlite\\..*", + "oracle\\.jdbc\\..*", + "com\\.amazon\\.redshift\\.jdbc42\\..*", + "com\\.amazon\\.redshift\\.core\\.jdbc42\\..*", + "com\\.mysql\\.jdbc\\..*", + "com\\.mysql\\.cj\\.jdbc\\..*", + "org\\.h2\\.Driver", + "org\\.h2\\.jdbc\\..*", + "org\\.hsqldb\\.jdbc\\..*", + "net\\.sf\\.log4jdbc\\..*", + "org\\.mariadb\\.jdbc\\..*", + "org\\.postgresql\\.jdbc\\..*", + "com\\.microsoft\\.sqlserver\\.jdbc\\..*", + "com\\.zaxxer\\.hikari\\.pool\\.PoolBase", + "com\\.zaxxer\\.hikari\\.pool\\.PoolEntry", + "com\\.zaxxer\\.hikari\\.pool\\.HikariPool", + "com\\.zaxxer\\.hikari\\.pool\\.ProxyConnection", + "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyStatement", + "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyPreparedStatement", + "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyCallableStatement", ] } diff --git a/instrumentation/kamon-kafka/src/main/resources/reference.conf b/instrumentation/kamon-kafka/src/main/resources/reference.conf index ce02cb124..496503c08 100644 --- a/instrumentation/kamon-kafka/src/main/resources/reference.conf +++ b/instrumentation/kamon-kafka/src/main/resources/reference.conf @@ -34,7 +34,7 @@ kanela.modules { ] within = [ - "org.apache.kafka.clients..*", + "org\\.apache\\.kafka\\.clients\\..*", ] } } \ No newline at end of file diff --git a/instrumentation/kamon-logback/src/main/resources/reference.conf b/instrumentation/kamon-logback/src/main/resources/reference.conf index a00d537bb..5282bf583 100644 --- a/instrumentation/kamon-logback/src/main/resources/reference.conf +++ b/instrumentation/kamon-logback/src/main/resources/reference.conf @@ -46,9 +46,9 @@ kanela.modules { ] within = [ - "ch.qos.logback..*", - "com.cwbase.logback..*", - "net.logstash.logback..*" + "ch\\.qos\\.logback\\..*", + "com\\.cwbase\\.logback\\..*", + "net\\.logstash\\.logback\\..*" ] } } diff --git a/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf b/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf index c35c26e03..108206563 100644 --- a/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf +++ b/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf @@ -8,10 +8,10 @@ kanela.modules { ] within = [ - "^com.mongodb.client.*" - "^com.mongodb.async.client.*" - "^com.mongodb.internal.*" - "^com.mongodb.operation.*" + "com\\.mongodb\\.client\\..*", + "com\\.mongodb\\.async\\.client\\..*", + "com\\.mongodb\\.internal\\..*", + "com\\.mongodb\\.operation\\..*", ] } } \ No newline at end of file diff --git a/instrumentation/kamon-mongo/src/main/resources/reference.conf b/instrumentation/kamon-mongo/src/main/resources/reference.conf index 362c394b4..2e476a2d5 100644 --- a/instrumentation/kamon-mongo/src/main/resources/reference.conf +++ b/instrumentation/kamon-mongo/src/main/resources/reference.conf @@ -8,10 +8,10 @@ kanela.modules { ] within = [ - "^com.mongodb.client.*" - "^com.mongodb.async.client.*" - "^com.mongodb.internal.*" - "^com.mongodb.operation.*" + "com\\.mongodb\\.client\\..*", + "com\\.mongodb\\.async\\.client\\..*", + "com\\.mongodb\\.internal\\..*", + "com\\.mongodb\\.operation\\..*", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-okhttp/src/main/resources/reference.conf b/instrumentation/kamon-okhttp/src/main/resources/reference.conf index fdf354072..69aa0e10d 100644 --- a/instrumentation/kamon-okhttp/src/main/resources/reference.conf +++ b/instrumentation/kamon-okhttp/src/main/resources/reference.conf @@ -97,7 +97,7 @@ kanela { "kamon.okhttp3.instrumentation.OkHttpInstrumentation" ] within = [ - "okhttp3..*" + "okhttp3\\..*", ] } } diff --git a/instrumentation/kamon-play/src/main/resources/reference.conf b/instrumentation/kamon-play/src/main/resources/reference.conf index b89f1e36d..6ce8107b2 100644 --- a/instrumentation/kamon-play/src/main/resources/reference.conf +++ b/instrumentation/kamon-play/src/main/resources/reference.conf @@ -251,7 +251,7 @@ kanela.modules { ] within = [ - "^play.*" + "play\\..*", ] } } \ No newline at end of file diff --git a/instrumentation/kamon-redis/src/main/resources/reference.conf b/instrumentation/kamon-redis/src/main/resources/reference.conf index 6cd5ee97c..de5a2b065 100644 --- a/instrumentation/kamon-redis/src/main/resources/reference.conf +++ b/instrumentation/kamon-redis/src/main/resources/reference.conf @@ -10,9 +10,9 @@ kanela.modules { ] within = [ - "redis.clients.jedis..*", - "io.lettuce.core..*", - "redis..*", + "redis\\.clients\\.jedis\\..*", + "io\\.lettuce\\.core\\..*", + "redis\\..*", ] } } diff --git a/instrumentation/kamon-scala-future/src/main/resources/reference.conf b/instrumentation/kamon-scala-future/src/main/resources/reference.conf index 1e8f74f64..ee141b1ce 100644 --- a/instrumentation/kamon-scala-future/src/main/resources/reference.conf +++ b/instrumentation/kamon-scala-future/src/main/resources/reference.conf @@ -37,8 +37,8 @@ kanela.modules { ] within = [ - "scala.concurrent.*", - "scala.util.*", + "scala\\.concurrent\\..*", + "scala\\.util\\..*", ] } } diff --git a/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf b/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf index ea3e1be93..d7a89782c 100644 --- a/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf +++ b/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf @@ -4,6 +4,6 @@ kanela.modules { executor-service { - within += "scalaz.concurrent.*" + within += "scalaz\\.concurrent\\..*" } } \ No newline at end of file diff --git a/instrumentation/kamon-spring/src/main/resources/reference.conf b/instrumentation/kamon-spring/src/main/resources/reference.conf index 0ef0b479d..564390a4a 100644 --- a/instrumentation/kamon-spring/src/main/resources/reference.conf +++ b/instrumentation/kamon-spring/src/main/resources/reference.conf @@ -1,5 +1,5 @@ # ================================================== # -# kamon Spring reference configuration # +# kamon Spring reference configuration # # ================================================== # kamon.instrumentation.spring { @@ -268,9 +268,9 @@ kanela { ] within = [ - "org.springframework.web.reactive.function.client..*", - "org.springframework.web.servlet.DispatcherServlet", - "org.springframework.web.context.request.async.WebAsyncManager" + "org\\.springframework\\.web\\.reactive\\.function\\.client\\..*", + "org\\.springframework\\.web\\.servlet\\.DispatcherServlet", + "org\\.springframework\\.web\\.context\\.request\\.async\\.WebAsyncManager", ] } } diff --git a/instrumentation/kamon-tapir/src/main/resources/reference.conf b/instrumentation/kamon-tapir/src/main/resources/reference.conf index aa8769116..db7e1e8f0 100644 --- a/instrumentation/kamon-tapir/src/main/resources/reference.conf +++ b/instrumentation/kamon-tapir/src/main/resources/reference.conf @@ -16,7 +16,7 @@ kanela.modules { "kamon.instrumentation.tapir.TapirInstrumentation" ] within = [ - "^sttp.tapir.server.akkahttp.*" + "sttp\\.tapir\\.server\\.akkahttp\\..*", ] } } diff --git a/instrumentation/kamon-twitter-future/src/main/resources/reference.conf b/instrumentation/kamon-twitter-future/src/main/resources/reference.conf index 6dec97fa3..87e472bf7 100644 --- a/instrumentation/kamon-twitter-future/src/main/resources/reference.conf +++ b/instrumentation/kamon-twitter-future/src/main/resources/reference.conf @@ -12,13 +12,13 @@ kanela.modules { ] within = [ - "com.twitter.util.Promise.*" + "com\\.twitter\\.util\\.Promise\\..*", ] } executor-service { - within += "^com.twitter.util.ConstFuture.*" - within += "^com.twitter.util.ExecutorServiceFuturePool.*" - within += "^com.twitter.bijection.twitter_util.ScalaFuturePool.*" + within += "com\\.twitter\\.util\\.ConstFuture\\..*" + within += "com\\.twitter\\.util\\.ExecutorServiceFuturePool\\..*" + within += "com\\.twitter\\.bijection\\.twitter_util\\.ScalaFuturePool\\..*" } -} \ No newline at end of file +} From 55d9e34a60710a35aced734b650544101a6f2009 Mon Sep 17 00:00:00 2001 From: Marko Elezovic Date: Sat, 11 Jun 2022 19:56:34 +0200 Subject: [PATCH 2/3] Sort the kamon-jdbc withins Remove two superfluous org.h2 patterns --- .../src/main/resources/reference.conf | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/instrumentation/kamon-jdbc/src/main/resources/reference.conf b/instrumentation/kamon-jdbc/src/main/resources/reference.conf index c1b92607a..fd991858b 100644 --- a/instrumentation/kamon-jdbc/src/main/resources/reference.conf +++ b/instrumentation/kamon-jdbc/src/main/resources/reference.conf @@ -59,27 +59,25 @@ kanela.modules { ] within = [ - "org\\.h2\\..*", - "org\\.sqlite\\..*", - "oracle\\.jdbc\\..*", - "com\\.amazon\\.redshift\\.jdbc42\\..*", "com\\.amazon\\.redshift\\.core\\.jdbc42\\..*", - "com\\.mysql\\.jdbc\\..*", - "com\\.mysql\\.cj\\.jdbc\\..*", - "org\\.h2\\.Driver", - "org\\.h2\\.jdbc\\..*", - "org\\.hsqldb\\.jdbc\\..*", - "net\\.sf\\.log4jdbc\\..*", - "org\\.mariadb\\.jdbc\\..*", - "org\\.postgresql\\.jdbc\\..*", + "com\\.amazon\\.redshift\\.jdbc42\\..*", "com\\.microsoft\\.sqlserver\\.jdbc\\..*", + "com\\.mysql\\.cj\\.jdbc\\..*", + "com\\.mysql\\.jdbc\\..*", + "com\\.zaxxer\\.hikari\\.pool\\.HikariPool", + "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyCallableStatement", + "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyPreparedStatement", + "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyStatement", "com\\.zaxxer\\.hikari\\.pool\\.PoolBase", "com\\.zaxxer\\.hikari\\.pool\\.PoolEntry", - "com\\.zaxxer\\.hikari\\.pool\\.HikariPool", "com\\.zaxxer\\.hikari\\.pool\\.ProxyConnection", - "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyStatement", - "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyPreparedStatement", - "com\\.zaxxer\\.hikari\\.pool\\.HikariProxyCallableStatement", + "net\\.sf\\.log4jdbc\\..*", + "oracle\\.jdbc\\..*", + "org\\.h2\\..*", + "org\\.hsqldb\\.jdbc\\..*", + "org\\.mariadb\\.jdbc\\..*", + "org\\.postgresql\\.jdbc\\..*", + "org\\.sqlite\\..*", ] } From 4baa1f46037f8e6e0291811ace3138c24ef2adcd Mon Sep 17 00:00:00 2001 From: Marko Elezovic Date: Sat, 11 Jun 2022 19:58:39 +0200 Subject: [PATCH 3/3] Standardise reference.confs EOF by adding a newline --- core/kamon-core-tests/src/test/resources/reference.conf | 2 +- core/kamon-status-page/src/main/resources/reference.conf | 2 +- core/kamon-testkit/src/main/resources/reference.conf | 2 +- .../kamon-akka-grpc/src/test/resources/application.conf | 2 +- .../kamon-akka-http/src/test/resources/application.conf | 2 +- .../src/test/resources/application.conf | 2 +- instrumentation/kamon-kafka/src/main/resources/reference.conf | 2 +- .../kamon-mongo-legacy/src/main/resources/reference.conf | 2 +- .../kamon-mongo-legacy/src/test/resources/application.conf | 2 +- instrumentation/kamon-mongo/src/test/resources/application.conf | 2 +- instrumentation/kamon-play/src/main/resources/reference.conf | 2 +- .../src/test-common/resources/conf/application-akka-http.conf | 2 +- .../kamon-play/src/test-common/resources/conf/application.conf | 2 +- .../kamon-scalaz-future/src/main/resources/reference.conf | 2 +- reporters/kamon-graphite/src/main/resources/reference.conf | 2 +- reporters/kamon-graphite/src/test/resources/application.conf | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/kamon-core-tests/src/test/resources/reference.conf b/core/kamon-core-tests/src/test/resources/reference.conf index c5bbf60f7..e7bd284d0 100644 --- a/core/kamon-core-tests/src/test/resources/reference.conf +++ b/core/kamon-core-tests/src/test/resources/reference.conf @@ -82,4 +82,4 @@ kamon { } } } -} \ No newline at end of file +} diff --git a/core/kamon-status-page/src/main/resources/reference.conf b/core/kamon-status-page/src/main/resources/reference.conf index 8fcee5eae..25ab8975e 100644 --- a/core/kamon-status-page/src/main/resources/reference.conf +++ b/core/kamon-status-page/src/main/resources/reference.conf @@ -26,4 +26,4 @@ kamon { factory = "kamon.status.page.StatusPage$Factory" } } -} \ No newline at end of file +} diff --git a/core/kamon-testkit/src/main/resources/reference.conf b/core/kamon-testkit/src/main/resources/reference.conf index 2bd3c82eb..98f975c23 100644 --- a/core/kamon-testkit/src/main/resources/reference.conf +++ b/core/kamon-testkit/src/main/resources/reference.conf @@ -4,4 +4,4 @@ kamon { string-broadcast-key = "X-string-broadcast-key" } } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-akka-grpc/src/test/resources/application.conf b/instrumentation/kamon-akka-grpc/src/test/resources/application.conf index 3371d0c8c..2ed635415 100644 --- a/instrumentation/kamon-akka-grpc/src/test/resources/application.conf +++ b/instrumentation/kamon-akka-grpc/src/test/resources/application.conf @@ -1 +1 @@ -akka.http.server.preview.enable-http2 = on \ No newline at end of file +akka.http.server.preview.enable-http2 = on diff --git a/instrumentation/kamon-akka-http/src/test/resources/application.conf b/instrumentation/kamon-akka-http/src/test/resources/application.conf index d66f4f055..0e7bb4a06 100644 --- a/instrumentation/kamon-akka-http/src/test/resources/application.conf +++ b/instrumentation/kamon-akka-http/src/test/resources/application.conf @@ -158,4 +158,4 @@ kamon.instrumentation.akka.http { } } } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf b/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf index d765663db..49648b275 100644 --- a/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf +++ b/instrumentation/kamon-instrumentation-common/src/test/resources/application.conf @@ -93,4 +93,4 @@ kanela.modules { "kamon\\.instrumentation\\.context\\..*", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-kafka/src/main/resources/reference.conf b/instrumentation/kamon-kafka/src/main/resources/reference.conf index 496503c08..936e70944 100644 --- a/instrumentation/kamon-kafka/src/main/resources/reference.conf +++ b/instrumentation/kamon-kafka/src/main/resources/reference.conf @@ -37,4 +37,4 @@ kanela.modules { "org\\.apache\\.kafka\\.clients\\..*", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf b/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf index 108206563..ebb23193c 100644 --- a/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf +++ b/instrumentation/kamon-mongo-legacy/src/main/resources/reference.conf @@ -14,4 +14,4 @@ kanela.modules { "com\\.mongodb\\.operation\\..*", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-mongo-legacy/src/test/resources/application.conf b/instrumentation/kamon-mongo-legacy/src/test/resources/application.conf index 06e5d8279..7ed45e791 100644 --- a/instrumentation/kamon-mongo-legacy/src/test/resources/application.conf +++ b/instrumentation/kamon-mongo-legacy/src/test/resources/application.conf @@ -2,4 +2,4 @@ kamon { trace.sampler = "always" environment.service = "Mongo Client Test" apm.api-key = "0023a71072275c502c90698bdf" -} \ No newline at end of file +} diff --git a/instrumentation/kamon-mongo/src/test/resources/application.conf b/instrumentation/kamon-mongo/src/test/resources/application.conf index 06e5d8279..7ed45e791 100644 --- a/instrumentation/kamon-mongo/src/test/resources/application.conf +++ b/instrumentation/kamon-mongo/src/test/resources/application.conf @@ -2,4 +2,4 @@ kamon { trace.sampler = "always" environment.service = "Mongo Client Test" apm.api-key = "0023a71072275c502c90698bdf" -} \ No newline at end of file +} diff --git a/instrumentation/kamon-play/src/main/resources/reference.conf b/instrumentation/kamon-play/src/main/resources/reference.conf index 6ce8107b2..587cf64ca 100644 --- a/instrumentation/kamon-play/src/main/resources/reference.conf +++ b/instrumentation/kamon-play/src/main/resources/reference.conf @@ -254,4 +254,4 @@ kanela.modules { "play\\..*", ] } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-play/src/test-common/resources/conf/application-akka-http.conf b/instrumentation/kamon-play/src/test-common/resources/conf/application-akka-http.conf index 76f1b9ce4..08b41d918 100644 --- a/instrumentation/kamon-play/src/test-common/resources/conf/application-akka-http.conf +++ b/instrumentation/kamon-play/src/test-common/resources/conf/application-akka-http.conf @@ -1,4 +1,4 @@ include "application.conf" play.server.provider=play.core.server.AkkaHttpServerProvider -play.server.akka.http2.enabled = false \ No newline at end of file +play.server.akka.http2.enabled = false diff --git a/instrumentation/kamon-play/src/test-common/resources/conf/application.conf b/instrumentation/kamon-play/src/test-common/resources/conf/application.conf index 38ca13f2e..cb892a5e9 100644 --- a/instrumentation/kamon-play/src/test-common/resources/conf/application.conf +++ b/instrumentation/kamon-play/src/test-common/resources/conf/application.conf @@ -11,4 +11,4 @@ kamon { propagation.http.default.tags.mappings { request-id = "x-request-id" } -} \ No newline at end of file +} diff --git a/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf b/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf index d7a89782c..830894e58 100644 --- a/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf +++ b/instrumentation/kamon-scalaz-future/src/main/resources/reference.conf @@ -6,4 +6,4 @@ kanela.modules { executor-service { within += "scalaz\\.concurrent\\..*" } -} \ No newline at end of file +} diff --git a/reporters/kamon-graphite/src/main/resources/reference.conf b/reporters/kamon-graphite/src/main/resources/reference.conf index d6cb8ebda..8b7d53078 100644 --- a/reporters/kamon-graphite/src/main/resources/reference.conf +++ b/reporters/kamon-graphite/src/main/resources/reference.conf @@ -46,4 +46,4 @@ kamon { excludes = [] } } -} \ No newline at end of file +} diff --git a/reporters/kamon-graphite/src/test/resources/application.conf b/reporters/kamon-graphite/src/test/resources/application.conf index 80ba094eb..90ea28131 100644 --- a/reporters/kamon-graphite/src/test/resources/application.conf +++ b/reporters/kamon-graphite/src/test/resources/application.conf @@ -11,4 +11,4 @@ kamon { exclude = ["special-shouldignore-tag"] } } -} \ No newline at end of file +}