This is an automated email from the ASF dual-hosted git repository.
Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 1fbb71564bd CAMEL-27132: camel-ai-observability-starter - hand the
options to Camel as override properties, so the AI producers see them on every
thread
1fbb71564bd is described below
commit 1fbb71564bdcf514ff2e844d242e0f146ff7f44d
Author: croway <[email protected]>
AuthorDate: Tue Nov 17 22:30:42 2026 +0100
CAMEL-27132: camel-ai-observability-starter - hand the options to Camel as
override properties, so the AI producers see them on every thread
The auto-configuration set camel.aiObservability.enabled with
PropertiesComponent.setLocalProperties.
Local properties belong to the thread that sets them, so the AI producers,
which read the option on
the threads that route the exchanges, never saw it:
camel.aiobservability.enabled=false did not turn
off the GenAI spans and metrics. The option is now an override property, as
in Camel Main.
---
.../src/main/doc/intro.adoc | 2 +-
.../starter/AiObservabilityAutoConfiguration.java | 17 ++++++---------
...iObservabilityAutoConfigurationDefaultTest.java | 2 +-
...ObservabilityAutoConfigurationDisabledTest.java | 2 +-
...bservabilityAutoConfigurationKebabCaseTest.java | 2 +-
...abilityAutoConfigurationRelaxedBindingTest.java | 2 +-
.../AiObservabilityAutoConfigurationUnitTest.java | 25 ++++++++++++++++------
.../ROOT/pages/starters/ai-observability.adoc | 2 +-
8 files changed, 32 insertions(+), 22 deletions(-)
diff --git
a/components-starter/camel-ai-observability-starter/src/main/doc/intro.adoc
b/components-starter/camel-ai-observability-starter/src/main/doc/intro.adoc
index 419294225a3..771af681c73 100644
--- a/components-starter/camel-ai-observability-starter/src/main/doc/intro.adoc
+++ b/components-starter/camel-ai-observability-starter/src/main/doc/intro.adoc
@@ -10,4 +10,4 @@ Configure the global toggle in `application.properties`:
camel.aiobservability.enabled=false
----
-Relaxed binding also accepts `camel.aiObservability.enabled` and
`camel.ai-observability.enabled`. The property is written to the Camel
`PropertiesComponent` local properties as `camel.aiObservability.enabled`,
matching Camel Main and JBang.
+Relaxed binding also accepts `camel.aiObservability.enabled` and
`camel.ai-observability.enabled`. The property is handed to the Camel
`PropertiesComponent` as the override property `camel.aiObservability.enabled`,
matching Camel Main and JBang, so the AI producers see it on every thread.
diff --git
a/components-starter/camel-ai-observability-starter/src/main/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfiguration.java
b/components-starter/camel-ai-observability-starter/src/main/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfiguration.java
index 73fdac9b945..090075197e5 100644
---
a/components-starter/camel-ai-observability-starter/src/main/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfiguration.java
+++
b/components-starter/camel-ai-observability-starter/src/main/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfiguration.java
@@ -16,11 +16,8 @@
*/
package org.apache.camel.ai.observability.starter;
-import java.util.Properties;
-
import org.apache.camel.CamelContext;
import
org.apache.camel.component.ai.observability.GenAiObservabilityProperties;
-import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.spring.boot.CamelContextConfiguration;
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -62,13 +59,13 @@ public class AiObservabilityAutoConfiguration {
.orElse(true);
}
+ /**
+ * Hands the option to the Camel PropertiesComponent as an override
property, matching Camel Main and JBang. The AI
+ * producers read it on the threads that route the exchanges; the local
properties of the PropertiesComponent belong
+ * to the thread that sets them, so they would only be seen at startup.
+ */
static void applyEnabledProperty(CamelContext camelContext, boolean
enabled) {
- PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
- Properties local = pc.getLocalProperties();
- if (local == null) {
- local = new Properties();
- pc.setLocalProperties(local);
- }
- local.setProperty(GenAiObservabilityProperties.ENABLED,
Boolean.toString(enabled));
+
camelContext.getPropertiesComponent().addOverrideProperty(GenAiObservabilityProperties.ENABLED,
+ Boolean.toString(enabled));
}
}
diff --git
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDefaultTest.java
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDefaultTest.java
index 3904089b867..f3942594188 100644
---
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDefaultTest.java
+++
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDefaultTest.java
@@ -53,7 +53,7 @@ class AiObservabilityAutoConfigurationDefaultTest {
assertThat(GenAiObservability.isEnabled(camelContext)).isTrue();
PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
- assertThat(pc.getLocalProperties())
+ assertThat(pc.getOverrideProperties())
.containsEntry(GenAiObservabilityProperties.ENABLED, "true");
}
diff --git
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDisabledTest.java
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDisabledTest.java
index 9e411c39f62..2847be9200e 100644
---
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDisabledTest.java
+++
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationDisabledTest.java
@@ -55,7 +55,7 @@ class AiObservabilityAutoConfigurationDisabledTest {
assertThat(GenAiObservability.isEnabled(camelContext)).isFalse();
PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
- assertThat(pc.getLocalProperties())
+ assertThat(pc.getOverrideProperties())
.containsEntry(GenAiObservabilityProperties.ENABLED, "false");
}
diff --git
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationKebabCaseTest.java
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationKebabCaseTest.java
index cb19bac99ab..c853e6e02f7 100644
---
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationKebabCaseTest.java
+++
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationKebabCaseTest.java
@@ -51,7 +51,7 @@ class AiObservabilityAutoConfigurationKebabCaseTest {
assertThat(GenAiObservability.isEnabled(camelContext)).isFalse();
PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
- assertThat(pc.getLocalProperties())
+ assertThat(pc.getOverrideProperties())
.containsEntry(GenAiObservabilityProperties.ENABLED, "false");
}
diff --git
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationRelaxedBindingTest.java
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationRelaxedBindingTest.java
index fa14e12668a..dffd2a78b5d 100644
---
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationRelaxedBindingTest.java
+++
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationRelaxedBindingTest.java
@@ -51,7 +51,7 @@ class AiObservabilityAutoConfigurationRelaxedBindingTest {
assertThat(GenAiObservability.isEnabled(camelContext)).isFalse();
PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
- assertThat(pc.getLocalProperties())
+ assertThat(pc.getOverrideProperties())
.containsEntry(GenAiObservabilityProperties.ENABLED, "false");
}
diff --git
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationUnitTest.java
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationUnitTest.java
index 4556603c514..7ca6e36c85e 100644
---
a/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationUnitTest.java
+++
b/components-starter/camel-ai-observability-starter/src/test/java/org/apache/camel/ai/observability/starter/AiObservabilityAutoConfigurationUnitTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.ai.observability.starter;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.component.ai.observability.GenAiObservability;
import
org.apache.camel.component.ai.observability.GenAiObservabilityProperties;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -51,28 +54,38 @@ class AiObservabilityAutoConfigurationUnitTest {
}
@Test
- void shouldApplyDisabledPropertyToLocalProperties() throws Exception {
+ void shouldApplyDisabledPropertyAsOverrideProperty() throws Exception {
try (DefaultCamelContext camelContext = new DefaultCamelContext()) {
- camelContext.getPropertiesComponent().setLocalProperties(null);
-
AiObservabilityAutoConfiguration.applyEnabledProperty(camelContext, false);
PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
- assertThat(pc.getLocalProperties())
+ assertThat(pc.getOverrideProperties())
.containsEntry(GenAiObservabilityProperties.ENABLED,
"false");
assertThat(GenAiObservability.isEnabled(camelContext)).isFalse();
}
}
@Test
- void shouldApplyEnabledPropertyToExistingLocalProperties() throws
Exception {
+ void shouldApplyEnabledPropertyAsOverrideProperty() throws Exception {
try (DefaultCamelContext camelContext = new DefaultCamelContext()) {
AiObservabilityAutoConfiguration.applyEnabledProperty(camelContext, true);
PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
- assertThat(pc.getLocalProperties())
+ assertThat(pc.getOverrideProperties())
.containsEntry(GenAiObservabilityProperties.ENABLED,
"true");
assertThat(GenAiObservability.isEnabled(camelContext)).isTrue();
}
}
+
+ @Test
+ void shouldMakeTheOptionVisibleToOtherThreads() throws Exception {
+ try (DefaultCamelContext camelContext = new DefaultCamelContext()) {
+
AiObservabilityAutoConfiguration.applyEnabledProperty(camelContext, false);
+
+ // the AI producers read the option on the threads that route the
exchanges, not on the startup thread
+ CompletableFuture<Boolean> enabled
+ = CompletableFuture.supplyAsync(() ->
GenAiObservability.isEnabled(camelContext));
+ assertThat(enabled.get(10, TimeUnit.SECONDS)).isFalse();
+ }
+ }
}
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/ai-observability.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/ai-observability.adoc
index ecadc447d40..956efcd66c8 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/ai-observability.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/ai-observability.adoc
@@ -15,7 +15,7 @@ Configure the global toggle in `application.properties`:
camel.aiobservability.enabled=false
----
-Relaxed binding also accepts `camel.aiObservability.enabled` and
`camel.ai-observability.enabled`. The property is written to the Camel
`PropertiesComponent` local properties as `camel.aiObservability.enabled`,
matching Camel Main and JBang.
+Relaxed binding also accepts `camel.aiObservability.enabled` and
`camel.ai-observability.enabled`. The property is handed to the Camel
`PropertiesComponent` as the override property `camel.aiObservability.enabled`,
matching Camel Main and JBang, so the AI producers see it on every thread.
== Maven coordinates