Skip to content

Fix tracing observation handlers not registered due to auto-configuration ordering #5756

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

Open
JadenKim-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix tracing observation handlers not registered due to auto-configuration ordering #5756

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
3 changes: 2 additions & 1 deletion ...a/org/springframework/ai/model/chat/client/autoconfigure/ChatClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
* @author Jonatan Ivanov
* @since 1.0.0
*/
@AutoConfiguration
@AutoConfiguration(
afterName = "org.springframework.boot.micrometer.tracing.autoconfigure.MicrometerTracingAutoConfiguration")
@ConditionalOnClass(ChatClient.class)
@EnableConfigurationProperties(ChatClientBuilderProperties.class)
@ConditionalOnProperty(prefix = ChatClientBuilderProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
Expand Down
8 changes: 5 additions & 3 deletions ...ngframework/ai/model/chat/observation/autoconfigure/ChatObservationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@
* @since 1.0.0
*/
// afterName: CompositeMeterRegistryAutoConfiguration declares a MeterRegistry bean that
// some beans here are conditional on
@AutoConfiguration(
afterName = "org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration")
// some beans here are conditional on. MicrometerTracingAutoConfiguration depends on a
// Tracer bean, ensuring @ConditionalOnBean(Tracer.class) in nested configurations works
@AutoConfiguration(afterName = {
"org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration",
"org.springframework.boot.micrometer.tracing.autoconfigure.MicrometerTracingAutoConfiguration" })
@ConditionalOnClass(ChatModel.class)
@EnableConfigurationProperties(ChatObservationProperties.class)
public class ChatObservationAutoConfiguration {
Expand Down
3 changes: 2 additions & 1 deletion ...framework/ai/model/image/observation/autoconfigure/ImageObservationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
* @author Jonatan Ivanov
* @since 1.0.0
*/
@AutoConfiguration
@AutoConfiguration(
afterName = "org.springframework.boot.micrometer.tracing.autoconfigure.MicrometerTracingAutoConfiguration")
@ConditionalOnClass(ImageModel.class)
@EnableConfigurationProperties(ImageObservationProperties.class)
public class ImageObservationAutoConfiguration {
Expand Down
3 changes: 2 additions & 1 deletion ...ork/ai/vectorstore/observation/autoconfigure/VectorStoreObservationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
* @author Jonatan Ivanov
* @since 1.0.0
*/
@AutoConfiguration
@AutoConfiguration(
afterName = "org.springframework.boot.micrometer.tracing.autoconfigure.MicrometerTracingAutoConfiguration")
@ConditionalOnClass(VectorStore.class)
@EnableConfigurationProperties(VectorStoreObservationProperties.class)
public class VectorStoreObservationAutoConfiguration {
Expand Down