Skip to content

Adapt influxdb-spring to Spring Boot 4 actuator package refactoring #850

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
ChildrenGreens wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adapt influxdb-spring to Spring Boot 4 actuator package refactoring #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b598e18
refactor: Update health indicator imports and upgrade Spring Boot ver…
ChildrenGreens Dec 29, 2025
f8b1d05
Update dependency versions to 8.0.0-SNAPSHOT
ChildrenGreens Mar 5, 2026
852ced4
Restore README.md dependency version to 7.4.0
ChildrenGreens Mar 5, 2026
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
2 changes: 1 addition & 1 deletion client-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-client-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client-kotlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion client-legacy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-client-flux</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client-osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-client-osgi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion client-scala/cross/2.12/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion client-scala/cross/2.13/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion client-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-client-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-client-utils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<properties>
<checkstyle.skip>true</checkstyle.skip>
<influxdb-client.version>7.6.0-SNAPSHOT</influxdb-client.version>
<influxdb-client.version>8.0.0-SNAPSHOT</influxdb-client.version>
</properties>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion flux-dsl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>flux-dsl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion karaf/karaf-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-karaf</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-karaf-assembly</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion karaf/karaf-features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-karaf</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-karaf-features</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions karaf/karaf-kar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-karaf</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-karaf-kar</artifactId>
Expand Down Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>influxdb-karaf-features</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion karaf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>influxdb-karaf</artifactId>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<groupId>com.influxdb</groupId>
<artifactId>influxdb-client</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down Expand Up @@ -538,38 +538,38 @@
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-test</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-core</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-utils</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-reactive</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-flux</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
20 changes: 10 additions & 10 deletions spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@
<parent>
<artifactId>influxdb-client</artifactId>
<groupId>com.influxdb</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>influxdb-spring</artifactId>
<version>7.6.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Spring Integration for InfluxDB 2.x</name>
Expand Down Expand Up @@ -73,7 +72,7 @@

<properties>
<micrometer.version>1.15.2</micrometer.version>
<spring-boot.version>3.5.5</spring-boot.version>
<spring-boot.version>4.0.1</spring-boot.version>
<spring.version>6.1.3</spring.version>
Comment on lines 73 to 76
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spring-boot.version is bumped to 4.0.1, so this module is now pinned to Spring Boot 4.x and will not build against Spring Boot 3.x without additional compatibility work. This contradicts the PR description’s claim that earlier Spring Boot versions are unaffected; please either implement a dual-compat strategy (profiles/separate artifact) or update the PR description/release notes to reflect the breaking change.

Copilot uses AI. Check for mistakes.
</properties>

Expand Down Expand Up @@ -121,15 +120,16 @@

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring-boot.version}</version>
<optional>true</optional>
</dependency>
Comment on lines 121 to +126
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dependency swap here (from actuator autoconfigure to core autoconfigure) is a behavior/packaging change beyond just import updates. Please document this in the PR description (and/or migration notes) so consumers know which Spring Boot modules they must have on the classpath for the health indicator autoconfiguration to activate.

Copilot uses AI. Check for mistakes.

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-health</artifactId>
<version>${spring-boot.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>
Comment on lines +128 to 133
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new spring-boot-health dependency is optional; if the intent is that influxdb-spring provides health support out of the box on Spring Boot 4, consider clarifying in documentation which dependency (actuator vs health) an application must add to actually expose the /health endpoint, since this module alone won’t bring it transitively.

Copilot uses AI. Check for mistakes.

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

import com.influxdb.client.InfluxDBClient;

import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.health.contributor.AbstractHealthIndicator;
import org.springframework.boot.health.contributor.Health;
import org.springframework.boot.health.contributor.HealthIndicator;
Comment on lines +26 to +28
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports hard-switch the health indicator to Spring Boot 4’s new org.springframework.boot.health.* packages, which means the module will no longer compile against Spring Boot 3.x (or earlier). This conflicts with the PR description claiming earlier Spring Boot versions are unaffected; either adjust the compatibility strategy (e.g., separate artifacts/profiles for SB3 vs SB4) or update the PR description/release notes to reflect the breaking change.

Copilot uses AI. Check for mistakes.
import org.springframework.util.Assert;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...g/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
import com.influxdb.client.InfluxDBClient;
import com.influxdb.spring.influx.InfluxDB2AutoConfiguration;

import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.actuate.health.HealthContributor;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.health.autoconfigure.contributor.CompositeHealthContributorConfiguration;
import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.health.contributor.HealthContributor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.influxdb.client.InfluxDBClient;

import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
Expand Down
Loading