Skip to content

Core: close MetricsReporter when RESTSessionCatalog is closed #16310

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
huaxingao merged 1 commit into from
May 14, 2026
+14 −0
Merged

Core: close MetricsReporter when RESTSessionCatalog is closed #16310

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
1 change: 1 addition & 0 deletions core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ public void initialize(String name, Map<String, String> unresolved) {
.toUpperCase(Locale.US));

this.reporter = CatalogUtil.loadMetricsReporter(mergedProps);
this.closeables.addCloseable(reporter);

this.reportingViaRestEnabled =
PropertyUtil.propertyAsBoolean(
Expand Down
13 changes: 13 additions & 0 deletions core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static org.assertj.core.api.Assertions.setMaxStackTraceElementsDisplayed;
import static org.assertj.core.api.Assumptions.assumeThat;

import java.io.Closeable;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Arrays;
Expand Down Expand Up @@ -3233,11 +3234,18 @@ public void testCatalogWithCustomMetricsReporter() throws IOException {
assertThat(CustomMetricsReporter.SCAN_COUNTER.get()).isEqualTo(1);
// reset counter in case subclasses run this test multiple times
CustomMetricsReporter.SCAN_COUNTER.set(0);

CustomMetricsReporter.CLOSE_COUNTER.set(0);
((Closeable) catalogWithCustomReporter).close();
assertThat(CustomMetricsReporter.CLOSE_COUNTER.get())
.as("Catalog.close() must propagate to the configured MetricsReporter")
.isEqualTo(1);
}

public static class CustomMetricsReporter implements MetricsReporter {
static final AtomicInteger SCAN_COUNTER = new AtomicInteger(0);
static final AtomicInteger COMMIT_COUNTER = new AtomicInteger(0);
static final AtomicInteger CLOSE_COUNTER = new AtomicInteger(0);

@Override
public void report(MetricsReport report) {
Expand All @@ -3247,6 +3255,11 @@ public void report(MetricsReport report) {
COMMIT_COUNTER.incrementAndGet();
}
}

@Override
public void close() {
CLOSE_COUNTER.incrementAndGet();
}
}

private static void assertEmpty(String context, Catalog catalog, Namespace ns) {
Expand Down