Skip to content

Commit 3ce3466

Browse files
committed
Renamed metrics as it collides with prometheus reserved names.
1 parent 18491d0 commit 3ce3466

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

examples/grafana/iceberg-metrics-dashboard.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3868,7 +3868,7 @@
38683868
"type": "prometheus",
38693869
"uid": "${datasource}"
38703870
},
3871-
"expr": "sum by (table) (rate(ice_maintenance_compaction_files_created_total[$__rate_interval]))",
3871+
"expr": "sum by (table) (rate(ice_maintenance_compaction_output_files_total[$__rate_interval]))",
38723872
"legendFormat": "Created - {{table}}",
38733873
"refId": "B"
38743874
}

ice-rest-catalog/src/main/java/com/altinity/ice/rest/catalog/internal/maintenance/DataCompaction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ private void merge(
262262

263263
// Record metrics after successful commit
264264
maintenanceMetrics.recordCompactionFilesMerged(tableName, dataFiles.size());
265-
maintenanceMetrics.recordCompactionFileCreated(tableName);
265+
maintenanceMetrics.recordCompactionOutputFile(tableName);
266266
maintenanceMetrics.recordCompactionBytesWritten(tableName, dataFileSizeInBytes);
267267
}
268268
}

ice-rest-catalog/src/main/java/com/altinity/ice/rest/catalog/internal/maintenance/MaintenanceScheduler.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,20 @@ private void scheduleNextMaintenance() {
7575
}
7676

7777
public void performMaintenance() {
78-
MaintenanceMetrics metrics = MaintenanceMetrics.getInstance();
79-
80-
if (isMaintenanceMode.get()) {
81-
logger.info("Skipping maintenance task as system is already in maintenance mode");
82-
metrics.recordMaintenanceSkipped();
83-
return;
84-
}
8578

8679
long startTime = System.nanoTime();
8780
boolean success = false;
88-
81+
MaintenanceMetrics metrics = null;
8982
try {
83+
84+
metrics = MaintenanceMetrics.getInstance();
85+
86+
if (isMaintenanceMode.get()) {
87+
logger.info("Skipping maintenance task as system is already in maintenance mode");
88+
metrics.recordMaintenanceSkipped();
89+
return;
90+
}
91+
9092
logger.info("Starting scheduled maintenance task");
9193
setMaintenanceMode(true);
9294
metrics.recordMaintenanceStarted();
@@ -100,7 +102,9 @@ public void performMaintenance() {
100102
} finally {
101103
setMaintenanceMode(false);
102104
double durationSecs = (System.nanoTime() - startTime) / 1_000_000_000.0;
103-
metrics.recordMaintenanceCompleted(success, durationSecs);
105+
if (metrics != null) {
106+
metrics.recordMaintenanceCompleted(success, durationSecs);
107+
}
104108
}
105109
}
106110

ice-rest-catalog/src/main/java/com/altinity/ice/rest/catalog/internal/metrics/MaintenanceMetrics.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ public class MaintenanceMetrics {
7474
"ice_maintenance_compaction_files_merged_total";
7575
private static final String COMPACTION_FILES_MERGED_TOTAL_HELP = "Total input files merged";
7676

77-
private static final String COMPACTION_FILES_CREATED_TOTAL_NAME =
78-
"ice_maintenance_compaction_files_created_total";
79-
private static final String COMPACTION_FILES_CREATED_TOTAL_HELP =
80-
"Total output files created after merge";
77+
private static final String COMPACTION_OUTPUT_FILES_TOTAL_NAME =
78+
"ice_maintenance_compaction_output_files_total";
79+
private static final String COMPACTION_OUTPUT_FILES_TOTAL_HELP =
80+
"Total output files produced after merge";
8181

8282
private static final String COMPACTION_BYTES_READ_TOTAL_NAME =
8383
"ice_maintenance_compaction_bytes_read_total";
@@ -108,7 +108,7 @@ public class MaintenanceMetrics {
108108

109109
// Data Compaction
110110
private final Counter compactionFilesMergedTotal;
111-
private final Counter compactionFilesCreatedTotal;
111+
private final Counter compactionOutputFilesTotal;
112112
private final Counter compactionBytesReadTotal;
113113
private final Counter compactionBytesWrittenTotal;
114114

@@ -189,10 +189,10 @@ private MaintenanceMetrics() {
189189
.labelNames(LABEL_TABLE)
190190
.register();
191191

192-
this.compactionFilesCreatedTotal =
192+
this.compactionOutputFilesTotal =
193193
Counter.builder()
194-
.name(COMPACTION_FILES_CREATED_TOTAL_NAME)
195-
.help(COMPACTION_FILES_CREATED_TOTAL_HELP)
194+
.name(COMPACTION_OUTPUT_FILES_TOTAL_NAME)
195+
.help(COMPACTION_OUTPUT_FILES_TOTAL_HELP)
196196
.labelNames(LABEL_TABLE)
197197
.register();
198198

@@ -249,8 +249,8 @@ public void recordCompactionFilesMerged(String table, int count) {
249249
compactionFilesMergedTotal.labelValues(table).inc(count);
250250
}
251251

252-
public void recordCompactionFileCreated(String table) {
253-
compactionFilesCreatedTotal.labelValues(table).inc();
252+
public void recordCompactionOutputFile(String table) {
253+
compactionOutputFilesTotal.labelValues(table).inc();
254254
}
255255

256256
public void recordCompactionBytesRead(String table, long bytes) {

0 commit comments

Comments
 (0)