Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix meter leaks in the Pollable channels

Browse Source
This commit is contained in:
Artem Bilan
2019-02-28 13:02:26 -05:00
committed by Gary Russell
parent dd6cd518fe
commit d886733c26
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -232,14 +232,17 @@ public class PollableAmqpChannel extends AbstractAmqpChannel
catch (RuntimeException e) {
if (countsEnabled && !counted) {
if (getMetricsCaptor() != null) {
getMetricsCaptor().counterBuilder(RECEIVE_COUNTER_NAME)
.tag("name", getComponentName() == null ? "unknown" : getComponentName())
.tag("type", "channel")
.tag("result", "failure")
.tag("exception", e.getClass().getSimpleName())
.description("Messages received")
.build()
.increment();
CounterFacade counterFacade =
getMetricsCaptor()
.counterBuilder(RECEIVE_COUNTER_NAME)
.tag("name", getComponentName() == null ? "unknown" : getComponentName())
.tag("type", "channel")
.tag("result", "failure")
.tag("exception", e.getClass().getSimpleName())
.description("Messages received")
.build();
this.meters.add(counterFacade);
counterFacade.increment();
}
getMetrics().afterError();
}
@@ -298,6 +301,7 @@ public class PollableAmqpChannel extends AbstractAmqpChannel
.tag("exception", "none")
.description("Messages received")
.build();
this.meters.add(this.receiveCounter);
}
this.receiveCounter.increment();
}
@@ -352,12 +356,4 @@ public class PollableAmqpChannel extends AbstractAmqpChannel
return this.executorInterceptorsSize > 0;
}
@Override
public void destroy() throws Exception {
super.destroy();
if (this.receiveCounter != null) {
this.receiveCounter.remove();
}
}
}

22
spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -150,14 +150,17 @@ public class PollableJmsChannel extends AbstractJmsChannel
catch (RuntimeException e) {
if (countsEnabled && !counted) {
if (getMetricsCaptor() != null) {
getMetricsCaptor().counterBuilder(RECEIVE_COUNTER_NAME)
.tag("name", getComponentName() == null ? "unknown" : getComponentName())
.tag("type", "channel")
.tag("result", "failure")
.tag("exception", e.getClass().getSimpleName())
.description("Messages received")
.build()
.increment();
CounterFacade counterFacade =
getMetricsCaptor()
.counterBuilder(RECEIVE_COUNTER_NAME)
.tag("name", getComponentName() == null ? "unknown" : getComponentName())
.tag("type", "channel")
.tag("result", "failure")
.tag("exception", e.getClass().getSimpleName())
.description("Messages received")
.build();
this.meters.add(counterFacade);
counterFacade.increment();
}
getMetrics().afterError();
}
@@ -177,6 +180,7 @@ public class PollableJmsChannel extends AbstractJmsChannel
.tag("exception", "none")
.description("Messages received")
.build();
this.meters.add(this.receiveCounter);
}
this.receiveCounter.increment();
}