Skip to content
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

Add produce method to KafkaProducerConnection #900

Merged
merged 5 commits into from
Mar 16, 2022
Merged

Add produce method to KafkaProducerConnection #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76fe9a5
Have KafkaProducerConnection extend KafkaProducer[F, Array[Byte], Arr…
bplommer Mar 13, 2022
6b99126
Rework producerconnection
bplommer Mar 13, 2022
499975b
KafkaProducer delegates to KafkaProducerConnection
bplommer Mar 13, 2022
091f276
Add mima exclusion
bplommer Mar 14, 2022
35d5693
Add mima exclusion
bplommer Mar 14, 2022
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
7 changes: 6 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,12 @@ lazy val mimaSettings = Seq(
ProblemFilters.exclude[DirectMissingMethodProblem]("fs2.kafka.vulcan.AvroSettings#AvroSettingsImpl.copy"),
ProblemFilters.exclude[DirectMissingMethodProblem]("fs2.kafka.vulcan.AvroSettings#AvroSettingsImpl.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("fs2.kafka.vulcan.AvroSettings#AvroSettingsImpl.apply"),
ProblemFilters.exclude[ReversedMissingMethodProblem]("fs2.kafka.KafkaAdminClient.deleteConsumerGroups")
ProblemFilters.exclude[ReversedMissingMethodProblem]("fs2.kafka.KafkaAdminClient.deleteConsumerGroups"),
ProblemFilters.exclude[ReversedMissingMethodProblem]("fs2.kafka.KafkaProducerConnection.produce"),
ProblemFilters.exclude[ReversedMissingMethodProblem]("fs2.kafka.KafkaProducerConnection.metrics"),

// package-private
ProblemFilters.exclude[DirectMissingMethodProblem]("fs2.kafka.KafkaProducer.from")
)
// format: on
}
Expand Down
25 changes: 16 additions & 9 deletions modules/core/src/main/scala/fs2/kafka/KafkaProducer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import cats.syntax.all._
import cats.Apply
import fs2._
import fs2.kafka.internal._
import fs2.kafka.internal.converters.collection._
import fs2.kafka.producer.MkProducer
import org.apache.kafka.clients.producer.RecordMetadata
import org.apache.kafka.common.{Metric, MetricName}
Expand Down Expand Up @@ -139,23 +138,19 @@ object KafkaProducer {
)(implicit F: Async[F], mk: MkProducer[F]): Resource[F, KafkaProducer.Metrics[F, K, V]] =
KafkaProducerConnection.resource(settings)(F, mk).evalMap(_.withSerializersFrom(settings))

private[kafka] def from[F[_]: Async, K, V](
withProducer: WithProducer[F],
private[kafka] def from[F[_], K, V](
connection: KafkaProducerConnection[F],
keySerializer: Serializer[F, K],
valueSerializer: Serializer[F, V]
): KafkaProducer.Metrics[F, K, V] =
new KafkaProducer.Metrics[F, K, V] {
override def produce[P](
records: ProducerRecords[P, K, V]
): F[F[ProducerResult[P, K, V]]] =
withProducer { (producer, blocking) =>
records.records
.traverse(produceRecord(keySerializer, valueSerializer, producer, blocking))
.map(_.sequence.map(ProducerResult(_, records.passthrough)))
}
connection.produce(records)(keySerializer, valueSerializer)

override def metrics: F[Map[MetricName, Metric]] =
withProducer.blocking { _.metrics().asScala.toMap }
connection.metrics

override def toString: String =
"KafkaProducer$" + System.identityHashCode(this)
Expand All @@ -177,6 +172,18 @@ object KafkaProducer {
)(implicit F: Async[F], mk: MkProducer[F]): Stream[F, KafkaProducer.Metrics[F, K, V]] =
Stream.resource(KafkaProducer.resource(settings)(F, mk))

private[kafka] def produce[F[_]: Async, P, K, V](
withProducer: WithProducer[F],
keySerializer: Serializer[F, K],
valueSerializer: Serializer[F, V],
records: ProducerRecords[P, K, V]
): F[F[ProducerResult[P, K, V]]] =
withProducer { (producer, blocking) =>
records.records
.traverse(produceRecord(keySerializer, valueSerializer, producer, blocking))
.map(_.sequence.map(ProducerResult(_, records.passthrough)))
}

private[kafka] def produceRecord[F[_], K, V](
keySerializer: Serializer[F, K],
valueSerializer: Serializer[F, V],
Expand Down
28 changes: 26 additions & 2 deletions modules/core/src/main/scala/fs2/kafka/KafkaProducerConnection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ package fs2.kafka

import cats.effect._
import cats.syntax.all._
import fs2.Stream
import fs2._
import fs2.kafka.internal._
import fs2.kafka.internal.converters.collection._
import fs2.kafka.producer.MkProducer

import scala.annotation.nowarn
import org.apache.kafka.common.MetricName
import org.apache.kafka.common.Metric

/**
* [[KafkaProducerConnection]] represents a connection to a Kafka broker
Expand All @@ -22,6 +25,12 @@ import scala.annotation.nowarn
*/
sealed abstract class KafkaProducerConnection[F[_]] {

def produce[P, K: Serializer[F, *], V: Serializer[F, *]](
records: ProducerRecords[P, K, V]
): F[F[ProducerResult[P, K, V]]]

def metrics: F[Map[MetricName, Metric]]

/**
* Creates a new [[KafkaProducer]] using the provided serializers.
*
Expand Down Expand Up @@ -105,11 +114,26 @@ object KafkaProducerConnection {
): Resource[F, KafkaProducerConnection[G]] =
WithProducer(mk, settings).map { withProducer =>
new KafkaProducerConnection[G] {
override def produce[P, K, V](
records: ProducerRecords[P, K, V]
)(
implicit keySerializer: Serializer[G, K],
valueSerializer: Serializer[G, V]
): G[G[ProducerResult[P, K, V]]] =
KafkaProducer.produce[G, P, K, V](
withProducer,
keySerializer,
valueSerializer,
records
)

override def metrics: G[Map[MetricName, Metric]] =
withProducer.blocking { _.metrics().asScala.toMap }
override def withSerializers[K, V](
keySerializer: Serializer[G, K],
valueSerializer: Serializer[G, V]
): KafkaProducer.Metrics[G, K, V] =
KafkaProducer.from(withProducer, keySerializer, valueSerializer)
KafkaProducer.from(this, keySerializer, valueSerializer)

override def withSerializersFrom[K, V](
settings: ProducerSettings[G, K, V]
Expand Down
15 changes: 11 additions & 4 deletions modules/core/src/test/scala/fs2/kafka/KafkaConsumerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ import cats.effect.unsafe.implicits.global
import fs2.Stream
import fs2.concurrent.SignallingRef
import fs2.kafka.internal.converters.collection._
import org.apache.kafka.clients.consumer.{ConsumerConfig, CooperativeStickyAssignor, NoOffsetForPartitionException}
import org.apache.kafka.clients.consumer.{
ConsumerConfig,
CooperativeStickyAssignor,
NoOffsetForPartitionException
}
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.errors.TimeoutException
import org.scalatest.Assertion
Expand Down Expand Up @@ -559,7 +563,9 @@ final class KafkaConsumerSpec extends BaseKafkaSpec {
.stream(
consumerSettings[IO]
.withProperties(
ConsumerConfig.PARTITION_ASSIGNMENT_STRATEGY_CONFIG -> classOf[CooperativeStickyAssignor].getName
ConsumerConfig.PARTITION_ASSIGNMENT_STRATEGY_CONFIG -> classOf[
CooperativeStickyAssignor
].getName
)
)
.subscribeTo(topic)
Expand Down Expand Up @@ -801,9 +807,10 @@ final class KafkaConsumerSpec extends BaseKafkaSpec {
.stream(
consumerSettings[IO]
.withProperties(
ConsumerConfig.PARTITION_ASSIGNMENT_STRATEGY_CONFIG -> classOf[CooperativeStickyAssignor].getName
ConsumerConfig.PARTITION_ASSIGNMENT_STRATEGY_CONFIG -> classOf[
CooperativeStickyAssignor
].getName
)

)
.subscribeTo(topic)
.evalMap { consumer =>
Expand Down