Skip to content

Fix: Resolve duplicate bean registrations in observability and step bridge #10

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

Merged
ancongui merged 1 commit into from
Feb 13, 2026
Merged

Fix: Resolve duplicate bean registrations in observability and step bridge #10

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
6 changes: 6 additions & 0 deletions src/main/java/org/fireflyframework/data/config/ObservabilityAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;

Expand All @@ -37,6 +39,7 @@
* Auto-configuration for observability features including tracing, metrics, and health checks.
*/
@AutoConfiguration
@AutoConfigureBefore(DataEnrichmentAutoConfiguration.class)
@ConditionalOnProperty(prefix = "firefly.data.orchestration", name = "enabled", havingValue = "true", matchIfMissing = true)
@Slf4j
public class ObservabilityAutoConfiguration {
Expand All @@ -46,6 +49,7 @@ public class ObservabilityAutoConfiguration {
*/
@Bean
@ConditionalOnClass(ObservationRegistry.class)
@ConditionalOnMissingBean(JobTracingService.class)
@ConditionalOnProperty(prefix = "firefly.data.orchestration.observability", name = "tracing-enabled", havingValue = "true", matchIfMissing = true)
public JobTracingService jobTracingService(ObservationRegistry observationRegistry,
JobOrchestrationProperties properties,
Expand All @@ -66,6 +70,7 @@ public JobTracingService jobTracingService(ObservationRegistry observationRegist
*/
@Bean
@ConditionalOnClass(MeterRegistry.class)
@ConditionalOnMissingBean(JobMetricsService.class)
@ConditionalOnProperty(prefix = "firefly.data.orchestration.observability", name = "metrics-enabled", havingValue = "true", matchIfMissing = true)
public JobMetricsService jobMetricsService(MeterRegistry meterRegistry,
JobOrchestrationProperties properties) {
Expand All @@ -78,6 +83,7 @@ public JobMetricsService jobMetricsService(MeterRegistry meterRegistry,
* Creates the job orchestrator health indicator.
*/
@Bean
@ConditionalOnMissingBean(JobOrchestratorHealthIndicator.class)
@ConditionalOnEnabledHealthIndicator("jobOrchestrator")
@ConditionalOnProperty(prefix = "firefly.data.orchestration.health-check", name = "enabled", havingValue = "true", matchIfMissing = true)
public JobOrchestratorHealthIndicator jobOrchestratorHealthIndicator(
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/fireflyframework/data/config/StepBridgeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.springframework.boot.autoconfigure.AutoConfiguration;
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.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -69,6 +70,7 @@ public class StepBridgeConfiguration {
*/
@Bean
@Primary
@ConditionalOnMissingBean(name = "stepEventPublisherBridge")
public StepEventPublisherBridge stepEventPublisherBridge(
EventPublisherFactory publisherFactory,
StepEventsProperties properties) {
Expand Down