Skip to content

GH-10379: Optimize Observability API usage #10380

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.

Sign up for GitHub

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 1 commit into from
Sep 4, 2025
Merged

GH-10379: Optimize Observability API usage #10380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions ...n-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,17 @@ protected void sendMessage(@Nullable Message<?> message) {
}

try {
IntegrationObservation.HANDLER.observation(
this.observationConvention,
DefaultMessageReceiverObservationConvention.INSTANCE,
() -> new MessageReceiverContext(message, getComponentName(), "message-producer"),
this.observationRegistry)
.observe(() -> this.messagingTemplate.send(getRequiredOutputChannel(), trackMessageIfAny(message)));
if (isObserved()) {
IntegrationObservation.HANDLER.observation(
this.observationConvention,
DefaultMessageReceiverObservationConvention.INSTANCE,
() -> new MessageReceiverContext(message, getComponentName(), "message-producer"),
this.observationRegistry)
.observe(() -> sendMessageWithTracking(message));
}
else {
sendMessageWithTracking(message);
}
}
catch (RuntimeException ex) {
if (!sendErrorMessageIfNecessary(message, ex)) {
Expand All @@ -269,6 +274,10 @@ protected void sendMessage(@Nullable Message<?> message) {
}
}

private void sendMessageWithTracking(Message<?> message) {
this.messagingTemplate.send(getRequiredOutputChannel(), trackMessageIfAny(message));
}

protected void subscribeToPublisher(Publisher<? extends Message<?>> publisher) {
MessageChannel channelForSubscription = getRequiredOutputChannel();

Expand Down
16 changes: 9 additions & 7 deletions ...e/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,15 @@ protected void handleMessage(Message<?> messageArg) {
*/
@Override
protected void messageReceived(@Nullable IntegrationResourceHolder holder, Message<?> message) {
Observation observation =
IntegrationObservation.HANDLER.observation(this.observationConvention,
DefaultMessageReceiverObservationConvention.INSTANCE,
() -> new MessageReceiverContext(message, getComponentName(), "message-source"),
this.observationRegistry);

observation.start().openScope();
if (isObserved()) {
Observation observation =
IntegrationObservation.HANDLER.observation(this.observationConvention,
DefaultMessageReceiverObservationConvention.INSTANCE,
() -> new MessageReceiverContext(message, getComponentName(), "message-source"),
this.observationRegistry);

observation.start().openScope();
}
super.messageReceived(holder, message);
}

Expand Down