Skip to content

Add gauges for queue channel size #3349

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.

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 4 commits into from
Jul 28, 2020

Conversation

artembilan
Copy link
Member

The QueueChannel provides a current size and remaining capacity metrics

  • Add Micrometer gauges into QueueChannel to expose the current values
    of the size and remaining capacity

Cherry-pick to 5.3.x, 5.2.x & 5.1.x

The `QueueChannel` provides a current size and remaining capacity metrics

* Add Micrometer gauges into `QueueChannel` to expose the current values
of the size and remaining capacity

**Cherry-pick to 5.3.x, 5.2.x & 5.1.x**
@artembilan artembilan added this to the 5.4 M2 milestone Jul 28, 2020
@artembilan artembilan requested a review from garyrussell July 28, 2020 15:41
* Document new gauges for queue channel
@garyrussell
Copy link
Contributor

LGTM; but NPEs in travis tests.

@garyrussell garyrussell merged commit f23f3ea into spring-projects:master Jul 28, 2020
garyrussell pushed a commit that referenced this pull request Jul 28, 2020
* Add gauges for queue channel size

The `QueueChannel` provides a current size and remaining capacity metrics

* Add Micrometer gauges into `QueueChannel` to expose the current values
of the size and remaining capacity

**Cherry-pick to 5.3.x, 5.2.x & 5.1.x**

* * Revert `@SuppressWarnings("unchecked")` for test
* Document new gauges for queue channel

* * Fix IntegrationManagementConfigurer for NPE on `metricsCaptor`

* Fix wording in meter descriptions

Co-authored-by: Michel Jung <[email protected]>

Co-authored-by: Michel Jung <[email protected]>
garyrussell pushed a commit that referenced this pull request Jul 28, 2020
* Add gauges for queue channel size

The `QueueChannel` provides a current size and remaining capacity metrics

* Add Micrometer gauges into `QueueChannel` to expose the current values
of the size and remaining capacity

**Cherry-pick to 5.3.x, 5.2.x & 5.1.x**

* * Revert `@SuppressWarnings("unchecked")` for test
* Document new gauges for queue channel

* * Fix IntegrationManagementConfigurer for NPE on `metricsCaptor`

* Fix wording in meter descriptions

Co-authored-by: Michel Jung <[email protected]>

Co-authored-by: Michel Jung <[email protected]>
garyrussell pushed a commit that referenced this pull request Jul 28, 2020
* Add gauges for queue channel size

The `QueueChannel` provides a current size and remaining capacity metrics

* Add Micrometer gauges into `QueueChannel` to expose the current values
of the size and remaining capacity

**Cherry-pick to 5.3.x, 5.2.x & 5.1.x**

* * Revert `@SuppressWarnings("unchecked")` for test
* Document new gauges for queue channel

* * Fix IntegrationManagementConfigurer for NPE on `metricsCaptor`

* Fix wording in meter descriptions

Co-authored-by: Michel Jung <[email protected]>

Co-authored-by: Michel Jung <[email protected]>
@garyrussell
Copy link
Contributor

...and cherry-picked to all requested after resolving conflicts in 5.2.x, 5.1.x.

585da69
94ef271
b20d276

@@ -165,6 +165,20 @@ It is possible to customize the names and tags of `Meters` created by integratio
The https://github.com/spring-projects/spring-integration/blob/master/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java[MicrometerCustomMetricsTests] test case shows a simple example of how to do that.
You can also further customize the meters by overloading the `build()` methods on builder subclasses.

Starting with version 5.1.13, the `QueueChannel` exposes Micrometer gauges for queue size and remaining capacity:
Copy link
Contributor

@micheljung micheljung Jul 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@artembilan
Isn't this misleading? In the 5.1.x branch this might be true but 5.2.8.RELEASE and 5.3.2.RELEASE don't have this feature.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, it even misleads you when you try to upgrade from 5.1.13 to those 5.2.8 or 5.3.2, because there is no that fix yet.
So, it was always about upgrading to the latest minor version of the particular point generation.

artembilan pushed a commit that referenced this pull request Jul 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants