Skip to content

Commit 31bc8c4

Browse files
sobychackomarkpollack
sobychacko
authored and
markpollack
committed
Migrate vector store observation autoconfiguration to dedicated module
Update the vector store starters with the new observation autoconfig dependency Other maven configuraiton changes Signed-off-by: Soby Chacko <soby.chacko@broadcom.com>
1 parent fd1f0d9 commit 31bc8c4

File tree

29 files changed

+210
-141
lines changed

29 files changed

+210
-141
lines changed

‎auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/pom.xml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2023-2025 the original author or authors.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ https://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xmlns="http://maven.apache.org/POM/4.0.0"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>org.springframework.ai</groupId>
24+
<artifactId>spring-ai</artifactId>
25+
<version>1.0.0-SNAPSHOT</version>
26+
<relativePath>../../../pom.xml</relativePath>
27+
</parent>
28+
<artifactId>spring-ai-autoconfigure-vector-store-observation</artifactId>
29+
<packaging>jar</packaging>
30+
<name>Spring AI Auto Configuration for vector store observation</name>
31+
<description>Spring AI Auto Configuration for vector store observation</description>
32+
<url>https://github.com/spring-projects/spring-ai</url>
33+
34+
<scm>
35+
<url>https://github.com/spring-projects/spring-ai</url>
36+
<connection>git://github.com/spring-projects/spring-ai.git</connection>
37+
<developerConnection>git@github.com:spring-projects/spring-ai.git</developerConnection>
38+
</scm>
39+
40+
<dependencies>
41+
<dependency>
42+
<groupId>org.springframework.ai</groupId>
43+
<artifactId>spring-ai-core</artifactId>
44+
<version>${project.parent.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.micrometer</groupId>
48+
<artifactId>micrometer-tracing-bridge-otel</artifactId>
49+
<optional>true</optional>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.springframework.boot</groupId>
53+
<artifactId>spring-boot-starter</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.springframework.boot</groupId>
57+
<artifactId>spring-boot-configuration-processor</artifactId>
58+
<optional>true</optional>
59+
</dependency>
60+
<!-- test dependencies -->
61+
<dependency>
62+
<groupId>org.springframework.ai</groupId>
63+
<artifactId>spring-ai-test</artifactId>
64+
<version>${project.parent.version}</version>
65+
<scope>test</scope>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.springframework.boot</groupId>
69+
<artifactId>spring-boot-starter-test</artifactId>
70+
<scope>test</scope>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.awaitility</groupId>
74+
<artifactId>awaitility</artifactId>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.springframework.ai</groupId>
79+
<artifactId>spring-ai-transformers</artifactId>
80+
<version>${project.parent.version}</version>
81+
<scope>test</scope>
82+
</dependency>
83+
<dependency>
84+
<groupId>io.micrometer</groupId>
85+
<artifactId>micrometer-observation-test</artifactId>
86+
<scope>test</scope>
87+
</dependency>
88+
</dependencies>
89+
</project>

‎spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/observation/VectorStoreObservationAutoConfiguration.java renamed to ‎auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/src/main/java/org/springframework/ai/vectorstore/observation/autoconfigure/VectorStoreObservationAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.ai.autoconfigure.vectorstore.observation;
17+
package org.springframework.ai.vectorstore.observation.autoconfigure;
1818

1919
import io.micrometer.tracing.otel.bridge.OtelTracer;
2020
import org.slf4j.Logger;

‎spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/observation/VectorStoreObservationProperties.java renamed to ‎auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/src/main/java/org/springframework/ai/vectorstore/observation/autoconfigure/VectorStoreObservationProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.ai.autoconfigure.vectorstore.observation;
17+
package org.springframework.ai.vectorstore.observation.autoconfigure;
1818

1919
import org.springframework.boot.context.properties.ConfigurationProperties;
2020

‎auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Copyright 2025-2025 the original author or authors.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
org.springframework.ai.vectorstore.observation.autoconfigure.VectorStoreObservationAutoConfiguration

‎spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/observation/VectorStoreObservationAutoConfigurationTests.java renamed to ‎auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/src/test/java/org/springframework/ai/vectorstore/observation/autoconfigure/VectorStoreObservationAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.ai.autoconfigure.vectorstore.observation;
17+
package org.springframework.ai.vectorstore.observation.autoconfigure;
1818

1919
import io.micrometer.tracing.otel.bridge.OtelCurrentTraceContext;
2020
import io.micrometer.tracing.otel.bridge.OtelTracer;

‎pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<module>auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-mongodb-atlas</module>
7979
<module>auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-neo4j</module>
8080
<module>auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-opensearch</module>
81+
<module>auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation</module>
8182
<module>auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-oracle</module>
8283
<module>auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-pinecone</module>
8384
<module>auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-qdrant</module>

‎spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/observation/package-info.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎spring-ai-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ org.springframework.ai.model.zhipuai.autoconfigure.ZhiPuAiAutoConfiguration
3737
org.springframework.ai.model.chat.client.autoconfigure.ChatClientAutoConfiguration
3838
org.springframework.ai.autoconfigure.zhipuai.ZhiPuAiAutoConfiguration
3939
org.springframework.ai.autoconfigure.chat.client.ChatClientAutoConfiguration
40-
org.springframework.ai.vectorstore.opensearch.autoconfigure.OpenSearchVectorStoreAutoConfiguration
4140
org.springframework.ai.model.moonshot.autoconfigure.MoonshotAutoConfiguration
4241
org.springframework.ai.model.qianfan.autoconfigure.QianFanAutoConfiguration
4342
org.springframework.ai.model.minimax.autoconfigure.MiniMaxAutoConfiguration

‎spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/observation/ObservationTestUtil.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎spring-ai-spring-boot-starters/spring-ai-starter-vector-store-aws-opensearch/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,25 @@
3636
</scm>
3737

3838
<dependencies>
39-
4039
<dependency>
4140
<groupId>org.springframework.boot</groupId>
4241
<artifactId>spring-boot-starter</artifactId>
4342
</dependency>
44-
4543
<dependency>
4644
<groupId>org.springframework.ai</groupId>
4745
<artifactId>spring-ai-autoconfigure-vector-store-opensearch</artifactId>
4846
<version>${project.parent.version}</version>
4947
</dependency>
50-
48+
<dependency>
49+
<groupId>org.springframework.ai</groupId>
50+
<artifactId>spring-ai-autoconfigure-vector-store-observation</artifactId>
51+
<version>${project.parent.version}</version>
52+
</dependency>
5153
<dependency>
5254
<groupId>org.springframework.ai</groupId>
5355
<artifactId>spring-ai-opensearch-store</artifactId>
5456
<version>${project.parent.version}</version>
5557
</dependency>
56-
5758
<dependency>
5859
<groupId>software.amazon.awssdk</groupId>
5960
<artifactId>apache-client</artifactId>

0 commit comments

Comments
 (0)