This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch SLING-12020
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 44e5a847918526a38a07d0ce1e05607d467cefe5
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Wed Sep 13 11:22:35 2023 +0100
SLING-12020: resource resolver: correct name of alias metric
---
.../resourceresolver/impl/ResourceResolverMetrics.java | 16 ++++++++--------
.../sling/resourceresolver/impl/mapping/MapEntries.java | 2 +-
.../impl/ResourceResolverMetricsTest.java | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetrics.java
b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetrics.java
index 46ea806..c073727 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetrics.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetrics.java
@@ -77,11 +77,11 @@ public class ResourceResolverMetrics {
private ServiceRegistration<Gauge<Long>>
numberOfVanityPathBloomFalsePositiveGauge;
private Supplier<Long> numberOfVanityPathBloomFalsePositiveSupplier =
ZERO_SUPPLIER;
- // number of aliases
- private ServiceRegistration<Gauge<Long>> numberOfAliasesGauge;
- private Supplier<Long> numberOfAliasesSupplier = ZERO_SUPPLIER;
+ // number of resources with aliased children
+ private ServiceRegistration<Gauge<Long>>
numberOfResourcesWithAliasedChildrenGauge;
+ private Supplier<Long> numberOfResourcesWithAliasedChildrenSupplier =
ZERO_SUPPLIER;
- // number of aliases
+ // number of resources with aliases on startup
private ServiceRegistration<Gauge<Long>>
numberOfResourcesWithAliasesOnStartupGauge;
private Supplier<Long> numberOfResourcesWithAliasesOnStartupSupplier =
ZERO_SUPPLIER;
@@ -95,7 +95,7 @@ public class ResourceResolverMetrics {
numberOfVanityPathLookupsGauge = registerGauge(bundleContext,
METRICS_PREFIX + ".numberOfVanityPathLookups", () ->
numberOfVanityPathLookupsSupplier );
numberOfVanityPathBloomNegativeGauge = registerGauge(bundleContext,
METRICS_PREFIX + ".numberOfVanityPathBloomNegatives", () ->
numberOfVanityPathBloomNegativeSupplier );
numberOfVanityPathBloomFalsePositiveGauge =
registerGauge(bundleContext, METRICS_PREFIX +
".numberOfVanityPathBloomFalsePositives", () ->
numberOfVanityPathBloomFalsePositiveSupplier );
- numberOfAliasesGauge = registerGauge(bundleContext, METRICS_PREFIX +
".numberOfAliases", () -> numberOfAliasesSupplier );
+ numberOfResourcesWithAliasedChildrenGauge =
registerGauge(bundleContext, METRICS_PREFIX +
".numberOfResourcesWithAliasedChildren", () ->
numberOfResourcesWithAliasedChildrenSupplier);
numberOfResourcesWithAliasesOnStartupGauge =
registerGauge(bundleContext, METRICS_PREFIX +
".numberOfResourcesWithAliasesOnStartup", () ->
numberOfResourcesWithAliasesOnStartupSupplier );
unclosedResourceResolvers = metricsService.counter(METRICS_PREFIX +
".unclosedResourceResolvers");
}
@@ -108,7 +108,7 @@ public class ResourceResolverMetrics {
numberOfVanityPathBloomNegativeGauge.unregister();
numberOfVanityPathBloomFalsePositiveGauge.unregister();
numberOfResourcesWithAliasesOnStartupGauge.unregister();
- numberOfAliasesGauge.unregister();
+ numberOfResourcesWithAliasedChildrenGauge.unregister();
}
/**
@@ -155,8 +155,8 @@ public class ResourceResolverMetrics {
* Set the number of aliases in the system
* @param supplier a supplier returning the number of aliases
*/
- public void setNumberOfAliasesSupplier(Supplier<Long> supplier) {
- numberOfAliasesSupplier = supplier;
+ public void setNumberOfResourcesWithAliasedChildrenSupplier(Supplier<Long>
supplier) {
+ numberOfResourcesWithAliasedChildrenSupplier = supplier;
}
/**
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 9c7eaf0..57ab83a 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -197,7 +197,7 @@ public class MapEntries implements
this.metrics.get().setNumberOfVanityPathLookupsSupplier(vanityPathLookups::get);
this.metrics.get().setNumberOfVanityPathBloomNegativeSupplier(vanityPathBloomNegative::get);
this.metrics.get().setNumberOfVanityPathBloomFalsePositiveSupplier(vanityPathBloomFalsePositive::get);
- this.metrics.get().setNumberOfAliasesSupplier(() -> (long)
aliasMap.size());
+
this.metrics.get().setNumberOfResourcesWithAliasedChildrenSupplier(() -> (long)
aliasMap.size());
this.metrics.get().setNumberOfResourcesWithAliasesOnStartupSupplier(aliasResourcesOnStartup::get);
}
}
diff --git
a/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetricsTest.java
b/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetricsTest.java
index b21ca73..14075c6 100644
---
a/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetricsTest.java
+++
b/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMetricsTest.java
@@ -49,11 +49,11 @@ public class ResourceResolverMetricsTest {
@Test
public void testGauges() {
Gauge<Long> vanityPaths =
getGauge(ResourceResolverMetrics.METRICS_PREFIX + ".numberOfVanityPaths");
- Gauge<Long> aliases = getGauge(ResourceResolverMetrics.METRICS_PREFIX
+ ".numberOfAliases");
+ Gauge<Long> aliases = getGauge(ResourceResolverMetrics.METRICS_PREFIX
+ ".numberOfResourcesWithAliasedChildren");
assertThat(vanityPaths.getValue(),is(0L));
assertThat(aliases.getValue(),is(0L));
- metrics.setNumberOfAliasesSupplier(() -> 3L);
+ metrics.setNumberOfResourcesWithAliasedChildrenSupplier(() -> 3L);
metrics.setNumberOfVanityPathsSupplier(() -> 2L);
assertThat(vanityPaths.getValue(),is(2L));
assertThat(aliases.getValue(),is(3L));
