Skip to content

Commit ebfd562

Browse files
committed
refactor: use non deprecated log4cats api
1 parent ef4c296 commit ebfd562

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

core/src/main/scala/no/nrk/bigquery/BigQueryTransferClient.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import com.google.cloud.bigquery.DatasetId
99
import com.google.cloud.bigquery.datatransfer.v1._
1010
import com.google.protobuf.{Struct, Value}
1111
import no.nrk.bigquery.BigQueryTransferClient.{TransferConfigFailed, TransferFailed, TransferStatus, TransferSucceeded}
12-
import org.typelevel.log4cats.slf4j.{Slf4jFactory, loggerFactoryforSync}
12+
import org.typelevel.log4cats.slf4j.Slf4jFactory
1313

1414
import scala.concurrent.duration.{DurationInt, FiniteDuration}
1515
import scala.jdk.CollectionConverters._
1616

1717
class BigQueryTransferClient(transferClient: DataTransferServiceClient) {
18-
protected lazy val logger = Slf4jFactory.getLogger[IO]
18+
protected lazy val logger = Slf4jFactory.create[IO].getLogger
1919

2020
def getTransferConfig(
2121
transferConfigName: TransferConfigName

testing/src/main/scala/no/nrk/bigquery/testing/BQSmokeTest.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import no.nrk.bigquery._
1515
import no.nrk.bigquery.testing.BQSmokeTest.{CheckType, bqCheckFragment}
1616
import org.typelevel.log4cats.slf4j._
1717
import no.nrk.bigquery.syntax._
18+
import org.typelevel.log4cats.SelfAwareStructuredLogger
1819

1920
import java.nio.charset.StandardCharsets
2021
import java.nio.file.{Files, Path}
@@ -216,7 +217,7 @@ abstract class BQSmokeTest(testClient: Resource[IO, BigQueryClient[IO]]) extends
216217
}
217218

218219
object BQSmokeTest {
219-
private val logger = Slf4jFactory.getLogger[IO]
220+
private val logger: SelfAwareStructuredLogger[IO] = Slf4jFactory.create[IO].getLogger
220221

221222
def bqCheckFragment(
222223
testName: String,

testing/src/main/scala/no/nrk/bigquery/testing/BQUdfSmokeTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ abstract class BQUdfSmokeTest(testClient: Resource[IO, BigQueryClient[IO]]) exte
4343
}
4444

4545
object BQUdfSmokeTest {
46-
private val logger = Slf4jFactory.getLogger[IO]
46+
private val logger = Slf4jFactory.create[IO].getLogger
4747

4848
object `udf-results` extends GeneratedTest {
4949
override def testType: String = "udf-results"

testing/src/main/scala/no/nrk/bigquery/testing/BigQueryTestClient.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import no.nrk.bigquery.metrics.MetricsOps
1111
import org.apache.avro
1212
import org.apache.avro.file.{DataFileReader, DataFileWriter}
1313
import org.apache.avro.generic.{GenericDatumReader, GenericDatumWriter, GenericRecord}
14-
import org.typelevel.log4cats.LoggerFactory
15-
import org.typelevel.log4cats.slf4j._
14+
import org.typelevel.log4cats.SelfAwareStructuredLogger
15+
import org.typelevel.log4cats.slf4j.Slf4jFactory
1616

1717
import java.io.ByteArrayInputStream
1818
import java.nio.charset.StandardCharsets
@@ -21,6 +21,9 @@ import scala.jdk.CollectionConverters._
2121
import scala.util.Properties
2222

2323
object BigQueryTestClient {
24+
private implicit val loggerFactory: Slf4jFactory[IO] = Slf4jFactory.create[IO]
25+
private val logger: SelfAwareStructuredLogger[IO] = loggerFactory.getLogger
26+
2427
val basedir =
2528
Paths
2629
.get(sys.env.getOrElse("BIGQUERY_HOME", Properties.userHome))
@@ -52,8 +55,6 @@ object BigQueryTestClient {
5255
underlying <- BigQueryClient.resource(credentials, MetricsOps.noop[IO])
5356
} yield underlying
5457

55-
private val logger = LoggerFactory.getLogger[IO]
56-
5758
def cachingClient(
5859
cacheFrom: Resource[IO, BigQueryClient[IO]]
5960
): Resource[IO, BigQueryClient[IO]] =

0 commit comments

Comments
 (0)