From 715f39ff3baab340e5d681d74697140c88a7874e Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Mon, 22 Jun 2020 12:32:26 -0400
Subject: [PATCH] GH-1214: Fix NPE When no Container id or Bean name

Resolves https://github.com/spring-projects/spring-amqp/issues/1214

Micrometer throws an NPE.
---
 .../rabbit/listener/AbstractMessageListenerContainer.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
index 7e05cf9a..bd2a683a 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
@@ -1144,7 +1144,11 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor
 		try {
 			if (this.micrometerHolder == null && MICROMETER_PRESENT && this.micrometerEnabled
 					&& this.applicationContext != null) {
-				this.micrometerHolder = new MicrometerHolder(this.applicationContext, getListenerId(),
+				String id = getListenerId();
+				if (id == null) {
+					id = "no_id_or_beanName";
+				}
+				this.micrometerHolder = new MicrometerHolder(this.applicationContext, id,
 						this.micrometerTags);
 			}
 		}