[MINOR-PR] Enable telemetry APIs and logs suppression (KIP-714) (#14928)

PR removes tag to mark API unstable in request json. Suppresses couple of failed telemetry API logs as those unnecessary appear when telemetry is not supported on broker. Reviewers: Walker Carlson <[email protected]>, Andrew Schofield <[email protected]>
apache · Dec 6, 2023 · a05a0d7 · a05a0d7
1 parent 4a958c6
commit a05a0d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/...ts/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporter.java b/...ts/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporter.java
@@ -517,13 +517,13 @@ public void handleResponse(PushTelemetryResponse response) {
 
         @Override
         public void handleFailedGetTelemetrySubscriptionsRequest(KafkaException maybeFatalException) {
-            log.warn("The broker generated an error for the get telemetry network API request", maybeFatalException);
+            log.debug("The broker generated an error for the get telemetry network API request", maybeFatalException);
             handleFailedRequest(maybeFatalException != null);
         }
 
         @Override
         public void handleFailedPushTelemetryRequest(KafkaException maybeFatalException) {
-            log.warn("The broker generated an error for the push telemetry network API request", maybeFatalException);
+            log.debug("The broker generated an error for the push telemetry network API request", maybeFatalException);
             handleFailedRequest(maybeFatalException != null);
         }
 
@@ -825,7 +825,8 @@ private void handleFailedRequest(boolean shouldWait) {
                     return;
                 }
                 if (state != ClientTelemetryState.SUBSCRIPTION_IN_PROGRESS && state != ClientTelemetryState.PUSH_IN_PROGRESS) {
-                    log.warn("Could not transition state after failed telemetry from state {}", state);
+                    log.warn("Could not transition state after failed telemetry from state {}, disabling telemetry", state);
+                    updateErrorResult(Integer.MAX_VALUE, nowMs);
                     return;
                 }
 
@@ -837,6 +838,7 @@ private void handleFailedRequest(boolean shouldWait) {
                 if (shouldWait) {
                     updateErrorResult(DEFAULT_PUSH_INTERVAL_MS, nowMs);
                 } else {
+                    log.warn("Received unrecoverable error from broker, disabling telemetry");
                     updateErrorResult(Integer.MAX_VALUE, nowMs);
                 }
 

diff --git a/clients/src/main/resources/common/message/GetTelemetrySubscriptionsRequest.json b/clients/src/main/resources/common/message/GetTelemetrySubscriptionsRequest.json
@@ -20,10 +20,6 @@
   "name": "GetTelemetrySubscriptionsRequest",
   "validVersions": "0",
   "flexibleVersions": "0+",
-  // The Telemetry APIs are added as part of KIP-714 and are still under
-  // development. Hence, the APIs are not exposed by default unless explicitly
-  // enabled.
-  "latestVersionUnstable": true,
   "fields": [
     {
       "name": "ClientInstanceId", "type": "uuid", "versions": "0+",

diff --git a/clients/src/main/resources/common/message/PushTelemetryRequest.json b/clients/src/main/resources/common/message/PushTelemetryRequest.json
@@ -20,10 +20,6 @@
   "name": "PushTelemetryRequest",
   "validVersions": "0",
   "flexibleVersions": "0+",
-  // The Telemetry APIs are added as part of KIP-714 and are still under
-  // development. Hence, the APIs are not exposed by default unless explicitly
-  // enabled.
-  "latestVersionUnstable": true,
   "fields": [
     {
       "name": "ClientInstanceId", "type": "uuid", "versions": "0+",