From d64d97040f7fc4608a3ade2b9dfe91d6c5b519b4 Mon Sep 17 00:00:00 2001
From: Ruslan Iushchenko <yruslan@gmail.com>
Date: Tue, 13 Oct 2026 08:40:01 +0200
Subject: [PATCH] Strip `$` suffix from logger names of Scala companion objects

- Use `this.getClass.getName.stripSuffix("$")` for loggers in Scala objects so log names match class names
- Import `LoggerFactory` explicitly in schedule strategy classes
- Add `log4j2.discardThreshold` to the list of keys not to be printed, since its value (usually `ERROR`) confuses log error scanners
---
 .../src/main/scala/za/co/absa/pramen/core/RunnerCommons.scala | 2 +-
 .../za/co/absa/pramen/core/app/config/BookkeeperConfig.scala  | 2 +-
 .../scala/za/co/absa/pramen/core/app/config/HookConfig.scala  | 2 +-
 .../za/co/absa/pramen/core/app/config/RuntimeConfig.scala     | 2 +-
 .../scala/za/co/absa/pramen/core/bookkeeper/Bookkeeper.scala  | 2 +-
 .../co/absa/pramen/core/bookkeeper/BookkeeperDynamoDb.scala   | 2 +-
 .../src/main/scala/za/co/absa/pramen/core/config/Keys.scala   | 3 ++-
 .../scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scala | 2 +-
 .../za/co/absa/pramen/core/metastore/MetastoreImpl.scala      | 2 +-
 .../za/co/absa/pramen/core/metastore/model/MetaTable.scala    | 2 +-
 .../metastore/peristence/MetastorePersistenceIceberg.scala    | 2 +-
 .../core/metastore/peristence/MetastorePersistenceRaw.scala   | 2 +-
 .../core/metastore/peristence/TransientTableManager.scala     | 2 +-
 .../scala/za/co/absa/pramen/core/pipeline/OperationDef.scala  | 2 +-
 .../za/co/absa/pramen/core/pipeline/OperationSplitter.scala   | 2 +-
 .../za/co/absa/pramen/core/pipeline/SinkTableParser.scala     | 2 +-
 .../za/co/absa/pramen/core/pipeline/SourceTableParser.scala   | 4 ++--
 .../za/co/absa/pramen/core/pipeline/TransferTableParser.scala | 2 +-
 .../src/main/scala/za/co/absa/pramen/core/rdb/PramenDb.scala  | 2 +-
 .../absa/pramen/core/reader/model/TableReaderJdbcConfig.scala | 2 +-
 .../main/scala/za/co/absa/pramen/core/runner/AppRunner.scala  | 2 +-
 .../absa/pramen/core/runner/PipelineSparkSessionBuilder.scala | 2 +-
 .../core/runner/splitter/ScheduleStrategyIncremental.scala    | 3 ++-
 .../core/runner/splitter/ScheduleStrategySourcing.scala       | 3 ++-
 .../pramen/core/runner/splitter/ScheduleStrategyUtils.scala   | 3 ++-
 .../absa/pramen/core/runner/task/ThreadClosableRegistry.scala | 2 +-
 .../main/scala/za/co/absa/pramen/core/sink/SparkSink.scala    | 3 +--
 .../scala/za/co/absa/pramen/core/source/RawFileSource.scala   | 2 +-
 .../scala/za/co/absa/pramen/core/source/SparkSource.scala     | 4 ++--
 .../za/co/absa/pramen/core/sql/SqlGeneratorDatabricks.scala   | 2 +-
 .../scala/za/co/absa/pramen/core/sql/SqlGeneratorDenodo.scala | 2 +-
 .../scala/za/co/absa/pramen/core/sql/SqlGeneratorHive.scala   | 2 +-
 .../scala/za/co/absa/pramen/core/sql/SqlGeneratorLoader.scala | 2 +-
 .../scala/za/co/absa/pramen/core/sql/SqlGeneratorSas.scala    | 2 +-
 .../main/scala/za/co/absa/pramen/core/utils/ConfigUtils.scala | 2 +-
 .../scala/za/co/absa/pramen/core/utils/JdbcNativeUtils.scala  | 2 +-
 .../scala/za/co/absa/pramen/core/utils/JdbcSparkUtils.scala   | 2 +-
 .../scala/za/co/absa/pramen/core/utils/ScheduleUtils.scala    | 2 +-
 .../main/scala/za/co/absa/pramen/core/utils/SparkUtils.scala  | 2 +-
 .../main/scala/za/co/absa/pramen/core/utils/ThreadUtils.scala | 2 +-
 .../main/scala/za/co/absa/pramen/core/utils/TimeUtils.scala   | 2 +-
 .../scala/za/co/absa/pramen/core/utils/hive/HiveHelper.scala  | 2 +-
 .../main/scala/za/co/absa/pramen/runner/PipelineRunner.scala  | 2 +-
 .../metastore/peristence/MetastorePersistenceIcebergOps.scala | 3 +--
 .../metastore/peristence/MetastorePersistenceIcebergOps.scala | 2 +-
 .../za/co/absa/pramen/core/mocks/dao/MongoDbSingleton.scala   | 2 +-
 .../co/absa/pramen/extras/infofile/InfoFileGeneration.scala   | 4 ++--
 .../pramen/extras/notification/EcsNotificationTarget.scala    | 2 +-
 .../za/co/absa/pramen/extras/sink/StandardizationSink.scala   | 2 +-
 .../scala/za/co/absa/pramen/extras/utils/ConfigUtils.scala    | 2 +-
 .../pramen/extras/utils/httpclient/SimpleHttpClient.scala     | 2 +-
 .../za/co/absa/pramen/extras/writer/TableWriterKafka.scala    | 2 +-
 52 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/RunnerCommons.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/RunnerCommons.scala
index 6266bf92e..a4acee22c 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/RunnerCommons.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/RunnerCommons.scala
@@ -30,7 +30,7 @@ import java.nio.file.{FileSystems, Files, Paths}
 import scala.util.Try
 
 object RunnerCommons {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * The method parses command line parameters and returns workflow configs.
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/BookkeeperConfig.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/BookkeeperConfig.scala
index e5434316a..c0feeb2cc 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/BookkeeperConfig.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/BookkeeperConfig.scala
@@ -37,7 +37,7 @@ case class BookkeeperConfig(
                             )
 
 object BookkeeperConfig {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val BOOKKEEPING_PARENT = "pramen.bookkeeping"
   val BOOKKEEPING_ENABLED = "pramen.bookkeeping.enabled"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/HookConfig.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/HookConfig.scala
index f4aac71bb..948903f83 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/HookConfig.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/HookConfig.scala
@@ -31,7 +31,7 @@ object HookConfig {
   val STARTUP_HOOK_CLASS_KEY = "pramen.hook.startup.class"
   val SHUTDOWN_HOOK_CLASS_KEY = "pramen.hook.shutdown.class"
 
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def fromConfig(conf: Config): HookConfig = {
     val startupHookClass = ConfigUtils.getOptionString(conf, STARTUP_HOOK_CLASS_KEY).filter(_.nonEmpty)
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/RuntimeConfig.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/RuntimeConfig.scala
index e59c28e4f..48e938863 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/RuntimeConfig.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/app/config/RuntimeConfig.scala
@@ -58,7 +58,7 @@ case class RuntimeConfig(
                         )
 
 object RuntimeConfig {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val INFORMATION_DATE_FORMAT_APP = "pramen.information.date.format"
 
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/Bookkeeper.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/Bookkeeper.scala
index 26f89bcaa..358bf1728 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/Bookkeeper.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/Bookkeeper.scala
@@ -80,7 +80,7 @@ trait Bookkeeper extends AutoCloseable {
 }
 
 object Bookkeeper {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def fromConfig(bookkeepingConfig: BookkeeperConfig,
                  runtimeConfig: RuntimeConfig,
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/BookkeeperDynamoDb.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/BookkeeperDynamoDb.scala
index 3dda811e8..73f9b825e 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/BookkeeperDynamoDb.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/bookkeeper/BookkeeperDynamoDb.scala
@@ -809,7 +809,7 @@ object BookkeeperDynamoDb {
 
   val MODEL_VERSION = 1
 
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * Builder for creating BookkeeperDynamoDb instances.
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/config/Keys.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/config/Keys.scala
index 6dbfdaac5..fd87b8865 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/config/Keys.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/config/Keys.scala
@@ -67,6 +67,7 @@ object Keys {
     "spark.yarn.dist.files",
     "spline.mongodb.url",
     "sun.boot.class.path",
-    "sun.java.command"
+    "sun.java.command",
+    "log4j2.discardThreshold" // This option is usually equals to ERROR and its presence confuses log error scanners
   )
 }
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scala
index e9a5577af..85d88f91a 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scala
@@ -24,7 +24,7 @@ import scala.collection.mutable.ListBuffer
 import scala.util.control.NonFatal
 
 object TokenLockRegistry {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
   private var currentLocks = new ListBuffer[TokenLock]
   private val registryLock = new ReentrantLock()
 
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/MetastoreImpl.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/MetastoreImpl.scala
index 3c72cf477..040ccb746 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/MetastoreImpl.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/MetastoreImpl.scala
@@ -349,7 +349,7 @@ class MetastoreImpl(appConfig: Config,
 }
 
 object MetastoreImpl {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val METASTORE_KEY = "pramen.metastore.tables"
 
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/model/MetaTable.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/model/MetaTable.scala
index fa62cf51b..0691b55ba 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/model/MetaTable.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/model/MetaTable.scala
@@ -75,7 +75,7 @@ case class MetaTable(
                     )
 
 object MetaTable {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val NAME_KEY = "name"
   val NAME_DESCRIPTION = "description"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIceberg.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIceberg.scala
index 3cfb2bdd7..a144545db 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIceberg.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIceberg.scala
@@ -178,7 +178,7 @@ class MetastorePersistenceIceberg(table: CatalogTable,
 }
 
 object MetastorePersistenceIceberg {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def addGeneratedColumnPartition(table: String,
                                   infoDateColumn: String,
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceRaw.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceRaw.scala
index 747cd0287..84544f372 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceRaw.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceRaw.scala
@@ -342,7 +342,7 @@ class MetastorePersistenceRaw(path: String,
 }
 
 object MetastorePersistenceRaw {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val MEGABYTE: Long = 1024L * 1024L
   val RAW_PATH_FIELD_KEY = "path"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/TransientTableManager.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/TransientTableManager.scala
index 61ca10cbe..b0b1bb6d2 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/TransientTableManager.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/metastore/peristence/TransientTableManager.scala
@@ -31,7 +31,7 @@ import scala.collection.mutable.ListBuffer
 import scala.util.Random
 
 object TransientTableManager {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   private val rawDataframes = new mutable.HashMap[MetastorePartition, DataFrame]()
   private val cachedDataframes = new mutable.HashMap[MetastorePartition, DataFrame]()
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationDef.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationDef.scala
index 83917a58c..429110496 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationDef.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationDef.scala
@@ -57,7 +57,7 @@ case class OperationDef(
                        )
 
 object OperationDef {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val NAME_KEY = "name"
   val TYPE_KEY = "type"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationSplitter.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationSplitter.scala
index 44165a9ca..248ea1659 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationSplitter.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/OperationSplitter.scala
@@ -210,7 +210,7 @@ object OperationSplitter {
   val NOTIFICATION_KEY = "notification"
   val DISABLE_COUNT_QUERY = "disable.count.query"
 
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   private[core] def getNotificationTarget(appConf: Config,
                                           targetName: String,
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SinkTableParser.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SinkTableParser.scala
index f5ee8f815..2fb5e0f95 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SinkTableParser.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SinkTableParser.scala
@@ -25,7 +25,7 @@ import za.co.absa.pramen.core.utils.{AlgorithmUtils, ConfigUtils}
 import scala.collection.JavaConverters._
 
 object SinkTableParser {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val METATABLE_TABLE_KEY = "input.metastore.table"
   val JOB_METASTORE_OUTPUT_TABLE_KEY = "job.metastore.table"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SourceTableParser.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SourceTableParser.scala
index 8c7db2992..2c92d86d5 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SourceTableParser.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/SourceTableParser.scala
@@ -18,7 +18,7 @@ package za.co.absa.pramen.core.pipeline
 
 import com.typesafe.config.Config
 import org.slf4j.LoggerFactory
-import za.co.absa.pramen.api.jobdef.{SourceTable, TransformExpression}
+import za.co.absa.pramen.api.jobdef.SourceTable
 import za.co.absa.pramen.core.model.QueryBuilder
 import za.co.absa.pramen.core.pipeline.OperationDef.WARN_MAXIMUM_EXECUTION_TIME_SECONDS_KEY
 import za.co.absa.pramen.core.utils.{AlgorithmUtils, ConfigUtils}
@@ -26,7 +26,7 @@ import za.co.absa.pramen.core.utils.{AlgorithmUtils, ConfigUtils}
 import scala.collection.JavaConverters._
 
 object SourceTableParser {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val METATABLE_TABLE_KEY = "output.metastore.table"
   val DATE_FROM_KEY = "date.from"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/TransferTableParser.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/TransferTableParser.scala
index 247356067..6d7a66a13 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/TransferTableParser.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/pipeline/TransferTableParser.scala
@@ -32,7 +32,7 @@ import java.time.LocalDate
 import scala.collection.JavaConverters._
 
 object TransferTableParser {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val JOB_METASTORE_OUTPUT_TABLE_KEY = "job.metastore.table"
   val DATE_FROM_KEY = "date.from"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/rdb/PramenDb.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/rdb/PramenDb.scala
index 93879e74d..887ec1b78 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/rdb/PramenDb.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/rdb/PramenDb.scala
@@ -221,7 +221,7 @@ class PramenDb(val jdbcConfig: JdbcConfig,
 }
 
 object PramenDb {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
   private val conf = Pramen.getConfig
 
   val MODEL_VERSION = 13
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/reader/model/TableReaderJdbcConfig.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/reader/model/TableReaderJdbcConfig.scala
index a83d29f94..2bc2d8cc6 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/reader/model/TableReaderJdbcConfig.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/reader/model/TableReaderJdbcConfig.scala
@@ -46,7 +46,7 @@ case class TableReaderJdbcConfig(
                                 )
 
 object TableReaderJdbcConfig {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val HAS_INFO_DATE = "has.information.date.column"
   val INFORMATION_DATE_COLUMN = "information.date.column"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/AppRunner.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/AppRunner.scala
index c099b4349..d0e9e4f01 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/AppRunner.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/AppRunner.scala
@@ -43,7 +43,7 @@ object AppRunner {
   val ERROR_CODE_FAILURE = 1
   private var bannerShown = false
 
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * Runs the pipeline defined in the given config.
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/PipelineSparkSessionBuilder.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/PipelineSparkSessionBuilder.scala
index f0d6f4416..2237480ad 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/PipelineSparkSessionBuilder.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/PipelineSparkSessionBuilder.scala
@@ -24,7 +24,7 @@ import za.co.absa.pramen.core.pipeline.PipelineDef.PIPELINE_NAME_KEY
 import za.co.absa.pramen.core.utils.ConfigUtils
 
 object PipelineSparkSessionBuilder {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val SPARK_APP_NAME_KEY = "pramen.spark.app.name"
 
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyIncremental.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyIncremental.scala
index 2b309f036..b9891c52a 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyIncremental.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyIncremental.scala
@@ -16,6 +16,7 @@
 
 package za.co.absa.pramen.core.runner.splitter
 
+import org.slf4j.LoggerFactory
 import za.co.absa.pramen.api.jobdef.Schedule
 import za.co.absa.pramen.api.status.{MetastoreDependency, TaskRunReason}
 import za.co.absa.pramen.bulkload.BulkLoadStateManager
@@ -28,7 +29,7 @@ import za.co.absa.pramen.core.runner.splitter.ScheduleStrategyUtils._
 import java.time.LocalDate
 
 class ScheduleStrategyIncremental(lastInfoDateProcessedOpt: Option[LocalDate], hasInfoDateColumn: Boolean) extends ScheduleStrategy {
-  private val log = org.slf4j.LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass)
 
   override def getDaysToRun(
                              outputTable: String,
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategySourcing.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategySourcing.scala
index 5a161165e..9f3d5cd6d 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategySourcing.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategySourcing.scala
@@ -16,6 +16,7 @@
 
 package za.co.absa.pramen.core.runner.splitter
 
+import org.slf4j.LoggerFactory
 import za.co.absa.pramen.api.jobdef.Schedule
 import za.co.absa.pramen.api.status.{MetastoreDependency, TaskRunReason}
 import za.co.absa.pramen.bulkload.BulkLoadStateManager
@@ -37,7 +38,7 @@ import java.time.LocalDate
   * @param hasInfoDateColumn If true, the output table has an info date column and is treated as a table containing immutable events.
   */
 class ScheduleStrategySourcing(hasInfoDateColumn: Boolean) extends ScheduleStrategy {
-  private val log = org.slf4j.LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass)
 
   override def getDaysToRun(
                              outputTable: String,
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyUtils.scala
index a2d2a1df1..e0127e3ed 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/splitter/ScheduleStrategyUtils.scala
@@ -16,6 +16,7 @@
 
 package za.co.absa.pramen.core.runner.splitter
 
+import org.slf4j.LoggerFactory
 import za.co.absa.pramen.api.RunMode
 import za.co.absa.pramen.api.jobdef.Schedule
 import za.co.absa.pramen.api.status.TaskRunReason
@@ -33,7 +34,7 @@ import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 
 object ScheduleStrategyUtils {
-  private val log = org.slf4j.LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val RUN_DATE_VAR1 = "runDate"
   val RUN_DATE_VAR2 = "date"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/task/ThreadClosableRegistry.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/task/ThreadClosableRegistry.scala
index d42acb334..774256650 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/task/ThreadClosableRegistry.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/runner/task/ThreadClosableRegistry.scala
@@ -22,7 +22,7 @@ import scala.collection.JavaConverters._
 import scala.util.control.NonFatal
 
 object ThreadClosableRegistry {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
   private val closeables = new java.util.LinkedList[(Long, AutoCloseable)]
 
   /**
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/sink/SparkSink.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/sink/SparkSink.scala
index ab079f991..895330145 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/sink/SparkSink.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/sink/SparkSink.scala
@@ -22,7 +22,6 @@ import org.apache.spark.sql.{DataFrame, SparkSession}
 import org.slf4j.LoggerFactory
 import za.co.absa.pramen.api.{ExternalChannelFactory, MetastoreReader, Sink, SinkResult}
 import za.co.absa.pramen.core.config.Keys.KEYS_TO_REDACT
-import za.co.absa.pramen.core.reader.TableReaderJdbcNative
 import za.co.absa.pramen.core.sink.SparkSinkFormat.{ConnectionFormat, PathFormat, TableFormat}
 import za.co.absa.pramen.core.source.SparkSource.resolveQueryString
 import za.co.absa.pramen.core.utils.{AlgorithmUtils, ConfigUtils, FsUtils}
@@ -226,7 +225,7 @@ class SparkSink(format: String,
 }
 
 object SparkSink extends ExternalChannelFactory[SparkSink] {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val OUTPUT_PATH_KEY = "path"
   val OUTPUT_TABLE_KEY = "table"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/source/RawFileSource.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/source/RawFileSource.scala
index 515aba05c..eff36d104 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/source/RawFileSource.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/source/RawFileSource.scala
@@ -249,7 +249,7 @@ class RawFileSource(val sourceConfig: Config,
 }
 
 object RawFileSource extends ExternalChannelFactory[RawFileSource] {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val FILE_PREFIX = "file"
   val FILE_PATTERN_CASE_SENSITIVE_KEY = "file.pattern.case.sensitive"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/source/SparkSource.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/source/SparkSource.scala
index c1e80542e..4693af3c5 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/source/SparkSource.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/source/SparkSource.scala
@@ -24,9 +24,9 @@ import za.co.absa.pramen.api._
 import za.co.absa.pramen.api.offset.{OffsetInfo, OffsetValue}
 import za.co.absa.pramen.api.sql.SqlColumnType
 import za.co.absa.pramen.core.config.Keys.KEYS_TO_REDACT
-import za.co.absa.pramen.core.reader.{TableReaderJdbcNative, TableReaderSpark}
 import za.co.absa.pramen.core.reader.model.OffsetInfoParser
 import za.co.absa.pramen.core.reader.model.TableReaderJdbcConfig._
+import za.co.absa.pramen.core.reader.{TableReaderJdbcNative, TableReaderSpark}
 import za.co.absa.pramen.core.utils.{ConfigUtils, FsUtils}
 
 import java.time.LocalDate
@@ -126,7 +126,7 @@ class SparkSource(val format: Option[String],
 }
 
 object SparkSource extends ExternalChannelFactory[SparkSource] {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val FORMAT = "format"
   val SCHEMA = "schema"
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDatabricks.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDatabricks.scala
index 0db4857e7..45be796f3 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDatabricks.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDatabricks.scala
@@ -26,7 +26,7 @@ import java.time.format.DateTimeFormatter
 import java.time.{LocalDate, LocalDateTime}
 
 object SqlGeneratorDatabricks {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * This is required for Spark to be able to handle data that comes from Databricks JDBC drivers
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDenodo.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDenodo.scala
index 2e66342d0..829ffbf2e 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDenodo.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorDenodo.scala
@@ -26,7 +26,7 @@ import java.time.format.DateTimeFormatter
 import java.time.{LocalDate, LocalTime, ZonedDateTime}
 
 object SqlGeneratorDenodo {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * This is required for Spark to be able to handle data that comes from Denodo JDBC drivers
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorHive.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorHive.scala
index 8dad2ccb4..46f563b49 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorHive.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorHive.scala
@@ -26,7 +26,7 @@ import java.time.format.DateTimeFormatter
 import java.time.{LocalDate, LocalDateTime}
 
 object SqlGeneratorHive {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * This is required for Spark to be able to handle data that comes from Hive JDBC drivers
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorLoader.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorLoader.scala
index db6a2b4ee..1a1df576e 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorLoader.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorLoader.scala
@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory
 import za.co.absa.pramen.api.sql.{SqlConfig, SqlGenerator}
 
 object SqlGeneratorLoader {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * Loads an SQL generator, If SQL configuration contains a generator class name, it will be loaded.
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorSas.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorSas.scala
index 6708f9227..664e88d80 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorSas.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/sql/SqlGeneratorSas.scala
@@ -29,7 +29,7 @@ import java.util.Locale
 import scala.collection.mutable.ListBuffer
 
 object SqlGeneratorSas {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * This is required for Spark to be able to handle data that comes from Sas JDBC drivers
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ConfigUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ConfigUtils.scala
index 25e75a4e1..4c0900208 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ConfigUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ConfigUtils.scala
@@ -31,7 +31,7 @@ import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 
 object ConfigUtils {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def getOptionBoolean(conf: Config, path: String): Option[Boolean] = {
     if (conf.hasPath(path)) {
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcNativeUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcNativeUtils.scala
index 82ce4ba3d..2601ffdf4 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcNativeUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcNativeUtils.scala
@@ -44,7 +44,7 @@ import scala.util.control.NonFatal
   *  change the state of the database and is not idempotent (inserts, updates, deletes).
   */
 object JdbcNativeUtils {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   final val DEFAULT_CONNECTION_TIMEOUT_SECONDS = 60
   final val JDBC_WORDS_TO_REDACT = Set("password", "secret", "pwd", "token", "key", "api_key")
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcSparkUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcSparkUtils.scala
index 1af37641b..007d8e582 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcSparkUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcSparkUtils.scala
@@ -29,7 +29,7 @@ import java.sql.{Connection, DatabaseMetaData, ResultSet, ResultSetMetaData}
 import scala.collection.mutable.ListBuffer
 
 object JdbcSparkUtils {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val MAXIMUM_VARCHAR_LENGTH = 8192
   val MAXIMUM_UUID_LENGTH = 50
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ScheduleUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ScheduleUtils.scala
index 2c4b3e703..fb3d36604 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ScheduleUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ScheduleUtils.scala
@@ -23,7 +23,7 @@ import java.time.{Instant, LocalDate, ZoneId, ZonedDateTime}
 import scala.collection.mutable.ListBuffer
 
 object ScheduleUtils {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * Converts a moment in time into a date by applying local time zone.
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/SparkUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/SparkUtils.scala
index a33fca4b8..aa83c4b51 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/SparkUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/SparkUtils.scala
@@ -40,7 +40,7 @@ import scala.util.control.NonFatal
 import scala.util.{Failure, Success, Try}
 
 object SparkUtils {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
   private val charVarcharTypePattern = """(?i)\s*(char|varchar)\((\d+)\)\s*""".r
   private val charVarcharLengthPattern = """(?:char|varchar)\((\d+)\)""".r
 
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ThreadUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ThreadUtils.scala
index b7f2042a0..22f15fd23 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ThreadUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/ThreadUtils.scala
@@ -29,7 +29,7 @@ import scala.util.{Failure, Success}
 object ThreadUtils {
   val MIN_WAIT_AFTER_INTERRUPT_MS = 1000
 
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * Executes an action with a timeout. If the timeout is breached, cleanup is performed
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/TimeUtils.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/TimeUtils.scala
index 00cce0626..74d2a8759 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/TimeUtils.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/TimeUtils.scala
@@ -24,7 +24,7 @@ import java.util.Locale
 object TimeUtils {
   import scala.math.Integral.Implicits._
 
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * Returns a pretty time description between 2 instances.
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/hive/HiveHelper.scala b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/hive/HiveHelper.scala
index acd37e67d..75d973797 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/hive/HiveHelper.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/core/utils/hive/HiveHelper.scala
@@ -221,7 +221,7 @@ abstract class HiveHelper {
 }
 
 object HiveHelper {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def fromHiveConfig(hiveConfig: HiveConfig)
                     (implicit spark: SparkSession): HiveHelper = {
diff --git a/pramen/core/src/main/scala/za/co/absa/pramen/runner/PipelineRunner.scala b/pramen/core/src/main/scala/za/co/absa/pramen/runner/PipelineRunner.scala
index 4cd0ae70b..a854b4dbc 100644
--- a/pramen/core/src/main/scala/za/co/absa/pramen/runner/PipelineRunner.scala
+++ b/pramen/core/src/main/scala/za/co/absa/pramen/runner/PipelineRunner.scala
@@ -28,7 +28,7 @@ import za.co.absa.pramen.core.utils.ConfigUtils
 import scala.collection.mutable.ListBuffer
 
 object PipelineRunner {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   private val workflowExitCodes = new ListBuffer[Int]
 
diff --git a/pramen/core/src/main/scala_2.12/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala b/pramen/core/src/main/scala_2.12/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala
index e0e69154b..6e1b76bc2 100644
--- a/pramen/core/src/main/scala_2.12/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala
+++ b/pramen/core/src/main/scala_2.12/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala
@@ -17,7 +17,6 @@
 package za.co.absa.pramen.core.metastore.peristence
 
 import org.apache.spark.sql.functions._
-import org.apache.spark.sql.types.DateType
 import org.apache.spark.sql.{DataFrame, SparkSession}
 import org.slf4j.LoggerFactory
 import za.co.absa.pramen.api.PartitionScheme
@@ -27,7 +26,7 @@ import java.time.LocalDate
 import scala.collection.mutable
 
 object MetastorePersistenceIcebergOps {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def createIcebergTable(df: DataFrame,
                          table: String,
diff --git a/pramen/core/src/main/scala_2.13/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala b/pramen/core/src/main/scala_2.13/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala
index 9ed0c5841..934d25577 100644
--- a/pramen/core/src/main/scala_2.13/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala
+++ b/pramen/core/src/main/scala_2.13/za/co/absa/pramen/core/metastore/peristence/MetastorePersistenceIcebergOps.scala
@@ -26,7 +26,7 @@ import java.time.LocalDate
 import scala.collection.mutable
 
 object MetastorePersistenceIcebergOps {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def createIcebergTable(df: DataFrame,
                          table: String,
diff --git a/pramen/core/src/test/scala/za/co/absa/pramen/core/mocks/dao/MongoDbSingleton.scala b/pramen/core/src/test/scala/za/co/absa/pramen/core/mocks/dao/MongoDbSingleton.scala
index 7507afaff..898079618 100644
--- a/pramen/core/src/test/scala/za/co/absa/pramen/core/mocks/dao/MongoDbSingleton.scala
+++ b/pramen/core/src/test/scala/za/co/absa/pramen/core/mocks/dao/MongoDbSingleton.scala
@@ -26,7 +26,7 @@ import de.flapdoodle.reverse.{StateID, TransitionWalker}
 import org.slf4j.{Logger, LoggerFactory}
 
 object MongoDbSingleton {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   lazy val embeddedMongoDb: (Option[RunningMongodProcess], Int) = startEmbeddedMongoDb()
 
diff --git a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/infofile/InfoFileGeneration.scala b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/infofile/InfoFileGeneration.scala
index ce403bda7..01ab7bd7f 100644
--- a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/infofile/InfoFileGeneration.scala
+++ b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/infofile/InfoFileGeneration.scala
@@ -18,7 +18,7 @@ package za.co.absa.pramen.extras.infofile
 
 import com.typesafe.config.Config
 import org.apache.hadoop.fs.Path
-import org.apache.spark.sql.{DataFrame, SparkSession}
+import org.apache.spark.sql.SparkSession
 import org.slf4j.LoggerFactory
 import za.co.absa.pramen.extras.utils.ConfigUtils
 
@@ -33,7 +33,7 @@ object InfoFileGeneration {
   val TIMESTAMP_FORMAT_KEY = "info.file.timestamp.format"
   val DATE_FORMAT_KEY = "info.file.date.format"
 
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def generateInfoFile(pramenVersion: String,
                        timezoneId: ZoneId,
diff --git a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/notification/EcsNotificationTarget.scala b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/notification/EcsNotificationTarget.scala
index fb719bc9d..0efb650ce 100644
--- a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/notification/EcsNotificationTarget.scala
+++ b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/notification/EcsNotificationTarget.scala
@@ -60,7 +60,7 @@ class EcsNotificationTarget(conf: Config) extends NotificationTarget {
 }
 
 object EcsNotificationTarget {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val ECS_API_URL_KEY = "ecs.api.url"
   val ECS_API_SECRET_KEY = "ecs.api.key"
diff --git a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/sink/StandardizationSink.scala b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/sink/StandardizationSink.scala
index 18c1d920a..ccdc1890a 100644
--- a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/sink/StandardizationSink.scala
+++ b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/sink/StandardizationSink.scala
@@ -402,7 +402,7 @@ class StandardizationSink(sinkConfig: Config,
 }
 
 object StandardizationSink extends ExternalChannelFactory[StandardizationSink] {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   val RAW_BASE_PATH_KEY = "raw.base.path"
   val PUBLISH_BASE_PATH_KEY = "publish.base.path"
diff --git a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/ConfigUtils.scala b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/ConfigUtils.scala
index a6cf66fa9..2d43999c2 100644
--- a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/ConfigUtils.scala
+++ b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/ConfigUtils.scala
@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory
 import scala.collection.JavaConverters._
 
 object ConfigUtils {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def getOptionBoolean(conf: Config, path: String): Option[Boolean] = {
     if (conf.hasPath(path)) {
diff --git a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/httpclient/SimpleHttpClient.scala b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/httpclient/SimpleHttpClient.scala
index 7081f5fb3..5e12b1e4f 100644
--- a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/httpclient/SimpleHttpClient.scala
+++ b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/utils/httpclient/SimpleHttpClient.scala
@@ -24,7 +24,7 @@ trait SimpleHttpClient extends AutoCloseable {
 }
 
 object SimpleHttpClient {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   /**
     * This builds an instance of `SimpleHttpClient` that should be used in practice.
diff --git a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/writer/TableWriterKafka.scala b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/writer/TableWriterKafka.scala
index 6ebb26deb..57d1c06c4 100644
--- a/pramen/extras/src/main/scala/za/co/absa/pramen/extras/writer/TableWriterKafka.scala
+++ b/pramen/extras/src/main/scala/za/co/absa/pramen/extras/writer/TableWriterKafka.scala
@@ -140,7 +140,7 @@ class TableWriterKafka(topicName: String,
 }
 
 object TableWriterKafka {
-  private val log = LoggerFactory.getLogger(this.getClass)
+  private val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def apply(topicName: String, conf: Config)(implicit spark: SparkSession): TableWriterKafka = {
     val kafkaConfig = KafkaAvroWriterConfig.fromConfig(conf)