diff --git a/CHANGELOG.md b/CHANGELOG.md index 8704984..14ff6b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,10 +14,12 @@ The `Unreleased` section name is replaced by the expected version of next releas ### Added ### Changed +- Target `Confluent.Kafka [1.7.0]`, `librdkafka.redist [1.7.0]` [#89](https://github.com/jet/FsKafka/pull/89) ### Removed - Remove FsKafka0, the older, less loved shimmed version which now be subject to the [scream test](http://www.v-wiki.net/the-scream-test/) with [#87](https://github.com/jet/FsKafka/pull/87) - Remove targeting for `net461` - support only `netstandard 2.0` with [#88](https://github.com/jet/FsKafka/pull/88) +- Remove `AwaitThreshold` in `InFlightMessageCounter` [#89](https://github.com/jet/FsKafka/pull/89) ### Fixed diff --git a/src/FsKafka/FsKafka.fs b/src/FsKafka/FsKafka.fs index de9a19a..e00c256 100644 --- a/src/FsKafka/FsKafka.fs +++ b/src/FsKafka/FsKafka.fs @@ -254,10 +254,6 @@ module Core = while Volatile.Read(&inFlightBytes) > minInFlightBytes && not ct.IsCancellationRequested do showConsumerWeAreStillAlive () log.Information "Consumer resuming polling" - [] - // TODO remove ?busyWork=None in internal call when removing this overload - member this.AwaitThreshold(ct : CancellationToken, consumer : IConsumer<_,_>) = - this.AwaitThreshold(ct, consumer, ?busyWork=None) /// See https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md for documentation on the implications of specific settings [] @@ -503,7 +499,7 @@ module private ConsumerImpl = // run the consumer let ct = cts.Token try while not ct.IsCancellationRequested do - counter.AwaitThreshold(ct, consumer, ?busyWork=None) + counter.AwaitThreshold(ct, consumer) try let result = consumer.Consume(ct) // NB TimeSpan overload yields AVEs on 1.0.0-beta2 if result <> null then counter.Delta(+approximateMessageBytes result) diff --git a/src/FsKafka/FsKafka.fsproj b/src/FsKafka/FsKafka.fsproj index 89519bc..3fd5c8e 100644 --- a/src/FsKafka/FsKafka.fsproj +++ b/src/FsKafka/FsKafka.fsproj @@ -21,9 +21,9 @@ - - + + - \ No newline at end of file +