From c3d0b9c43a1d88c1fe084c5f6e950611d7ea7cfa Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 24 Jan 2020 13:58:33 +0100
Subject: [PATCH 1/4] Upgrade to Micrometer 1.1.10

Closes gh-19639
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 304f8e5a14..fd536f61c8 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -133,7 +133,7 @@
 		<logback.version>1.2.3</logback.version>
 		<lombok.version>1.18.10</lombok.version>
 		<mariadb.version>2.3.0</mariadb.version>
-		<micrometer.version>1.1.9</micrometer.version>
+		<micrometer.version>1.1.10</micrometer.version>
 		<mimepull.version>1.9.12</mimepull.version>
 		<mockito.version>2.23.4</mockito.version>
 		<mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version>

From 51dfd528bd6de6ecb0d3d2c1a35fe0c0e3fd463c Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Fri, 24 Jan 2020 00:25:25 +0900
Subject: [PATCH 2/4] Close TomcatMetrics on shutdown for cleanup

See micrometer-metrics/micrometer#1424
See gh-19880
---
 .../metrics/web/tomcat/TomcatMetricsBinder.java     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
index 689c41cdca..6a8a2bea6f 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
@@ -25,6 +25,7 @@ import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Manager;
 
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.boot.web.context.WebServerApplicationContext;
 import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
@@ -38,12 +39,14 @@ import org.springframework.context.ApplicationListener;
  * @author Andy Wilkinson
  * @since 2.1.0
  */
-public class TomcatMetricsBinder implements ApplicationListener<ApplicationStartedEvent> {
+public class TomcatMetricsBinder implements ApplicationListener<ApplicationStartedEvent>, DisposableBean {
 
 	private final MeterRegistry meterRegistry;
 
 	private final Iterable<Tag> tags;
 
+	private volatile TomcatMetrics tomcatMetrics;
+
 	public TomcatMetricsBinder(MeterRegistry meterRegistry) {
 		this(meterRegistry, Collections.emptyList());
 	}
@@ -57,7 +60,8 @@ public class TomcatMetricsBinder implements ApplicationListener<ApplicationStart
 	public void onApplicationEvent(ApplicationStartedEvent event) {
 		ApplicationContext applicationContext = event.getApplicationContext();
 		Manager manager = findManager(applicationContext);
-		new TomcatMetrics(manager, this.tags).bindTo(this.meterRegistry);
+		this.tomcatMetrics = new TomcatMetrics(manager, this.tags);
+		this.tomcatMetrics.bindTo(this.meterRegistry);
 	}
 
 	private Manager findManager(ApplicationContext applicationContext) {
@@ -80,4 +84,9 @@ public class TomcatMetricsBinder implements ApplicationListener<ApplicationStart
 		return null;
 	}
 
+	@Override
+	public void destroy() {
+		this.tomcatMetrics.close();
+	}
+
 }

From 7fd8cce46580f101bf0eb74df3d1a227b8b50c46 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 24 Jan 2020 14:07:53 +0100
Subject: [PATCH 3/4] Polish "Close TomcatMetrics on shutdown for cleanup"

See gh-19880
---
 .../boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
index 6a8a2bea6f..688692ff79 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * 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.

From ddcc52a085ff50e0ec2fb35a8ebf0bf393e13bcc Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 24 Jan 2020 14:11:14 +0100
Subject: [PATCH 4/4] Upgrade to Micrometer 1.3.3

Closes gh-19645
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 7b8be6e784..584585a73f 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -151,7 +151,7 @@
 		<logback.version>1.2.3</logback.version>
 		<lombok.version>1.18.10</lombok.version>
 		<mariadb.version>2.4.4</mariadb.version>
-		<micrometer.version>1.3.2</micrometer.version>
+		<micrometer.version>1.3.3</micrometer.version>
 		<mimepull.version>1.9.12</mimepull.version>
 		<mockito.version>3.1.0</mockito.version>
 		<mongo-driver-reactivestreams.version>1.12.0</mongo-driver-reactivestreams.version>