lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Register tenant metrics only if there is TenantResolver (#2347)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-04-09 11:35:15 +03:00
committed by GitHub
parent 5e209bfecc
commit c1b7723c0f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantMetricsConfiguration.java
View File

@@ -51,7 +51,7 @@ public class TenantMetricsConfiguration {
@ConditionalOnProperty(name = "hawkbit.metrics.tenancy.web.enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnProperty(name = "hawkbit.metrics.tenancy.web.enabled", havingValue = "true", matchIfMissing = true)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
@ConditionalOnClass(name = { "org.springframework.web.servlet.DispatcherServlet", "io.micrometer.observation.Observation" }) @ConditionalOnClass(name = { "org.springframework.web.servlet.DispatcherServlet", "io.micrometer.observation.Observation" })
@ConditionalOnBean(ObservationRegistry.class) @ConditionalOnBean({ ObservationRegistry.class, TenantResolver.class })
public static class WebConfig { public static class WebConfig {
@Bean @Bean
@@ -92,6 +92,7 @@ public class TenantMetricsConfiguration {
@ConditionalOnClass(name = { @ConditionalOnClass(name = {
"io.micrometer.core.instrument.Tag", "io.micrometer.core.instrument.Tag",
"org.springframework.data.repository.core.support.RepositoryMethodInvocationListener.RepositoryMethodInvocation" }) "org.springframework.data.repository.core.support.RepositoryMethodInvocationListener.RepositoryMethodInvocation" })
@ConditionalOnBean(TenantResolver.class)
public static class RepositoryConfig { public static class RepositoryConfig {
@Bean @Bean