From 4e51249daa0c285cc6cdc7e4b5edb56632ae8192 Mon Sep 17 00:00:00 2001
From: Christian Tzolov <christian.tzolov@gmail.com>
Date: Tue, 17 Nov 2020 16:05:09 +0100
Subject: [PATCH] Workaround for SI metrics configuration issue

 - This is a workaround until https://github.com/spring-projects/spring-boot/pull/24095 makes it to the Spring Boot (e.g. Spring Boot 2.5+)
 - Without this fix the Spring Integration metics are not property configured and as such not sent to the Wavefront TSDB!
 - All Spring Boot 2.4 apps will be affected by this problem and would require to add the following dependency as a workaround:
   org.springframework.cloud.stream.app:stream-applications-micrometer-common:3.+
---
 .../IntegrationMetricsAutoConfiguration.java  | 43 +++++++++++++++++++
 .../main/resources/META-INF/spring.factories  |  3 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 applications/stream-applications-core/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/IntegrationMetricsAutoConfiguration.java

diff --git a/applications/stream-applications-core/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/IntegrationMetricsAutoConfiguration.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/IntegrationMetricsAutoConfiguration.java
new file mode 100644
index 00000000..3f0af607
--- /dev/null
+++ b/applications/stream-applications-core/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/IntegrationMetricsAutoConfiguration.java
@@ -0,0 +1,43 @@
+/*
+ * 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 {
+
+}
diff --git a/applications/stream-applications-core/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories
index 4000e773..e4b2ca9f 100644
--- a/applications/stream-applications-core/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories
+++ b/applications/stream-applications-core/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.stream.app.micrometer.common.CloudFoundryMicrometerCommonTags
+org.springframework.cloud.stream.app.micrometer.common.CloudFoundryMicrometerCommonTags, \
+org.springframework.cloud.stream.app.micrometer.common.IntegrationMetricsAutoConfiguration