Skip to content

fix: remove topic tag conversion hack and update tests #9219

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
Bruno Cadonna (cadonna) merged 1 commit into from
Jun 22, 2022
Merged

fix: remove topic tag conversion hack and update tests #9219

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions ksqldb-engine/src/main/java/io/confluent/ksql/internal/ThroughputMetricsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,6 @@ private Map<String, String> getThroughputTotalMetricTags(
queryMetricTags.remove(StreamsMetricsImpl.TASK_ID_TAG);
queryMetricTags.remove(StreamsMetricsImpl.PROCESSOR_NODE_ID_TAG);

// Convert the tag name from 'topic-name' to 'topic' to conform to client metrics
// We can remove this once the Streams fix is merged https://github.com/apache/kafka/pull/12310
queryMetricTags.remove(StreamsMetricsImpl.TOPIC_NAME_TAG);
queryMetricTags.put(KSQL_TOPIC_TAG, topic);

// Replace thread id with consumer group member id to match existing client tag/Druid label
final String threadId = queryMetricTags.remove(StreamsMetricsImpl.THREAD_ID_TAG);
queryMetricTags.put(KSQL_CONSUMER_GROUP_MEMBER_ID_TAG, threadId);
Expand Down
8 changes: 4 additions & 4 deletions ksqldb-engine/src/test/java/io/confluent/ksql/internal/ThroughputMetricsReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@ public class ThroughputMetricsReporterTest {
"thread-id", THREAD_ID,
"task-id", TASK_ID_1,
"processor-node-id", PROCESSOR_NODE_ID,
"topic-name", TOPIC_NAME
"topic", TOPIC_NAME
);
private static final Map<String, String> STREAMS_TAGS_TASK_2 = ImmutableMap.of(
"thread-id", THREAD_ID,
"task-id", TASK_ID_2,
"processor-node-id", PROCESSOR_NODE_ID,
"topic-name", TOPIC_NAME
"topic", TOPIC_NAME
);
private static final Map<String, String> STREAMS_TAGS_PROCESSOR_2 = ImmutableMap.of(
"thread-id", THREAD_ID,
"task-id", TASK_ID_2,
"processor-node-id", PROCESSOR_NODE_ID_2,
"topic-name", TOPIC_NAME
"topic", TOPIC_NAME
);
private static final Map<String, String> STREAMS_TAGS_TOPIC_2 = ImmutableMap.of(
"thread-id", THREAD_ID_2,
"task-id", TASK_ID_1,
"processor-node-id", PROCESSOR_NODE_ID,
"topic-name", TOPIC_NAME_2
"topic", TOPIC_NAME_2
);
private static final Map<String, String> QUERY_ONE_TAGS = ImmutableMap.of(
"logical_cluster_id", "lksqlc-12345",
Expand Down