-
Notifications
You must be signed in to change notification settings - Fork 585
Log warnings (if not configured to suppress) upon multiple instantiations of MMeterRegistry
#10859
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
Open
tjquinno
wants to merge
5
commits into
helidon-io:main
Choose a base branch
from
tjquinno:4.x-multi-meter-reg-warn
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+191
−2
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e40fcd6
Log warnings (if not configured to suppress) upon multiple instantiat…
tjquinno 7e21308
Add test for suppressed warnings; clarify some test method names
tjquinno 8a382a5
Fix typo in new config setting description
tjquinno e136f05
Refactor slightly for readability; add locking to avoid very unlikely…
tjquinno d8a6f91
With locking guarding access to the fields they do not need to be vol…
tjquinno File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
...er/src/test/java/io/helidon/metrics/providers/micrometer/TestMultipleRegistryLogging.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Copyright (c) 2025 Oracle and/or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.helidon.metrics.providers.micrometer; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.io.PrintStream; | ||
|
|
||
| import io.helidon.metrics.api.Metrics; | ||
| import io.helidon.metrics.api.MetricsConfig; | ||
| import io.helidon.metrics.api.MetricsFactory; | ||
|
|
||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.hamcrest.Matchers.allOf; | ||
| import static org.hamcrest.Matchers.containsString; | ||
| import static org.hamcrest.Matchers.isEmptyString; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.not; | ||
|
|
||
| class TestMultipleRegistryLogging { | ||
|
|
||
| private static ByteArrayOutputStream baos; | ||
| private static PrintStream originalErr; | ||
| private static PrintStream testPrintStream; | ||
|
|
||
| @BeforeAll | ||
| static void beforeAll() { | ||
| baos = new ByteArrayOutputStream(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Stealing the system error output will also disable output of Junit framework itself. |
||
| originalErr = System.err; | ||
| testPrintStream = new PrintStream(baos); | ||
| System.setErr(testPrintStream); | ||
| } | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| MetricsFactory.closeAll(); | ||
| } | ||
|
|
||
| @AfterEach | ||
| void tearDown() { | ||
| baos.reset(); | ||
| } | ||
|
|
||
| @AfterAll | ||
| static void afterAll() { | ||
| MMeterRegistry.clearMultipleInstantiationInfo(); | ||
| System.setErr(originalErr); | ||
| } | ||
|
|
||
| @Test | ||
| void testSingleRegistry() throws IOException { | ||
| Metrics.globalRegistry(); | ||
| testPrintStream.flush(); | ||
| String output = baos.toString(); | ||
| assertThat("Single meter registry", output, isEmptyString()); | ||
| } | ||
|
|
||
| @Test | ||
| void testTwoRegistries() throws IOException { | ||
| Metrics.globalRegistry(); | ||
| Metrics.createMeterRegistry(); | ||
| testPrintStream.flush(); | ||
|
|
||
| String output = baos.toString(); | ||
| assertThat("Two meter registries", output, allOf( | ||
| containsString("Unexpected duplicate"), | ||
| containsString("Original instantiation"), | ||
| containsString("Additional instantiation"))); | ||
| } | ||
|
|
||
| @Test | ||
| void testThreeRegistries() throws IOException { | ||
| Metrics.globalRegistry(); | ||
| Metrics.createMeterRegistry(); | ||
| Metrics.createMeterRegistry(); | ||
| testPrintStream.flush(); | ||
|
|
||
| String output = baos.toString(); | ||
| assertThat("Three meter registries", output, allOf( | ||
| containsString("Unexpected duplicate"), | ||
| containsString("Original instantiation"), | ||
| containsString("Additional instantiation"), | ||
| containsString("Unexpected additional instantiation"))); | ||
| } | ||
|
|
||
| @Test | ||
| void testTwoRegistriesWithWarningDisabled() { | ||
| MetricsConfig configWithWarningsSuppressed = MetricsConfig.builder().warnOnMultipleRegistries(false).build(); | ||
| Metrics.createMeterRegistry(configWithWarningsSuppressed); | ||
| Metrics.createMeterRegistry(configWithWarningsSuppressed); | ||
| testPrintStream.flush(); | ||
|
|
||
| String output = baos.toString(); | ||
| assertThat("Two meter registrations with warnings suppressed", output, allOf( | ||
| not(containsString("Unexpected duplicate")), | ||
| not(containsString("Original instantiation")), | ||
| not(containsString("Additional instantiation")), | ||
| not(containsString("Unexpected additional instantiation")))); | ||
|
|
||
| } | ||
|
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Field are not volatile and not guarded by a lock - this may not work as expected.