-
Notifications
You must be signed in to change notification settings - Fork 569
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[3.x] Fix improper handling of metrics global tags (#5812)
* Fix improper handling of metrics global tags
- Loading branch information
Showing
6 changed files
with
168 additions
and
8 deletions.
There are no files selected for viewing
This file contains 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 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
48 changes: 48 additions & 0 deletions
48
metrics/api/src/test/java/io/helidon/metrics/api/TestGlobalTags.java
This file contains 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,48 @@ | ||
| /* | ||
| * Copyright (c) 2023 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.api; | ||
|
|
||
| import java.util.AbstractMap; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.condition.DisabledIfSystemProperty; | ||
| import org.junit.jupiter.api.condition.EnabledIfSystemProperty; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.emptyIterable; | ||
| import static org.hamcrest.Matchers.hasItem; | ||
|
|
||
| class TestGlobalTags { | ||
|
|
||
| @Test | ||
| @DisabledIfSystemProperty(named = "testSelection", matches = "topLevelAndMetricsLevel") | ||
| void testTopLevelTagsIgnoredForMetrics() { | ||
| MetricsSettings metricsSettings = MetricsSettings.create(); | ||
| assertThat("Global tags with top-level 'tags' assigned", metricsSettings.globalTags().entrySet(), emptyIterable()); | ||
| } | ||
|
|
||
| @Test | ||
| @EnabledIfSystemProperty(named = "testSelection", matches = "topLevelAndMetricsLevel") | ||
| void testGlobalTagsForMetrics() { | ||
| String tag = "myTag"; | ||
| String value = "myValue"; | ||
| String globalTags = tag + "=" + value; | ||
| MetricsSettings metricsSettings = MetricsSettings.create(); | ||
| assertThat("Global tags with top-level and metrics 'tags' assigned", | ||
| metricsSettings.globalTags().entrySet(), | ||
| hasItem(new AbstractMap.SimpleEntry<>(tag, value))); | ||
| } | ||
| } |
This file contains 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 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
37 changes: 37 additions & 0 deletions
37
microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestConfigProcessing.java
This file contains 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,37 @@ | ||
| /* | ||
| * Copyright (c) 2023 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.microprofile.metrics; | ||
|
|
||
| import io.helidon.config.Config; | ||
| import io.helidon.microprofile.tests.junit5.HelidonTest; | ||
|
|
||
| import jakarta.enterprise.inject.spi.CDI; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| @HelidonTest() | ||
| class TestConfigProcessing { | ||
|
|
||
| @Test | ||
| void checkTopLeveTagsIgnoredForMetrics() { | ||
| MetricsCdiExtension extension = CDI.current().getBeanManager().getExtension(MetricsCdiExtension.class); | ||
| Config seConfig = extension.seComponentConfig(); | ||
| Config metricsTags = seConfig.get("tags"); | ||
| assertThat("Tags setting is present", metricsTags.asString().isPresent(), is(false)); | ||
| } | ||
| } |