Skip to content

Lift records with a plain mapK on fs2-kafka 4.1.2 #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alejandrohdezma merged 1 commit into from
Sep 30, 2026
Merged

Lift records with a plain mapK on fs2-kafka 4.1.2 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions modules/trace4cats-kafka-client/src/main/scala/fs2/kafka/LiftedCommittableOffset.scala
View file
Open in desktop

This file was deleted.

23 changes: 2 additions & 21 deletions modules/trace4cats-kafka-client/src/main/scala/trace4cats/kafka/TracedConsumer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@
package trace4cats.kafka

import cats.Functor
import cats.data.WriterT
import cats.effect.kernel.MonadCancelThrow
import cats.syntax.applicativeError._
import cats.syntax.functor._

import fs2.Stream
import fs2.kafka.CommittableConsumerRecord
import fs2.kafka.KafkaCommitter
import fs2.kafka.LiftedCommittableOffset
import fs2.kafka.Timestamp
import trace4cats.ResourceKleisli
import trace4cats.Span
Expand Down Expand Up @@ -88,24 +86,7 @@ object TracedConsumer extends Fs2StreamSyntax {
stream: Stream[F, CommittableConsumerRecord[F, K, V]]
)(
k: ResourceKleisli[F, SpanParams, Span[F]]
)(implicit P: Provide[F, G, Span[F]]): TracedStream[G, CommittableConsumerRecord[G, K, V]] = {
val liftK = P.liftK

WriterT(
inject[F, G, K, V](stream)(k)
.liftTrace[G]
.run
.mapAccumulate(Map.empty[KafkaCommitter[F], KafkaCommitter[G]]) { case (committers, (span, record)) =>
val committer = committers.getOrElse(record.offset.committer, record.offset.committer.mapK(liftK))
val offset = LiftedCommittableOffset(record.offset, committer)

(
committers.updated(record.offset.committer, committer),
(span, CommittableConsumerRecord(record.record, offset))
)
}
.map(_._2)
)
}
)(implicit P: Provide[F, G, Span[F]]): TracedStream[G, CommittableConsumerRecord[G, K, V]] =
inject[F, G, K, V](stream)(k).liftTrace[G].map(_.mapK(P.liftK))

}
2 changes: 1 addition & 1 deletion project/dependencies.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ common-settings {

trace4cats-kafka-client = [
"io.janstenpickle::trace4cats-fs2:0.14.7"
"org.typelevel::fs2-kafka:4.1.1"
"org.typelevel::fs2-kafka:4.1.2"
"io.janstenpickle::trace4cats-testkit:0.14.7:test"
]
Loading