-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add some infrastructure for Observation #3879
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
garyrussell
merged 7 commits into
spring-projects:main
from
artembilan:Observation_Infrastructure
Sep 19, 2022
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0b8fb1e
Add some infrastructure for Observation
artembilan a2d6b1e
* Add a `DocumentedObservation` infrastructure
artembilan 3fda015
* Add `Timer` verification to the propagation test
artembilan 93a9a87
* Update to the latest Observation API
artembilan af7a26b
* Add custom observation convention support for the `AbstractMessageH…
artembilan 972650e
* Move singleton instance for `DefaultMessageReceiverObservationConve…
artembilan 631cf4c
* And an integration test with Zipkin based on the `SampleTestRunner`
artembilan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...tegration/support/management/observation/DefaultMessageReceiverObservationConvention.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright 2022 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. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.integration.support.management.observation; | ||
|
||
import io.micrometer.common.KeyValues; | ||
|
||
/** | ||
* A default {@link MessageReceiverObservationConvention} implementation. | ||
* Provides low cardinalities as a {@link IntegrationObservation.HandlerTags} values. | ||
* | ||
* @author Artem Bilan | ||
* | ||
* @since 6.0 | ||
*/ | ||
public class DefaultMessageReceiverObservationConvention implements MessageReceiverObservationConvention { | ||
|
||
/** | ||
* A shared singleton instance for {@link DefaultMessageReceiverObservationConvention}. | ||
*/ | ||
public static final DefaultMessageReceiverObservationConvention INSTANCE = | ||
new DefaultMessageReceiverObservationConvention(); | ||
|
||
@Override | ||
public KeyValues getLowCardinalityKeyValues(MessageReceiverContext context) { | ||
return KeyValues.of( | ||
IntegrationObservation.HandlerTags.COMPONENT_NAME.withValue(context.getHandlerName()), | ||
IntegrationObservation.HandlerTags.COMPONENT_TYPE.withValue("handler")); | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This means that
micrometer-observation
is a mandatory dependency?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that's what we have discussed with you a couple weeks ago.
The conclusion was like: since a
micrometer-observation
is tiny API jar there is no reason in extra facade layer complexity on our side.The bean by itself is
optional
though, so we just don't have any observation by default either way.