This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.22.x by this push:
new b2cbb33d8143 CAMEL-24392: Fix BacklogTracerRouteAdvice draining stream
body
b2cbb33d8143 is described below
commit b2cbb33d81434b7f5d7c40de495d802abe9a6d89
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Aug 24 09:59:47 2026 +0200
CAMEL-24392: Fix BacklogTracerRouteAdvice draining stream body
Backport of #25492 to camel-4.22.x.
Cache the stream in BacklogTracerRouteAdvice.before() when stream caching
is enabled on the route, so the body is converted to a re-readable
StreamCache before the tracer reads it. This prevents the backlog tracer
from draining non-re-readable bodies (e.g. SFTP streamDownload) before
stream caching can capture them.
Closes #25504
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../camel/impl/engine/CamelInternalProcessor.java | 3 +
...GenericFileStreamBodyWithBacklogTracerTest.java | 90 ++++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 57de62d527e9..4a5400cb3d57 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -200,6 +200,9 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
@Override
public void addRouteLifecycleAdvice(CamelContext camelContext, Route
route, NamedRoute node) {
addAdvice(new CamelInternalProcessor.RouteLifecycleAdvice());
+ if (route.isStreamCaching()) {
+ addAdvice(new
StreamCachingAdvice(camelContext.getStreamCachingStrategy()));
+ }
if (camelContext.isBacklogTracingStandby() ||
route.isBacklogTracing()) {
addAdvice(new BacklogTracerRouteAdvice(camelContext, node));
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileStreamBodyWithBacklogTracerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileStreamBodyWithBacklogTracerTest.java
new file mode 100644
index 000000000000..7d5e0c0ab186
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileStreamBodyWithBacklogTracerTest.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://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.apache.camel.component.file;
+
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.InputStream;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.BacklogTracer;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests that a GenericFile with a non-resettable InputStream body is
preserved when the backlog tracer is active.
+ */
+class GenericFileStreamBodyWithBacklogTracerTest extends ContextTestSupport {
+
+ @Test
+ void testGenericFileStreamBodyPreservedWithBacklogTracer() throws
Exception {
+
assertThat(context.isBacklogTracingStandby()).as("BacklogTracingStandby").isTrue();
+ assertThat(context.isMessageHistory()).as("MessageHistory").isTrue();
+
+ BacklogTracer tracer =
context.getCamelContextExtension().getContextPlugin(BacklogTracer.class);
+ assertThat(tracer).as("BacklogTracer").isNotNull();
+ assertThat(tracer.isStandby()).as("BacklogTracer standby").isTrue();
+
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ GenericFile<Object> file = new GenericFile<>();
+ file.setFileName("test.txt");
+ file.setBody(nonResettableStream("Hello World Body"));
+ template.sendBody("direct:start", file);
+
+ assertMockEndpointsSatisfied();
+
+ String body =
getMockEndpoint("mock:result").getReceivedExchanges().get(0)
+ .getMessage().getBody(String.class);
+ assertThat(body).isEqualTo("Hello World Body");
+ }
+
+ private static InputStream nonResettableStream(String content) {
+ return new FilterInputStream(new
ByteArrayInputStream(content.getBytes())) {
+ @Override
+ public boolean markSupported() {
+ return false;
+ }
+
+ @Override
+ public synchronized void mark(int readlimit) {
+ }
+
+ @Override
+ public synchronized void reset() {
+ throw new UnsupportedOperationException("reset not supported");
+ }
+ };
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ context.setUseBreadcrumb(false);
+ context.setBacklogTracingStandby(true);
+ context.setMessageHistory(true);
+
+ from("direct:start").routeId("myRoute").streamCaching("true")
+ .to("mock:result").id("result");
+ }
+ };
+ }
+}
