KAFKA-17846 ClientTelemetryReporter does not log trace-level message (a…

…pache#17570) Reviewers: Apoorv Mittal <[email protected]>, Chia-Ping Tsai <[email protected]>
chiacyu · Nov 30, 2024 · e9785b1 · e9785b1
1 parent 267a0c9
commit e9785b1
Showing 1 changed file 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
@@ -324,8 +324,6 @@ public long timeToNextUpdate(long requestTimeoutMs) {
 
             final long timeMs;
             final String apiName;
-            final String msg;
-            final boolean isTraceEnabled = log.isTraceEnabled();
 
             switch (localState) {
                 case SUBSCRIPTION_IN_PROGRESS:
@@ -337,35 +335,31 @@ public long timeToNextUpdate(long requestTimeoutMs) {
                     */
                     apiName = (localState == ClientTelemetryState.SUBSCRIPTION_IN_PROGRESS) ? ApiKeys.GET_TELEMETRY_SUBSCRIPTIONS.name : ApiKeys.PUSH_TELEMETRY.name;
                     timeMs = requestTimeoutMs;
-                    msg = isTraceEnabled ? "" : String.format("the remaining wait time for the %s network API request, as specified by %s", apiName, CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG);
+                    log.trace("For telemetry state {}, returning the value {} ms; the remaining wait time for the {} network API request, as specified by {}", localState, timeMs, apiName, CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG);
                     break;
                 case TERMINATING_PUSH_IN_PROGRESS:
                     timeMs = Long.MAX_VALUE;
-                    msg = isTraceEnabled ? "" : "the terminating push is in progress, disabling telemetry for further requests";
+                    log.trace("For telemetry state {}, returning the value {} ms; the terminating push is in progress, disabling telemetry for further requests", localState, timeMs);
                     break;
                 case TERMINATING_PUSH_NEEDED:
                     timeMs = 0;
-                    msg = isTraceEnabled ? "" : String.format("the client should try to submit the final %s network API request ASAP before closing", ApiKeys.PUSH_TELEMETRY.name);
+                    log.trace("For telemetry state {}, returning the value {} ms; the client should try to submit the final {} network API request ASAP before closing", localState, timeMs, ApiKeys.PUSH_TELEMETRY.name);
                     break;
                 case SUBSCRIPTION_NEEDED:
                 case PUSH_NEEDED:
                     apiName = (localState == ClientTelemetryState.SUBSCRIPTION_NEEDED) ? ApiKeys.GET_TELEMETRY_SUBSCRIPTIONS.name : ApiKeys.PUSH_TELEMETRY.name;
                     long timeRemainingBeforeRequest = localLastRequestMs + localIntervalMs - nowMs;
                     if (timeRemainingBeforeRequest <= 0) {
                         timeMs = 0;
-                        msg = isTraceEnabled ? "" : String.format("the wait time before submitting the next %s network API request has elapsed", apiName);
+                        log.trace("For telemetry state {}, returning the value {} ms; the wait time before submitting the next {} network API request has elapsed", localState, timeMs, apiName);
                     } else {
                         timeMs = timeRemainingBeforeRequest;
-                        msg = isTraceEnabled ? "" : String.format("the client will wait before submitting the next %s network API request", apiName);
+                        log.trace("For telemetry state {}, returning the value {} ms; the client will wait before submitting the next {} network API request", localState, timeMs, apiName);
                     }
                     break;
                 default:
                     throw new IllegalStateException("Unknown telemetry state: " + localState);
             }
-
-            if (isTraceEnabled) {
-                log.trace("For telemetry state {}, returning the value {} ms; {}", localState, timeMs, msg);
-            }
             return timeMs;
         }