atiaomar1978-hub commented on code in PR #1918:
URL:
https://github.com/apache/camel-spring-boot/pull/1918#discussion_r3889904070
##########
core/camel-spring-boot/pom.xml:
##########
@@ -94,6 +94,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-health</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-ai-observability-api</artifactId>
Review Comment:
Done — removed the mandatory `camel-ai-observability-api` dependency from
`core/camel-spring-boot/pom.xml` and moved the auto-configuration into a new
`components-starter/camel-ai-observability-starter` module. Users opt in by
adding the starter dependency, matching the `camel-opentelemetry2-starter`
precedent.
_AI-generated on behalf of atiaomar1978-hub_
##########
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aiobservability/CamelAiObservabilityAutoConfiguration.java:
##########
@@ -0,0 +1,64 @@
+/*
+ * 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.spring.boot.aiobservability;
+
+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.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.context.properties.bind.Bindable;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
+
+@AutoConfiguration(after = CamelAutoConfiguration.class)
+@ConditionalOnBean(CamelAutoConfiguration.class)
+@EnableConfigurationProperties(CamelAiObservabilityConfigurationProperties.class)
+public class CamelAiObservabilityAutoConfiguration {
+
+ @Bean
+ GenAiObservabilityConfigurer genAiObservabilityConfigurer(
+ CamelContext camelContext, Environment environment,
PropertiesComponent propertiesComponent) {
+ propertiesComponent.setCamelContext(camelContext);
+ camelContext.setPropertiesComponent(propertiesComponent);
Review Comment:
Done — removed the redundant `setCamelContext` / `setPropertiesComponent`
calls. `CamelAutoConfiguration.doConfigureCamelContext()` already wires the
singleton `PropertiesComponent` during bootstrap.
_AI-generated on behalf of atiaomar1978-hub_
##########
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aiobservability/CamelAiObservabilityAutoConfiguration.java:
##########
@@ -0,0 +1,64 @@
+/*
+ * 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.spring.boot.aiobservability;
+
+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.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.context.properties.bind.Bindable;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
+
+@AutoConfiguration(after = CamelAutoConfiguration.class)
+@ConditionalOnBean(CamelAutoConfiguration.class)
+@EnableConfigurationProperties(CamelAiObservabilityConfigurationProperties.class)
+public class CamelAiObservabilityAutoConfiguration {
+
+ @Bean
+ GenAiObservabilityConfigurer genAiObservabilityConfigurer(
+ CamelContext camelContext, Environment environment,
PropertiesComponent propertiesComponent) {
+ propertiesComponent.setCamelContext(camelContext);
+ camelContext.setPropertiesComponent(propertiesComponent);
+ applyEnabledProperty(camelContext, resolveEnabled(environment));
+ return new GenAiObservabilityConfigurer();
+ }
+
+ static final class GenAiObservabilityConfigurer {
+ // marker bean
+ }
+
+ static boolean resolveEnabled(Environment environment) {
+ Boolean canonical =
environment.getProperty(GenAiObservabilityProperties.ENABLED, Boolean.class);
+ if (canonical != null) {
+ return canonical;
+ }
+ return Binder.get(environment)
+ .bind("camel.aiobservability",
Bindable.of(CamelAiObservabilityConfigurationProperties.class))
+ .map(CamelAiObservabilityConfigurationProperties::isEnabled)
+ .orElse(true);
+ }
+
+ static void applyEnabledProperty(CamelContext camelContext, boolean
enabled) {
+ PropertiesComponent pc = (PropertiesComponent)
camelContext.getPropertiesComponent();
+ pc.addOverrideProperty(GenAiObservabilityProperties.ENABLED,
Boolean.toString(enabled));
Review Comment:
Done — switched from `addOverrideProperty` to writing into the
PropertiesComponent local properties via `local.setProperty(...)`, matching
camel-main's `BaseMainSupport` (CAMEL-23861). Tests now assert
`getLocalProperties()` instead of `getOverrideProperties()`.
_AI-generated on behalf of atiaomar1978-hub_
##########
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aiobservability/CamelAiObservabilityAutoConfiguration.java:
##########
@@ -0,0 +1,64 @@
+/*
+ * 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.spring.boot.aiobservability;
+
+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.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.context.properties.bind.Bindable;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
+
+@AutoConfiguration(after = CamelAutoConfiguration.class)
+@ConditionalOnBean(CamelAutoConfiguration.class)
+@EnableConfigurationProperties(CamelAiObservabilityConfigurationProperties.class)
+public class CamelAiObservabilityAutoConfiguration {
+
+ @Bean
+ GenAiObservabilityConfigurer genAiObservabilityConfigurer(
+ CamelContext camelContext, Environment environment,
PropertiesComponent propertiesComponent) {
+ propertiesComponent.setCamelContext(camelContext);
+ camelContext.setPropertiesComponent(propertiesComponent);
+ applyEnabledProperty(camelContext, resolveEnabled(environment));
+ return new GenAiObservabilityConfigurer();
+ }
+
+ static final class GenAiObservabilityConfigurer {
+ // marker bean
+ }
Review Comment:
Done — replaced the marker bean with a `CamelContextConfiguration` bean that
applies the enabled flag in `beforeApplicationStart()`. This follows the
standard Spring Boot Camel pattern for context customization.
_AI-generated on behalf of atiaomar1978-hub_
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
