Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LI-HOTFIX] Make the msgSendLatencySensor non-static #500

Merged
merged 1 commit into from
Dec 22, 2023
Merged

[LI-HOTFIX] Make the msgSendLatencySensor non-static #500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public class KafkaProducer<K, V> implements Producer<K, V> {
private static final String JMX_PREFIX = "kafka.producer";
public static final String NETWORK_THREAD_PREFIX = "kafka-producer-network-thread";
public static final String PRODUCER_METRIC_GROUP_NAME = "producer-metrics";
private static Sensor msgSendLatencySensor = null;
private final Sensor msgSendLatencySensor;

private final String clientId;
// Visible for testing
Expand Down Expand Up @@ -982,7 +982,7 @@ private Future<RecordMetadata> doSend(ProducerRecord<K, V> record, Callback call
log.trace("Attempting to append record {} with callback {} to topic {} partition {}", record, callback, record.topic(), partition);
}
// producer callback will make sure to call both 'callback' and interceptor callback
Callback interceptCallback = new InterceptorCallback<>(callback, startTime, time, this.interceptors, tp);
Callback interceptCallback = new InterceptorCallback<>(callback, this.interceptors, tp, startTime, time, this.msgSendLatencySensor);

if (transactionManager != null && transactionManager.isTransactional()) {
transactionManager.failIfNotReadyForSend();
Expand All @@ -999,7 +999,7 @@ private Future<RecordMetadata> doSend(ProducerRecord<K, V> record, Callback call
log.trace("Retrying append due to new batch creation for topic {} partition {}. The old partition was {}", record.topic(), partition, prevPartition);
}
// producer callback will make sure to call both 'callback' and interceptor callback
interceptCallback = new InterceptorCallback<>(callback, startTime, time, this.interceptors, tp);
interceptCallback = new InterceptorCallback<>(callback, this.interceptors, tp, startTime, time, this.msgSendLatencySensor);

result = accumulator.append(tp, timestamp, serializedKey,
serializedValue, headers, interceptCallback, remainingWaitMs, false, nowMs);
Expand Down Expand Up @@ -1366,9 +1366,6 @@ private static class ClusterAndWaitTime {
}
}

public static void recordMsgProducingLatency(long start, long now) {
msgSendLatencySensor.record(now - start, now);
}

private static class FutureFailure implements Future<RecordMetadata> {

Expand Down Expand Up @@ -1416,16 +1413,20 @@ private static class InterceptorCallback<K, V> implements Callback {
private final Time time;
private final long startTime;

private InterceptorCallback(Callback userCallback, ProducerInterceptors<K, V> interceptors, TopicPartition tp) {
this(userCallback, Long.MIN_VALUE, null, interceptors, tp);
}
private final Sensor msgSendLatencySensor;


private InterceptorCallback(Callback userCallback, long startTime, Time time, ProducerInterceptors<K, V> interceptors, TopicPartition tp) {
private InterceptorCallback(Callback userCallback, ProducerInterceptors<K, V> interceptors, TopicPartition tp, long startTime, Time time, Sensor msgSendLatencySensor) {
this.userCallback = userCallback;
this.interceptors = interceptors;
this.tp = tp;
this.time = time;
this.startTime = startTime;
this.msgSendLatencySensor = msgSendLatencySensor;
}

public void recordMsgProducingLatency(long start, long now) {
msgSendLatencySensor.record(now - start, now);
}

public void onCompletion(RecordMetadata metadata, Exception exception) {
Expand Down
Loading