From a97c2df92d2d8f890f6e19843f9afced50603a96 Mon Sep 17 00:00:00 2001
From: Rafia Khatri <rkhatri@linkedin.com>
Date: Thu, 2 Sep 2021 11:46:55 -0700
Subject: [PATCH] [LI-HOTFIX] Improve unofficial client log message and add
 more default software names

TICKET = N/A
EXIT_CRITERIA = N/A

Add client's software name and version to log message.

Add software names for Admin client to default software names list config.
---
 core/src/main/scala/kafka/server/KafkaApis.scala   | 6 ++++--
 core/src/main/scala/kafka/server/KafkaConfig.scala | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/main/scala/kafka/server/KafkaApis.scala b/core/src/main/scala/kafka/server/KafkaApis.scala
index 745df47eb82f..f3d5459e74cf 100644
--- a/core/src/main/scala/kafka/server/KafkaApis.scala
+++ b/core/src/main/scala/kafka/server/KafkaApis.scala
@@ -1696,11 +1696,13 @@ class KafkaApis(val requestChannel: RequestChannel,
 
     if (config.unofficialClientLoggingEnable) {
       // Check if the last part of clientSoftwareName (after commitId) is an unexpected software name
-      val softwareName = apiVersionRequest.data.clientSoftwareName().split("-").last
+      val softwareNameAndCommit = apiVersionRequest.data.clientSoftwareName()
+      val softwareName = softwareNameAndCommit.split("-").last
       if (!config.expectedClientSoftwareNames.contains(softwareName)) {
+        val softwareVersion = apiVersionRequest.data.clientSoftwareVersion()
         val clientIdentity = request.context.clientId() + " " + request.context.clientAddress() + " " + request.context.principal()
         unofficialClientsCache.get(clientIdentity)
-        warn(s"received ApiVersionsRequest from user with unofficial client type. clientId clientAddress principal = $clientIdentity")
+        warn(s"received ApiVersionsRequest from user with unofficial client software name. clientSoftwareName = $softwareNameAndCommit. clientSoftwareVersion = $softwareVersion. clientId clientAddress principal = $clientIdentity")
       }
     }
 
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index 49454ea88568..5e8035c90326 100755
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -78,7 +78,8 @@ object Defaults {
     "AvroKafkaConsumerFactory", "AvroKafkaConsumerFactoryFactory", "AvroKafkaProducerFactory", "AvroKafkaProducerFactoryFactory",
     "RawKafkaConsumerFactory", "RawKafkaConsumerFactoryFactory", "RawKafkaProducerFactory", "RawKafkaProducerFactoryFactory",
     "AvroKafkaProducerBuilder", "AvroKafkaConsumerBuilder", "RawKafkaProducerBuilder", "RawKafkaConsumerBuilder",
-    "TrackerProcessorFactory", "TrackingConsumerFactory", "TrackingProducerFactory")
+    "TrackerProcessorFactory", "TrackingConsumerFactory", "TrackingProducerFactory",
+    "AdminKafkaClientFactory", "AdminKafkaClientFactoryFactory", "AdminClientBuilder")
 
   /************* Authorizer Configuration ***********/
   val AuthorizerClassName = ""