Skip to content

Commit 588f6d3

Browse files
committed
minor code cleanup
1 parent 94e7291 commit 588f6d3

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricAttribute.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.instrumentation.jmx.engine;
77

8+
import javax.annotation.Nullable;
89
import javax.management.MBeanServerConnection;
910
import javax.management.ObjectName;
1011

@@ -30,7 +31,8 @@ public String getAttributeName() {
3031
return name;
3132
}
3233

33-
String acquireAttributeValue(MBeanServerConnection connection, ObjectName objectName) {
34+
@Nullable
35+
public String acquireAttributeValue(MBeanServerConnection connection, ObjectName objectName) {
3436
return extractor.extractValue(connection, objectName);
3537
}
3638
}

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricAttributeExtractor.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ static MetricAttributeExtractor fromObjectNameParameter(String parameterKey) {
3535
if (parameterKey.isEmpty()) {
3636
throw new IllegalArgumentException("Empty parameter name");
3737
}
38-
return (dummy, objectName) -> objectName.getKeyProperty(parameterKey);
38+
return (dummy, objectName) -> {
39+
if (objectName == null) {
40+
throw new IllegalArgumentException("missing object name");
41+
}
42+
return objectName.getKeyProperty(parameterKey);
43+
};
3944
}
4045

4146
static MetricAttributeExtractor fromBeanAttribute(String attributeName) {

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/engine/RuleParserTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ void testConf8() throws Exception {
379379
@Test
380380
void testStateMetricConf() throws Exception {
381381
JmxConfig config = parseConf(CONF9);
382-
assertThat(config).isNotNull();
383382

384383
List<JmxRule> rules = config.getRules();
385384
assertThat(rules).hasSize(1);

0 commit comments

Comments
 (0)