This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 523b4cc081f2 CAMEL-24558: Warn on unconsumed camel.aiObservability.*
properties in Main
523b4cc081f2 is described below
commit 523b4cc081f296151eda4e048094760040e39c2b
Author: Omar Atie <[email protected]>
AuthorDate: Wed Sep 2 22:41:54 2026 -0700
CAMEL-24558: Warn on unconsumed camel.aiObservability.* properties in Main
Camel Main's auto-configuration reports leftover (unconsumed) properties
for groups such as camel.health and camel.errorRegistry, but
camel.aiObservability.* was missing from that pass, so typos like
camel.aiObservability.enable (instead of enabled) were silently ignored.
BaseMainSupport now logs "Property not auto-configured:
camel.aiObservability.<key>=<value>" for any remaining aiObservability
properties, matching the existing pattern. Adds tests covering fail-fast
behavior, unconsumed handling, and properties-file typos.
Closes #26056
Co-authored-by: Omar Atie <[email protected]>
Co-authored-by: Cursor Agent <[email protected]>
---
.../org/apache/camel/main/BaseMainSupport.java | 5 ++
...AiObservabilityConfigurationPropertiesTest.java | 100 +++++++++++++++++++++
.../resources/ai-observability-unknown.properties | 18 ++++
3 files changed, 123 insertions(+)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index b3ac04de54e1..00ec36ad8c97 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -1817,6 +1817,11 @@ public abstract class BaseMainSupport extends
BaseService {
LOG.warn("Property not auto-configured:
camel.errorRegistry.{}={}", k, v);
});
}
+ if (!aiObservabilityProperties.isEmpty()) {
+ aiObservabilityProperties.forEach((k, v) -> {
+ LOG.warn("Property not auto-configured:
camel.aiObservability.{}={}", k, v);
+ });
+ }
if (!devConsoleProperties.isEmpty()) {
devConsoleProperties.forEach((k, v) -> {
LOG.warn("Property not auto-configured:
camel.devConsole.{}={}", k, v);
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/AiObservabilityConfigurationPropertiesTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/AiObservabilityConfigurationPropertiesTest.java
index 9af3f22c4e9a..1518938daec3 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/AiObservabilityConfigurationPropertiesTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/AiObservabilityConfigurationPropertiesTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.camel.main;
+import org.apache.camel.PropertyBindingException;
import org.apache.camel.component.ai.observability.GenAiObservability;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.OrderedLocationProperties;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
class AiObservabilityConfigurationPropertiesTest {
@@ -62,4 +66,100 @@ class AiObservabilityConfigurationPropertiesTest {
main.stop();
}
}
+
+ @Test
+ void shouldLeaveUnknownAiObservabilityPropertyWhenFailFastIsDisabled()
throws Exception {
+ DefaultCamelContext context = new DefaultCamelContext();
+ MainConfigurationProperties mainConfig = new
MainConfigurationProperties();
+ AiObservabilityConfigurationProperties config =
mainConfig.aiObservability();
+ OrderedLocationProperties properties = new OrderedLocationProperties();
+ properties.put("test", "enable", "false");
+ OrderedLocationProperties autoConfiguredProperties = new
OrderedLocationProperties();
+
+ MainHelper.setPropertiesOnTarget(context, config, properties,
"camel.aiObservability.",
+ false, true, autoConfiguredProperties);
+
+ assertThat(properties.asMap()).containsEntry("enable", "false");
+
assertThat(autoConfiguredProperties.asMap()).doesNotContainKey("camel.aiObservability.enable");
+ }
+
+ @Test
+ void
shouldLeaveOnlyUnknownAiObservabilityPropertyWhenKnownPropertyIsPresent()
throws Exception {
+ DefaultCamelContext context = new DefaultCamelContext();
+ MainConfigurationProperties mainConfig = new
MainConfigurationProperties();
+ AiObservabilityConfigurationProperties config =
mainConfig.aiObservability();
+ OrderedLocationProperties properties = new OrderedLocationProperties();
+ properties.put("test", "enabled", "false");
+ properties.put("test", "enable", "true");
+ OrderedLocationProperties autoConfiguredProperties = new
OrderedLocationProperties();
+
+ MainHelper.setPropertiesOnTarget(context, config, properties,
"camel.aiObservability.",
+ false, true, autoConfiguredProperties);
+
+ assertThat(properties.asMap()).containsEntry("enable", "true");
+ assertThat(config.isEnabled()).isFalse();
+
assertThat(autoConfiguredProperties.asMap()).containsEntry("camel.aiObservability.enabled",
"false");
+ }
+
+ @Test
+ void shouldFailFastWhenUnknownAiObservabilityPropertyIsPresent() {
+ Main main = new Main();
+ try {
+ main.addInitialProperty("camel.aiObservability.enable", "true");
+ assertThatThrownBy(main::start)
+ .hasRootCauseInstanceOf(PropertyBindingException.class)
+ .rootCause()
+ .hasMessageContaining("enable");
+ } finally {
+ main.stop();
+ }
+ }
+
+ @Test
+ void shouldIgnoreUnknownAiObservabilityPropertyWhenFailFastIsDisabled()
throws Exception {
+ Main main = new Main();
+ main.configure().withAutoConfigurationFailFast(false);
+ main.addInitialProperty("camel.aiObservability.enabled", "false");
+ main.addInitialProperty("camel.aiObservability.enable", "true");
+
+ main.start();
+
+ try {
+
assertThat(GenAiObservability.isEnabled(main.getCamelContext())).isFalse();
+ } finally {
+ main.stop();
+ }
+ }
+
+ @Test
+ void
shouldIgnoreUnknownAiObservabilityPropertyFromPropertiesFileWhenFailFastIsDisabled()
throws Exception {
+ Main main = new Main();
+ main.configure().withAutoConfigurationFailFast(false);
+
main.setDefaultPropertyPlaceholderLocation("classpath:ai-observability-unknown.properties");
+
+ main.start();
+
+ try {
+
assertThat(GenAiObservability.isEnabled(main.getCamelContext())).isTrue();
+ } finally {
+ main.stop();
+ }
+ }
+
+ @Test
+ void shouldConsumeKnownAiObservabilityPropertyWithoutLeavingItForWarning()
throws Exception {
+ DefaultCamelContext context = new DefaultCamelContext();
+ MainConfigurationProperties mainConfig = new
MainConfigurationProperties();
+ AiObservabilityConfigurationProperties config =
mainConfig.aiObservability();
+ OrderedLocationProperties properties = new OrderedLocationProperties();
+ properties.put("test", "enabled", "false");
+ OrderedLocationProperties autoConfiguredProperties = new
OrderedLocationProperties();
+
+ MainHelper.setPropertiesOnTarget(context, config, properties,
"camel.aiObservability.",
+ false, true, autoConfiguredProperties);
+
+ assertThat(properties.asMap()).isEmpty();
+ assertThat(config.isEnabled()).isFalse();
+
assertThat(autoConfiguredProperties.asMap()).containsEntry("camel.aiObservability.enabled",
"false");
+ }
}
diff --git
a/core/camel-main/src/test/resources/ai-observability-unknown.properties
b/core/camel-main/src/test/resources/ai-observability-unknown.properties
new file mode 100644
index 000000000000..f8225f8fc59b
--- /dev/null
+++ b/core/camel-main/src/test/resources/ai-observability-unknown.properties
@@ -0,0 +1,18 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+# typo: enable instead of enabled
+camel.aiObservability.enable = false
