Skip to content

fix invalid jmx state metrics empty unit #14194

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 7, 2025
Merged

fix invalid jmx state metrics empty unit #14194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions ...rics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/UnitConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,12 @@ class UnitConverter {
* @param sourceUnit a source unit supported by requested converter
* @param targetUnit a target unit supported by requested converter
* @return an instance of converter, or {@literal null} if {@code sourceUnit} is {@literal null}
* or empty, which means that there is no conversion needed.
* @throws IllegalArgumentException if {@code targetUnit} is empty, or matching converter was not
* found for provided units.
* or empty or if {@code targetUnit} is empty, which means that there is no conversion needed.
* @throws IllegalArgumentException if matching converter was not found for provided units.
*/
@Nullable
public static UnitConverter getInstance(@Nullable String sourceUnit, String targetUnit) {
if (targetUnit.isEmpty()) {
throw new IllegalArgumentException("Non empty targetUnit must be provided");
}

if (sourceUnit == null || sourceUnit.isEmpty()) {
if (sourceUnit == null || sourceUnit.isEmpty() || targetUnit.isEmpty()) {
// No conversion is needed
return null;
}
Expand Down
5 changes: 3 additions & 2 deletions .../library/src/test/java/io/opentelemetry/instrumentation/jmx/engine/UnitConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

package io.opentelemetry.instrumentation.jmx.engine;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
Expand Down Expand Up @@ -58,10 +58,11 @@ void shouldHandleUnsupportedConversion(String sourceUnit, String targetUnit) {
@CsvSource({
", s", // null -> "s"
"'', s", // "" -> "s"
"1, ''", // empty target unit
})
void shouldSkipConversionWhenSourceUnitNotSpecified(String sourceUnit, String targetUnit) {
UnitConverter converter = UnitConverter.getInstance(sourceUnit, targetUnit);
assertNull(converter);
assertThat(converter).isNull();
}

@Test
Expand Down
Loading