Skip to content

Commit 035e0b0

Browse files
kafka_consumer: lowercase Kafka cluster in data streams messages feature (DataDog#20842)
1 parent 1ac7374 commit 035e0b0

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

kafka_consumer/datadog_checks/kafka_consumer/kafka_consumer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def data_streams_live_message(self, highwater_offsets, cluster_id):
418418
config_id = cfg["id"]
419419
if self._messages_have_been_retrieved(config_id):
420420
continue
421-
if cluster != cluster_id:
421+
if not cluster or not cluster_id or cluster.lower() != cluster_id.lower():
422422
continue
423423
start_offsets = resolve_start_offsets(highwater_offsets, topic, partition, start_offset, n_messages)
424424

kafka_consumer/tests/test_unit.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ def fake_consumer_offsets_for_times(partitions):
2626
return [(t, p, 80) for t, p in partitions]
2727

2828

29-
def seed_mock_client():
29+
def seed_mock_client(cluster_id="cluster_id"):
3030
"""Set some common defaults for the mock client to kafka."""
3131
client = mock.create_autospec(KafkaClient)
3232
client.list_consumer_groups.return_value = ["consumer_group1"]
3333
client.get_partitions_for_topic.return_value = ['partition1']
3434
client.list_consumer_group_offsets.return_value = [("consumer_group1", [("topic1", "partition1", 2)])]
3535
client.describe_consumer_group.return_value = 'STABLE'
3636
client.consumer_get_cluster_id_and_list_topics.return_value = (
37-
"cluster_id",
37+
cluster_id,
3838
# topics
3939
[
4040
# Used in unit tets
@@ -618,7 +618,7 @@ def test_data_streams_messages(
618618
}
619619
),
620620
)
621-
mock_client = seed_mock_client()
621+
mock_client = seed_mock_client(cluster_id="Cluster_id")
622622
mock_client.get_next_message.side_effect = [
623623
MockedMessage(
624624
b'{"name": "Peter Parker", "age": 18, "transaction_amount": 123, "currency": "dollar"}',

0 commit comments

Comments
 (0)