Skip to content

Commit af37bb4

Browse files
committed
thou shall lint
1 parent 6155206 commit af37bb4

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/JmxRule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public MetricDef buildMetricDef() throws Exception {
170170
combineMetricAttributes(ownAttributes, metricAttributes);
171171

172172
// higher priority to metric level mapping, then jmx rule as fallback
173-
final StateMapping stateMapping = getEffectiveStateMapping(m, this);
173+
StateMapping stateMapping = getEffectiveStateMapping(m, this);
174174

175175
if (stateMapping.isEmpty()) {
176176
MetricExtractor metricExtractor =

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/StateMapping.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ private StateMapping(
3636
}
3737

3838
/**
39+
* Returns {@literal} true when empty, {@literal false} otherwise
40+
*
3941
* @return {@literal true} when state mapping is empty, {@literal false} otherwise
4042
*/
4143
public boolean isEmpty() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import static org.assertj.core.api.Assertions.assertThat;
1212
import static org.assertj.core.api.Assertions.entry;
13-
import static org.mockito.Mockito.doReturn;
13+
import static org.mockito.Mockito.when;
1414

1515
import io.opentelemetry.instrumentation.jmx.yaml.JmxConfig;
1616
import io.opentelemetry.instrumentation.jmx.yaml.JmxRule;
@@ -400,7 +400,7 @@ void testStateMetricConf() throws Exception {
400400

401401
ObjectName objectName = new ObjectName(jmxRule.getBean());
402402
MBeanServerConnection mockConnection = Mockito.mock(MBeanServerConnection.class);
403-
doReturn("STOPPED").when(mockConnection).getAttribute(objectName, "jmxStateAttribute");
403+
when(mockConnection.getAttribute(objectName, "jmxStateAttribute")).thenReturn("STOPPED");
404404

405405
MetricDef metricDef = jmxRule.buildMetricDef();
406406
assertThat(metricDef.getMetricExtractors())

0 commit comments

Comments
 (0)