Merge pull request #884 from iRevive/deps/fs2

Update fs2 to `3.12.0-RC1`, remove `epollcat`

build.sbt

@@ -34,7 +34,6 @@ lazy val scalaJSLinkerSettings = Def.settings(
 )
 
 lazy val scalaNativeSettings = Def.settings(
-  libraryDependencies += "com.armanbilge" %%% "epollcat" % EpollcatVersion % Test,
   Test / nativeBrewFormulas ++= Set("s2n", "utf8proc"),
   Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1"),
   // the SN artifacts could be quite large and exceed the CI disk space limit
@@ -80,7 +79,7 @@ ThisBuild / mergifyPrRules ++= Seq(
 val CatsVersion = "2.11.0"
 val CatsEffectVersion = "3.6.0-RC1"
 val CatsMtlVersion = "1.4.0"
-val FS2Version = "3.11.0"
+val FS2Version = "3.12.0-RC1"
 val MUnitVersion = "1.0.0"
 val MUnitScalaCheckVersion = "1.0.0-M11"
 val MUnitCatsEffectVersion = "2.0.0"
@@ -98,7 +97,6 @@ val ScodecVersion = "1.1.38"
 val VaultVersion = "3.6.0"
 val Http4sVersion = "0.23.30"
 val CirceVersion = "0.14.8"
-val EpollcatVersion = "0.1.6"
 val ScalaPBCirceVersion = "0.15.1"
 val CaseInsensitiveVersion = "1.4.2"
 
@@ -466,6 +464,7 @@ lazy val `sdk-exporter-common` =
       startYear := Some(2023),
       libraryDependencies ++= Seq(
         "co.fs2" %%% "fs2-scodec" % FS2Version,
+        "co.fs2" %%% "fs2-io" % FS2Version,
         "org.http4s" %%% "http4s-ember-client" % Http4sVersion,
         "org.http4s" %%% "http4s-circe" % Http4sVersion,
         "io.github.scalapb-json" %%% "scalapb-circe" % ScalaPBCirceVersion,
@@ -584,9 +583,10 @@ lazy val `sdk-contrib-aws-resource` =
       name := "otel4s-sdk-contrib-aws-resource",
       startYear := Some(2024),
       libraryDependencies ++= Seq(
+        "co.fs2" %%% "fs2-io" % FS2Version,
+        "io.circe" %%% "circe-parser" % CirceVersion,
         "org.http4s" %%% "http4s-ember-client" % Http4sVersion,
         "org.http4s" %%% "http4s-circe" % Http4sVersion,
-        "io.circe" %%% "circe-parser" % CirceVersion,
         "org.http4s" %%% "http4s-dsl" % Http4sVersion % Test
       )
     )

flake.nix

@@ -21,7 +21,7 @@
             jdk.package = pkgs.jdk8;
             nodejs.enable = true;
             native.enable = true;
-            native.libraries = [ pkgs.zlib pkgs.s2n ];
+            native.libraries = [ pkgs.zlib pkgs.s2n-tls ];
           };
         };
       }

sdk-exporter/common/src/test/scala/org/typelevel/otel4s/sdk/exporter/otlp/autoconfigure/OtlpClientAutoConfigureSuite.scala

@@ -21,6 +21,7 @@ package autoconfigure
 import cats.effect.IO
 import cats.syntax.either._
 import cats.syntax.traverse._
+import fs2.io.compression._
 import munit.CatsEffectSuite
 import org.http4s.Headers
 import org.http4s.Uri
@@ -30,7 +31,7 @@ import scalapb_circe.Printer
 
 import scala.concurrent.duration._
 
-class OtlpClientAutoConfigureSuite extends CatsEffectSuite with SuiteRuntimePlatform {
+class OtlpClientAutoConfigureSuite extends CatsEffectSuite {
 
   import OtlpClientAutoConfigure.Defaults
 

sdk-exporter/metrics/src/test/scala/org/typelevel/otel4s/sdk/exporter/otlp/metrics/OtlpMetricExporterSuite.scala

@@ -21,6 +21,7 @@ import cats.data.NonEmptyVector
 import cats.effect.IO
 import cats.syntax.foldable._
 import com.comcast.ip4s.IpAddress
+import fs2.io.compression._
 import io.circe.Decoder
 import munit.CatsEffectSuite
 import munit.ScalaCheckEffectSuite
@@ -36,7 +37,6 @@ import org.typelevel.otel4s.Attribute
 import org.typelevel.otel4s.AttributeType
 import org.typelevel.otel4s.Attributes
 import org.typelevel.otel4s.sdk.exporter.RetryPolicy
-import org.typelevel.otel4s.sdk.exporter.SuiteRuntimePlatform
 import org.typelevel.otel4s.sdk.metrics.data.AggregationTemporality
 import org.typelevel.otel4s.sdk.metrics.data.MetricData
 import org.typelevel.otel4s.sdk.metrics.data.MetricPoints
@@ -45,7 +45,7 @@ import org.typelevel.otel4s.sdk.metrics.scalacheck.Arbitraries._
 
 import scala.concurrent.duration._
 
-class OtlpMetricExporterSuite extends CatsEffectSuite with ScalaCheckEffectSuite with SuiteRuntimePlatform {
+class OtlpMetricExporterSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
 
   import OtlpMetricExporterSuite._
 

sdk-exporter/metrics/src/test/scala/org/typelevel/otel4s/sdk/exporter/otlp/metrics/autoconfigure/OtlpMetricExporterAutoConfigureSuite.scala

@@ -19,11 +19,11 @@ package org.typelevel.otel4s.sdk.exporter.otlp.metrics.autoconfigure
 import cats.effect.IO
 import cats.syntax.either._
 import cats.syntax.foldable._
+import fs2.io.compression._
 import munit.CatsEffectSuite
 import org.typelevel.otel4s.sdk.autoconfigure.Config
-import org.typelevel.otel4s.sdk.exporter.SuiteRuntimePlatform
 
-class OtlpMetricExporterAutoConfigureSuite extends CatsEffectSuite with SuiteRuntimePlatform {
+class OtlpMetricExporterAutoConfigureSuite extends CatsEffectSuite {
 
   test("load from the config - empty config - load default") {
     val config = Config.ofProps(Map.empty)

sdk-exporter/prometheus/src/test/scala/org/typelevel/otel4s/sdk/exporter/prometheus/PrometheusHttpRoutesSuite.scala

@@ -17,6 +17,7 @@
 package org.typelevel.otel4s.sdk.exporter.prometheus
 
 import cats.effect.IO
+import fs2.io.compression._
 import munit.CatsEffectSuite
 import org.http4s.Headers
 import org.http4s.HttpRoutes
@@ -27,9 +28,8 @@ import org.http4s.Request
 import org.http4s.Status
 import org.http4s.headers.Accept
 import org.http4s.implicits._
-import org.typelevel.otel4s.sdk.exporter.SuiteRuntimePlatform
 
-class PrometheusHttpRoutesSuite extends CatsEffectSuite with SuiteRuntimePlatform {
+class PrometheusHttpRoutesSuite extends CatsEffectSuite {
 
   test("respond with a text on GET request") {
     PrometheusMetricExporter.builder[IO].build.flatMap { exporter =>

sdk-exporter/prometheus/src/test/scala/org/typelevel/otel4s/sdk/exporter/prometheus/autoconfigure/PrometheusMetricExporterAutoConfigureSuite.scala

@@ -18,12 +18,12 @@ package org.typelevel.otel4s.sdk.exporter.prometheus.autoconfigure
 
 import cats.effect.IO
 import cats.syntax.either._
+import fs2.io.compression._
 import munit.CatsEffectSuite
 import org.typelevel.otel4s.sdk.autoconfigure.Config
-import org.typelevel.otel4s.sdk.exporter.SuiteRuntimePlatform
 import org.typelevel.otel4s.sdk.test.InMemoryConsole
 
-class PrometheusMetricExporterAutoConfigureSuite extends CatsEffectSuite with SuiteRuntimePlatform {
+class PrometheusMetricExporterAutoConfigureSuite extends CatsEffectSuite {
 
   test("load from an empty config - load default") {
     val config = Config.ofProps(Map.empty)

sdk-exporter/trace/src/test/scala/org/typelevel/otel4s/sdk/exporter/otlp/trace/OtlpSpanExporterSuite.scala

@@ -21,6 +21,7 @@ package trace
 
 import cats.effect.IO
 import com.comcast.ip4s.IpAddress
+import fs2.io.compression._
 import io.circe.Encoder
 import io.circe.Json
 import munit._
@@ -43,7 +44,7 @@ import org.typelevel.otel4s.trace.StatusCode
 import java.util.Locale
 import scala.concurrent.duration._
 
-class OtlpSpanExporterSuite extends CatsEffectSuite with ScalaCheckEffectSuite with SuiteRuntimePlatform {
+class OtlpSpanExporterSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
 
   import OtlpSpanExporterSuite._
 

sdk-exporter/trace/src/test/scala/org/typelevel/otel4s/sdk/exporter/otlp/trace/autoconfigure/OtlpSpanExporterAutoConfigureSuite.scala

@@ -20,10 +20,11 @@ package otlp.trace.autoconfigure
 import cats.effect.IO
 import cats.syntax.either._
 import cats.syntax.foldable._
+import fs2.io.compression._
 import munit.CatsEffectSuite
 import org.typelevel.otel4s.sdk.autoconfigure.Config
 
-class OtlpSpanExporterAutoConfigureSuite extends CatsEffectSuite with SuiteRuntimePlatform {
+class OtlpSpanExporterAutoConfigureSuite extends CatsEffectSuite {
 
   test("load from the config - empty config - load default") {
     val config = Config.ofProps(Map.empty)