GH-2082: Fix RecordInterceptor

Resolves #2082

Now that the `earlyRecordInterceptor` is always used unless explicitly disabled,
move delivery attempt header processing earlier so that the header is available
in the interceptor.

**cherry-pick to 2.8.x, 2.7.x**

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java

@@ -2173,16 +2173,28 @@ private ConsumerRecords<K, V> checkEarlyIntercept(ConsumerRecords<K, V> nextArg)
 		}
 
 		@Nullable
-		private ConsumerRecord<K, V> checkEarlyIntercept(ConsumerRecord<K, V> nextArg) {
-			ConsumerRecord<K, V> next = nextArg;
+		private ConsumerRecord<K, V> checkEarlyIntercept(ConsumerRecord<K, V> recordArg) {
+			deliveryAttemptHeader(recordArg);
+			ConsumerRecord<K, V> record = recordArg;
 			if (this.earlyRecordInterceptor != null) {
-				next = this.earlyRecordInterceptor.intercept(next, this.consumer);
-				if (next == null) {
+				record = this.earlyRecordInterceptor.intercept(record, this.consumer);
+				if (record == null) {
 					this.logger.debug(() -> "RecordInterceptor returned null, skipping: "
-						+ ListenerUtils.recordToString(nextArg));
+						+ ListenerUtils.recordToString(recordArg));
 				}
 			}
-			return next;
+			return record;
+		}
+
+		private void deliveryAttemptHeader(final ConsumerRecord<K, V> record) {
+			if (this.deliveryAttemptAware != null) {
+				byte[] buff = new byte[4]; // NOSONAR (magic #)
+				ByteBuffer bb = ByteBuffer.wrap(buff);
+				bb.putInt(this.deliveryAttemptAware
+						.deliveryAttempt(
+								new TopicPartitionOffset(record.topic(), record.partition(), record.offset())));
+				record.headers().add(new RecordHeader(KafkaHeaders.DELIVERY_ATTEMPT, buff));
+			}
 		}
 
 		private void handleNack(final ConsumerRecords<K, V> records, final ConsumerRecord<K, V> record) {
@@ -2304,14 +2316,6 @@ private void invokeOnMessage(final ConsumerRecord<K, V> record) {
 			if (record.key() == null && this.checkNullKeyForExceptions) {
 				checkDeser(record, ErrorHandlingDeserializer.KEY_DESERIALIZER_EXCEPTION_HEADER);
 			}
-			if (this.deliveryAttemptAware != null) {
-				byte[] buff = new byte[4]; // NOSONAR (magic #)
-				ByteBuffer bb = ByteBuffer.wrap(buff);
-				bb.putInt(this.deliveryAttemptAware
-						.deliveryAttempt(
-								new TopicPartitionOffset(record.topic(), record.partition(), record.offset())));
-				record.headers().add(new RecordHeader(KafkaHeaders.DELIVERY_ATTEMPT, buff));
-			}
 			doInvokeOnMessage(record);
 			if (this.nackSleep < 0 && !this.isManualImmediateAck) {
 				ackCurrent(record);

spring-kafka/src/test/java/org/springframework/kafka/listener/SeekToCurrentOnErrorRecordModeTests.java

@@ -124,6 +124,7 @@ public void discardRemainingRecordsFromPollAndSeek() throws Exception {
 		assertThat(this.config.count).isEqualTo(8);
 		assertThat(this.config.contents).contains("foo", "bar", "baz", "qux", "qux", "qux", "fiz", "buz");
 		assertThat(this.config.deliveries).contains(1, 1, 1, 1, 2, 3, 1, 1);
+		assertThat(this.config.deliveryAttempt).isNotNull();
 	}
 
 	@Configuration
@@ -144,6 +145,8 @@ public static class Config {
 
 		int count;
 
+		volatile org.apache.kafka.common.header.Header deliveryAttempt;
+
 		@KafkaListener(groupId = "grp",
 				topicPartitions = @org.springframework.kafka.annotation.TopicPartition(topic = "foo",
 						partitions = "#{'0,1,2'.split(',')}",
@@ -226,6 +229,10 @@ public ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory() {
 			factory.setErrorHandler(new SeekToCurrentErrorHandler());
 			factory.getContainerProperties().setAckMode(AckMode.RECORD);
 			factory.getContainerProperties().setDeliveryAttemptHeader(true);
+			factory.setRecordInterceptor(record -> {
+				Config.this.deliveryAttempt = record.headers().lastHeader(KafkaHeaders.DELIVERY_ATTEMPT);
+				return record;
+			});
 			return factory;
 		}