Skip to content

[FLUSS-3415][client] Add per-scanner dimension for scanner metrics #3534

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

Open
Jackeyzhe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[FLUSS-3415][client] Add per-scanner dimension for scanner metrics #3534

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: 5 additions & 0 deletions fluss-client/src/main/java/org/apache/fluss/client/metrics/ScannerMetricGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.fluss.rpc.metrics.ClientMetricGroup;

import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;

import static org.apache.fluss.metrics.utils.MetricGroupUtils.makeScope;

Expand All @@ -41,8 +42,10 @@ public class ScannerMetricGroup extends AbstractMetricGroup {

private static final String NAME = "scanner";
private static final int WINDOW_SIZE = 1024;
private static final AtomicLong NEXT_SCANNER_ID = new AtomicLong();

private final TablePath tablePath;
private final String scannerId;

private final Counter fetchRequestCount;
private final Histogram bytesPerRequest;
Expand All @@ -61,6 +64,7 @@ public class ScannerMetricGroup extends AbstractMetricGroup {
public ScannerMetricGroup(ClientMetricGroup parent, TablePath tablePath) {
super(parent.getMetricRegistry(), makeScope(parent, NAME), parent);
this.tablePath = tablePath;
this.scannerId = Long.toString(NEXT_SCANNER_ID.getAndIncrement());

fetchRequestCount = new ThreadSafeSimpleCounter();
meter(MetricNames.SCANNER_FETCH_RATE, new MeterView(fetchRequestCount));
Expand Down Expand Up @@ -131,5 +135,6 @@ protected String getGroupName(CharacterFilter filter) {
protected final void putVariables(Map<String, String> variables) {
variables.put("database", tablePath.getDatabaseName());
variables.put("table", tablePath.getTableName());
variables.put("scanner_id", scannerId);
}
}
27 changes: 27 additions & 0 deletions fluss-client/src/test/java/org/apache/fluss/client/metrics/TestingScannerMetricGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@
package org.apache.fluss.client.metrics;

import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.rpc.metrics.ClientMetricGroup;
import org.apache.fluss.rpc.metrics.TestingClientMetricGroup;

import org.junit.jupiter.api.Test;

import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;

/** The testing metric group for scanner. */
public class TestingScannerMetricGroup extends ScannerMetricGroup {

Expand All @@ -32,4 +39,24 @@ public TestingScannerMetricGroup() {
public static TestingScannerMetricGroup newInstance() {
return new TestingScannerMetricGroup();
}

@Test
void testScannerMetricGroupContainsScannerIdDimension() {
ClientMetricGroup clientMetricGroup = TestingClientMetricGroup.newInstance();
ScannerMetricGroup scannerMetricGroup1 =
new ScannerMetricGroup(clientMetricGroup, TABLE_PATH);
ScannerMetricGroup scannerMetricGroup2 =
new ScannerMetricGroup(clientMetricGroup, TABLE_PATH);
Map<String, String> variables1 = scannerMetricGroup1.getAllVariables();
Map<String, String> variables2 = scannerMetricGroup2.getAllVariables();
assertThat(variables1)
.containsEntry("database", "db")
.containsEntry("table", "table")
.containsKey("scanner_id");
assertThat(variables2)
.containsEntry("database", "db")
.containsEntry("table", "table")
.containsKey("scanner_id");
assertThat(variables1.get("scanner_id")).isNotEqualTo("scanner_id");
}
}
Loading