From 842e7da6e9cef4d731ab15616c2afab08cfcfdb4 Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Fri, 4 Oct 2024 20:01:42 +0200 Subject: [PATCH] Address feedback --- ...eterListenerConfigurationResolveTagsBenchmark.java | 11 ++++++----- gradle/libs.versions.toml | 2 +- .../MicrometerMeterListenerConfiguration.java | 1 + .../MicrometerObservationListenerConfiguration.java | 1 + .../src/main/java/reactor/core/Scannable.java | 4 +++- .../main/java/reactor/core/publisher/FluxMetrics.java | 1 + 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/benchmarks/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfigurationResolveTagsBenchmark.java b/benchmarks/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfigurationResolveTagsBenchmark.java index 70168cc2af..94305d451d 100644 --- a/benchmarks/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfigurationResolveTagsBenchmark.java +++ b/benchmarks/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfigurationResolveTagsBenchmark.java @@ -40,16 +40,17 @@ @OutputTimeUnit(TimeUnit.NANOSECONDS) @State(Scope.Benchmark) public class MicrometerMeterListenerConfigurationResolveTagsBenchmark { - @Param({"1", "2", "5", "10"}) - private int distinctTagCount; - - @Param({"1", "2", "5", "10"}) - private int totalTagCount; + @Param({"1|1", "1|2", "1|5", "1|10", "2|2", "2|5", "2|10", "5|5", "5|10", "10|10"}) + private String testCase; private Publisher publisher; @Setup(Level.Iteration) public void setup() { + String[] arguments = testCase.split("\\|", -1); + int distinctTagCount = Integer.parseInt(arguments[0]); + int totalTagCount = Integer.parseInt(arguments[1]); + publisher = addTags(Mono.empty(), distinctTagCount, totalTagCount); } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 32ea1015fa..d1d3888c5c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ # Baselines, should be updated on every release baseline-core-api = "3.7.0" baselinePerfCore = "3.7.0" -baselinePerfCoreMicrometer = "1.1.9" +baselinePerfCoreMicrometer = "1.1.10" baselinePerfExtra = "3.5.2" # Other shared versions diff --git a/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfiguration.java b/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfiguration.java index 9de3f7f8fe..396958323d 100644 --- a/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfiguration.java +++ b/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerMeterListenerConfiguration.java @@ -93,6 +93,7 @@ static Tags resolveTags(Publisher source, Tags tags) { Scannable scannable = Scannable.from(source); if (scannable.isScanAvailable()) { + // `Tags#and` deduplicates tags by key, retaining the last value as required. List discoveredTags = scannable.tags() .map(t -> Tag.of(t.getT1(), t.getT2())) .collect(Collectors.toList()); diff --git a/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListenerConfiguration.java b/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListenerConfiguration.java index 337cbefd14..ec03acd830 100644 --- a/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListenerConfiguration.java +++ b/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListenerConfiguration.java @@ -70,6 +70,7 @@ static KeyValues resolveKeyValues(Publisher source, KeyValues tags) { Scannable scannable = Scannable.from(source); if (scannable.isScanAvailable()) { + // `KeyValues#and` deduplicates tags by key, retaining the last value as required. List discoveredTags = scannable.tags() .map(e -> KeyValue.of(e.getT1(), e.getT2())) .collect(Collectors.toList()); diff --git a/reactor-core/src/main/java/reactor/core/Scannable.java b/reactor-core/src/main/java/reactor/core/Scannable.java index 828c0aba03..ca3b1143c3 100644 --- a/reactor-core/src/main/java/reactor/core/Scannable.java +++ b/reactor-core/src/main/java/reactor/core/Scannable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 VMware Inc. or its affiliates, All Rights Reserved. + * Copyright (c) 2017-2024 VMware Inc. or its affiliates, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -627,7 +627,9 @@ default Stream> tags() { * * @return a {@link Map} of deduplicated tags from this {@link Scannable} and its reachable parents * @see #tags() + * @deprecated Micrometer APIs generally deduplicate tags and key-value pairs by default, so for related use cases prefer {@link #tags()}. */ + @Deprecated default Map tagsDeduplicated() { return tags().collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2, (s1, s2) -> s2, LinkedHashMap::new)); diff --git a/reactor-core/src/main/java/reactor/core/publisher/FluxMetrics.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMetrics.java index 395eb3001a..18dacb9065 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/FluxMetrics.java +++ b/reactor-core/src/main/java/reactor/core/publisher/FluxMetrics.java @@ -295,6 +295,7 @@ static Tags resolveTags(Publisher source, Tags tags) { Scannable scannable = Scannable.from(source); if (scannable.isScanAvailable()) { + // `Tags#and` deduplicates tags by key, retaining the last value as required. List discoveredTags = scannable.tags() .map(t -> Tag.of(t.getT1(), t.getT2())) .collect(Collectors.toList());