SpringCloud/stream-applications
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

micromter: revert a SI related fix for Boot 3.7

Browse Source
This commit is contained in:
Christian Tzolov
2020-12-11 18:22:28 +01:00
parent a48e4d0faf
commit e4016caaae
2 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
applications/stream-applications-core/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/IntegrationMetricsAutoConfiguration.java
View File

@@ -1,43 +0,0 @@
/*
* Copyright 2012-2020 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.cloud.stream.app.micrometer.common;
import io.micrometer.core.instrument.MeterRegistry;
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
import org.springframework.context.annotation.Configuration;
/**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Integration's metrics.
* Orders auto-configuration classes to ensure that the {@link MeterRegistry} bean has
* been defined before Spring Integration's Micrometer support queries the bean factory
* for it.
*
* @author Andy Wilkinson
* @since 2.3.6
*/
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
@AutoConfigureBefore(IntegrationAutoConfiguration.class)
@Configuration(proxyBeanMethods = false)
public class IntegrationMetricsAutoConfiguration {
}

3
applications/stream-applications-core/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories
View File

@@ -1,3 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.stream.app.micrometer.common.CloudFoundryMicrometerCommonTags, \
org.springframework.cloud.stream.app.micrometer.common.IntegrationMetricsAutoConfiguration
org.springframework.cloud.stream.app.micrometer.common.CloudFoundryMicrometerCommonTags