Use cats-effect-kernel in core-metrics module

typelevel · Aug 3, 2022 · 8574657 · 8574657
1 parent f24f9da
commit 8574657
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -67,7 +67,7 @@ lazy val `core-metrics` = crossProject(JVMPlatform, JSPlatform)
   .settings(
     name := "otel4s-core-metrics",
     libraryDependencies ++= Seq(
-      "org.typelevel" %%% "cats-effect" % CatsEffectVersion,
+      "org.typelevel" %%% "cats-effect-kernel" % CatsEffectVersion,
       "org.scalameta" %%% "munit" % MUnitVersion % Test,
       "org.typelevel" %%% "munit-cats-effect-3" % MUnitCatsEffectVersion % Test,
       "org.typelevel" %%% "cats-effect-testkit" % CatsEffectVersion % Test

diff --git a/core/metrics/src/main/scala-2/org/typelevel/otel4s/metrics/HistogramMacro.scala b/core/metrics/src/main/scala-2/org/typelevel/otel4s/metrics/HistogramMacro.scala
@@ -17,7 +17,7 @@
 package org.typelevel.otel4s
 package metrics
 
-import cats.effect.Resource
+import cats.effect.kernel.Resource
 
 import scala.concurrent.duration.TimeUnit
 

diff --git a/core/metrics/src/main/scala/org/typelevel/otel4s/metrics/Histogram.scala b/core/metrics/src/main/scala/org/typelevel/otel4s/metrics/Histogram.scala
@@ -19,8 +19,8 @@ package metrics
 
 import cats.Applicative
 import cats.Monad
-import cats.effect.Clock
-import cats.effect.Resource
+import cats.effect.kernel.Clock
+import cats.effect.kernel.Resource
 import cats.syntax.flatMap._
 import cats.syntax.functor._
 import org.typelevel.otel4s.meta.InstrumentMeta

diff --git a/java/all/src/main/scala/org/typelevel/otel4s/java/OtelJava.scala b/java/all/src/main/scala/org/typelevel/otel4s/java/OtelJava.scala
@@ -16,7 +16,7 @@
 
 package org.typelevel.otel4s.java
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.{OpenTelemetry => JOpenTelemetry}
 import org.typelevel.otel4s.Otel4s
 import org.typelevel.otel4s.metrics.MeterProvider

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/Metrics.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/Metrics.scala
@@ -16,7 +16,7 @@
 
 package org.typelevel.otel4s.java
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.{OpenTelemetry => JOpenTelemetry}
 import org.typelevel.otel4s.java.metrics.MeterProviderImpl
 import org.typelevel.otel4s.metrics.MeterProvider

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/CounterBuilderImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/CounterBuilderImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.metrics.{Meter => JMeter}
 import org.typelevel.otel4s.metrics._
 

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/CounterImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/CounterImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.metrics.{LongCounter => JLongCounter}
 import org.typelevel.otel4s.meta.InstrumentMeta
 import org.typelevel.otel4s.metrics._

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/HistogramBuilderImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/HistogramBuilderImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.metrics.{Meter => JMeter}
 import org.typelevel.otel4s.metrics._
 

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/HistogramImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/HistogramImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.metrics.{DoubleHistogram => JDoubleHistogram}
 import org.typelevel.otel4s.metrics._
 

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/MeterBuilderImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/MeterBuilderImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.{OpenTelemetry => JOpenTelemetry}
 import org.typelevel.otel4s.metrics._
 

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/MeterImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/MeterImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.metrics.{Meter => JMeter}
 import org.typelevel.otel4s.metrics._
 

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/MeterProviderImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/MeterProviderImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.{OpenTelemetry => JOpenTelemetry}
 import org.typelevel.otel4s.metrics.MeterBuilder
 import org.typelevel.otel4s.metrics.MeterProvider

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/UpDownCounterBuilderImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/UpDownCounterBuilderImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.metrics.{Meter => JMeter}
 import org.typelevel.otel4s.metrics._
 

diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/UpDownCounterImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/UpDownCounterImpl.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package java
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.metrics.{LongUpDownCounter => JLongUpDownCounter}
 import org.typelevel.otel4s.meta.InstrumentMeta
 import org.typelevel.otel4s.metrics._

diff --git a/testkit/metrics/jvm/src/main/scala/org/typelevel/otel4s/testkit/metrics/MetricsSdk.scala b/testkit/metrics/jvm/src/main/scala/org/typelevel/otel4s/testkit/metrics/MetricsSdk.scala
@@ -18,7 +18,7 @@ package org.typelevel.otel4s
 package testkit
 package metrics
 
-import cats.effect.Sync
+import cats.effect.kernel.Sync
 import io.opentelemetry.api.common.{AttributeType => JAttributeType}
 import io.opentelemetry.api.common.{Attributes => JAttributes}
 import io.opentelemetry.sdk.OpenTelemetrySdk