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.

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

Revert to use processor #2893

Merged

Conversation

shakuzen
Copy link
Member

@shakuzen shakuzen commented Dec 7, 2021

Reverts the change to the new API until we figure out how to use it in a way that doesn't cause the regression describe in #2880. It is less than ideal to use the deprecated API, but this is a shaded dependency so the deprecation does not leak to user code.

Resolves #2880

@shakuzen shakuzen merged commit 9a6f914 into micrometer-metrics:1.8.x Dec 7, 2021
@@ -143,11 +146,11 @@ private StatsdMeterRegistry(StatsdConfig config,
);

if (config.enabled()) {
this.sink = Sinks.many().multicast().directBestEffort();
this.sink = processor.sink();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecation: sink() in FluxProcessor has been deprecated (details)
(at-me in a reply with help or ignore)

@@ -80,7 +82,8 @@
private final HierarchicalNameMapper nameMapper;
private final Map<Meter.Id, StatsdPollable> pollableMeters = new ConcurrentHashMap<>();
private final AtomicBoolean started = new AtomicBoolean();
Sinks.Many<String> sink = new NoopManySink();
DirectProcessor<String> processor = DirectProcessor.create();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecation: create() in DirectProcessor has been deprecated (details)
(at-me in a reply with help or ignore)

@@ -80,7 +82,8 @@
private final HierarchicalNameMapper nameMapper;
private final Map<Meter.Id, StatsdPollable> pollableMeters = new ConcurrentHashMap<>();
private final AtomicBoolean started = new AtomicBoolean();
Sinks.Many<String> sink = new NoopManySink();
DirectProcessor<String> processor = DirectProcessor.create();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecation: DirectProcessor in reactor.core.publisher has been deprecated (details)
(at-me in a reply with help or ignore)

@@ -33,12 +33,14 @@
import org.reactivestreams.Subscription;
import reactor.core.Disposable;
import reactor.core.Disposables;
import reactor.core.publisher.DirectProcessor;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecation: DirectProcessor in reactor.core.publisher has been deprecated (details)
(at-me in a reply with help or ignore)

@@ -46,16 +46,16 @@ private BufferingFlux() {
final AtomicInteger byteSize = new AtomicInteger();
final AtomicLong lastTime = new AtomicLong();

final Sinks.Empty<Void> intervalEnd = Sinks.empty();
final DirectProcessor<Void> intervalEnd = DirectProcessor.create();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecation: create() in DirectProcessor has been deprecated (details)
(at-me in a reply with help or ignore)

@@ -46,16 +46,16 @@ private BufferingFlux() {
final AtomicInteger byteSize = new AtomicInteger();
final AtomicLong lastTime = new AtomicLong();

final Sinks.Empty<Void> intervalEnd = Sinks.empty();
final DirectProcessor<Void> intervalEnd = DirectProcessor.create();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecation: DirectProcessor in reactor.core.publisher has been deprecated (details)
(at-me in a reply with help or ignore)

@@ -15,8 +15,8 @@
*/
package io.micrometer.statsd.internal;

import reactor.core.publisher.DirectProcessor;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecation: DirectProcessor in reactor.core.publisher has been deprecated (details)
(at-me in a reply with help or ignore)

@jonatan-ivanov jonatan-ivanov deleted the revert-to-use-processor branch December 7, 2021 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants