Skip to content

KAFKA-9788: Use distinct names for transaction and group load time se… #8784

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

Merged
hachikuji merged 2 commits into from
Jun 4, 2020
Merged

KAFKA-9788: Use distinct names for transaction and group load time se… #8784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82ada93
KAFKA-9788: Use distinct names for transaction and group load time se…
bob-barrett Jun 2, 2020
68127ae
Add group metrics constants
bob-barrett Jun 2, 2020
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
11 changes: 7 additions & 4 deletions core/src/main/scala/kafka/coordinator/group/GroupMetadataManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ import org.apache.kafka.common.requests.{OffsetCommitRequest, OffsetFetchRespons
import org.apache.kafka.common.utils.{Time, Utils}
import org.apache.kafka.common.{KafkaException, TopicPartition}

import scala.jdk.CollectionConverters._
import scala.collection._
import scala.collection.mutable.ArrayBuffer
import scala.jdk.CollectionConverters._

class GroupMetadataManager(brokerId: Int,
interBrokerProtocolVersion: ApiVersion,
Expand Down Expand Up @@ -89,13 +89,13 @@ class GroupMetadataManager(brokerId: Int,
private val openGroupsForProducer = mutable.HashMap[Long, mutable.Set[String]]()

/* setup metrics*/
val partitionLoadSensor = metrics.sensor("PartitionLoadTime")
private val partitionLoadSensor = metrics.sensor(GroupMetadataManager.LoadTimeSensor)

partitionLoadSensor.add(metrics.metricName("partition-load-time-max",
"group-coordinator-metrics",
GroupMetadataManager.MetricsGroup,
"The max time it took to load the partitions in the last 30sec"), new Max())
partitionLoadSensor.add(metrics.metricName("partition-load-time-avg",
"group-coordinator-metrics",
GroupMetadataManager.MetricsGroup,
"The avg time it took to load the partitions in the last 30sec"), new Avg())

val offsetCommitsSensor = metrics.sensor("OffsetCommits")
Expand Down Expand Up @@ -992,6 +992,9 @@ class GroupMetadataManager(brokerId: Int,
* -> value version 0: [protocol_type, generation, protocol, leader, members]
*/
object GroupMetadataManager {
// Metrics names
val MetricsGroup: String = "group-coordinator-metrics"
val LoadTimeSensor: String = "GroupPartitionLoadTime"

private val CURRENT_OFFSET_KEY_SCHEMA_VERSION = 1.toShort
private val CURRENT_GROUP_KEY_SCHEMA_VERSION = 2.toShort
Expand Down
9 changes: 6 additions & 3 deletions core/src/main/scala/kafka/coordinator/transaction/TransactionStateManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ object TransactionStateManager {
val DefaultTransactionalIdExpirationMs: Int = TimeUnit.DAYS.toMillis(7).toInt
val DefaultAbortTimedOutTransactionsIntervalMs: Int = TimeUnit.SECONDS.toMillis(10).toInt
val DefaultRemoveExpiredTransactionalIdsIntervalMs: Int = TimeUnit.HOURS.toMillis(1).toInt

val MetricsGroup: String = "transaction-coordinator-metrics"
val LoadTimeSensor: String = "TransactionsPartitionLoadTime"
}

/**
Expand Down Expand Up @@ -95,13 +98,13 @@ class TransactionStateManager(brokerId: Int,
private val transactionTopicPartitionCount = getTransactionTopicPartitionCount

/** setup metrics*/
private val partitionLoadSensor = metrics.sensor("PartitionLoadTime")
private val partitionLoadSensor = metrics.sensor(TransactionStateManager.LoadTimeSensor)

partitionLoadSensor.add(metrics.metricName("partition-load-time-max",
"transaction-coordinator-metrics",
TransactionStateManager.MetricsGroup,
"The max time it took to load the partitions in the last 30sec"), new Max())
partitionLoadSensor.add(metrics.metricName("partition-load-time-avg",
"transaction-coordinator-metrics",
TransactionStateManager.MetricsGroup,
"The avg time it took to load the partitions in the last 30sec"), new Avg())

// visible for testing only
Expand Down