-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GH-3643: Defer MeterRegistry bean dependency
Fixes #3643 The `ImportBeanDefinitionRegistrar` register its bean definition in the early phase. It causes a problem with Spring Boot when an explicit `@EnableIntegrationManagement` is declared: the `MeterRegistry` is provided later on via auto-configuration and `MicrometerMetricsCaptor` has no knowledge about `MeterRegistry` at the `ImportBeanDefinitionRegistrar` phase. * Reworks `MicrometerMetricsCaptorRegistrar` to the `MicrometerMetricsCaptorConfiguration` and use special conditional `MicrometerMetricsCaptorImportSelector` for that `@EnableIntegrationManagement`. This way a `MicrometerMetricsCaptor` `@Bean` consults `ObjectProvider<MeterRegistry>` on its creating time and returns `null` if no `MeterRegistry` beans at all.
- Loading branch information
1 parent
a03af08
commit 72b9e70
Showing
4 changed files
with
59 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
...work/integration/support/management/micrometer/MicrometerMetricsCaptorImportSelector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
* Copyright 2021 the original author or authors. | ||
* | ||
* Licensed 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 | ||
* | ||
* https://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.springframework.integration.support.management.micrometer; | ||
|
||
import org.springframework.context.annotation.ImportSelector; | ||
import org.springframework.core.type.AnnotationMetadata; | ||
|
||
/** | ||
* An {@link ImportSelector} to conditionally add a {@link MicrometerMetricsCaptorConfiguration} | ||
* bean when {@code io.micrometer.core.instrument.MeterRegistry} is present in classpath. | ||
* | ||
* @author Artem Bilan | ||
* | ||
* @since 5.5.5 | ||
*/ | ||
public class MicrometerMetricsCaptorImportSelector implements ImportSelector { | ||
|
||
@Override | ||
public String[] selectImports(AnnotationMetadata importingClassMetadata) { | ||
if (MicrometerMetricsCaptorConfiguration.METER_REGISTRY_PRESENT) { | ||
return new String[]{ MicrometerMetricsCaptorConfiguration.class.getName() }; | ||
} | ||
else { | ||
return new String[0]; | ||
} | ||
} | ||
|
||
} |