From 463ef0618f5946e5b9899c736b8e48a63ab7db17 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 04:27:55 +0000 Subject: [PATCH 1/3] Update sbt-typelevel, ... to 0.7.4 --- project/plugins.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b5926f0e4..05a3b9804 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3") -addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.3") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.4") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") From 62e5df62639a42b894a1384fb6b615be251949d0 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 04:30:12 +0000 Subject: [PATCH 2/3] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04720aebc..90aedc461 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -116,8 +115,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -231,8 +229,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -292,8 +289,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 From cfeeb8af866bdd931c553a6322219fed6a3b815f Mon Sep 17 00:00:00 2001 From: Maksym Ochenashko Date: Fri, 11 Oct 2024 09:57:13 +0300 Subject: [PATCH 3/3] Update Scala 2.12 to `2.12.20` --- build.sbt | 2 +- .../sdk/exporter/otlp/grpc/GrpcCodecs.scala | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 9c5eb056d..a0cd9881c 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ lazy val scalaNativeSettings = Def.settings( Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1") ) -val Scala212 = "2.12.19" +val Scala212 = "2.12.20" val Scala213 = "2.13.15" ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.4") ThisBuild / scalaVersion := Scala213 // the default Scala diff --git a/sdk-exporter/common/src/main/scala/org/typelevel/otel4s/sdk/exporter/otlp/grpc/GrpcCodecs.scala b/sdk-exporter/common/src/main/scala/org/typelevel/otel4s/sdk/exporter/otlp/grpc/GrpcCodecs.scala index f2ca65e30..65756cbbb 100644 --- a/sdk-exporter/common/src/main/scala/org/typelevel/otel4s/sdk/exporter/otlp/grpc/GrpcCodecs.scala +++ b/sdk-exporter/common/src/main/scala/org/typelevel/otel4s/sdk/exporter/otlp/grpc/GrpcCodecs.scala @@ -47,7 +47,7 @@ private[otlp] object GrpcCodecs { } } - _.through(lpmDecoder).through(decompress).through(entityDecoder) + s => s.through(lpmDecoder).through(decompress).through(entityDecoder) } def encode[F[_]: RaiseThrowable: Compression, A]( @@ -63,12 +63,13 @@ private[otlp] object GrpcCodecs { val lpmEncoder: Pipe[F, LengthPrefixedMessage, Byte] = StreamEncoder.once(LengthPrefixedMessage.codec).toPipeByte - _.through(entityEncoder) - .through(compression) - .chunks - .foldMonoid - .map(chunks => LengthPrefixedMessage(gzip, chunks.toByteVector)) - .through(lpmEncoder) + s => + s.through(entityEncoder) + .through(compression) + .chunks + .foldMonoid + .map(chunks => LengthPrefixedMessage(gzip, chunks.toByteVector)) + .through(lpmEncoder) } }