Skip to content

Commit 09b5b59

Browse files
nikhilsinhaparseablenikhilsinhaparseable
committed
remove unused metrics
1 parent b87431f commit 09b5b59

File tree

4 files changed

+1
-242
lines changed

4 files changed

+1
-242
lines changed

‎src/metadata.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ use crate::handlers::TelemetryType;
2929
use crate::metrics::{
3030
EVENTS_INGESTED, EVENTS_INGESTED_DATE, EVENTS_INGESTED_SIZE, EVENTS_INGESTED_SIZE_DATE,
3131
EVENTS_STORAGE_SIZE_DATE, LIFETIME_EVENTS_INGESTED, LIFETIME_EVENTS_INGESTED_SIZE,
32-
TOTAL_EVENTS_INGESTED_DATE, TOTAL_EVENTS_INGESTED_SIZE_DATE,
3332
};
3433
use crate::storage::StreamType;
3534
use crate::storage::retention::Retention;
@@ -60,12 +59,6 @@ pub fn update_stats(
6059
LIFETIME_EVENTS_INGESTED_SIZE
6160
.with_label_values(&[stream_name, origin])
6261
.add(size as i64);
63-
TOTAL_EVENTS_INGESTED_DATE
64-
.with_label_values(&[origin, &parsed_date])
65-
.add(num_rows as i64);
66-
TOTAL_EVENTS_INGESTED_SIZE_DATE
67-
.with_label_values(&[origin, &parsed_date])
68-
.add(size as i64);
6962
}
7063

7164
/// In order to support backward compatability with streams created before v1.6.4,

‎src/metrics/mod.rs‎

Lines changed: 0 additions & 220 deletions
Original file line numberDiff line numberDiff line change
@@ -158,42 +158,6 @@ pub static EVENTS_STORAGE_SIZE_DATE: Lazy<IntCounterVec> = Lazy::new(|| {
158158
.expect("metric can be created")
159159
});
160160

161-
pub static TOTAL_EVENTS_INGESTED_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
162-
IntGaugeVec::new(
163-
Opts::new(
164-
"total_events_ingested_date",
165-
"total events ingested on a particular date",
166-
)
167-
.namespace(METRICS_NAMESPACE),
168-
&["format", "date"],
169-
)
170-
.expect("metric can be created")
171-
});
172-
173-
pub static TOTAL_EVENTS_INGESTED_SIZE_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
174-
IntGaugeVec::new(
175-
Opts::new(
176-
"total_events_ingested_size_date",
177-
"Total events ingested size in bytes on a particular date",
178-
)
179-
.namespace(METRICS_NAMESPACE),
180-
&["format", "date"],
181-
)
182-
.expect("metric can be created")
183-
});
184-
185-
pub static TOTAL_EVENTS_STORAGE_SIZE_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
186-
IntGaugeVec::new(
187-
Opts::new(
188-
"total_events_storage_size_date",
189-
"Total events storage size in bytes on a particular date",
190-
)
191-
.namespace(METRICS_NAMESPACE),
192-
&["format", "date"],
193-
)
194-
.expect("metric can be created")
195-
});
196-
197161
pub static STAGING_FILES: Lazy<IntGaugeVec> = Lazy::new(|| {
198162
IntGaugeVec::new(
199163
Opts::new("staging_files", "Active Staging files").namespace(METRICS_NAMESPACE),
@@ -357,141 +321,6 @@ pub static TOTAL_OUTPUT_LLM_TOKENS_BY_DATE: Lazy<IntCounterVec> = Lazy::new(|| {
357321
.expect("metric can be created")
358322
});
359323

360-
// Cluster Billing Metrics - Gauge type metrics for cluster-wide aggregated billing data
361-
pub static TOTAL_CLUSTER_EVENTS_INGESTED_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
362-
IntGaugeVec::new(
363-
Opts::new(
364-
"total_cluster_events_ingested_by_date",
365-
"Total cluster events ingested by date (Gauge for cluster billing)",
366-
)
367-
.namespace(METRICS_NAMESPACE),
368-
&["date"],
369-
)
370-
.expect("metric can be created")
371-
});
372-
373-
pub static TOTAL_CLUSTER_EVENTS_INGESTED_SIZE_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
374-
IntGaugeVec::new(
375-
Opts::new(
376-
"total_cluster_events_ingested_size_by_date",
377-
"Total cluster events ingested size in bytes by date (Gauge for cluster billing)",
378-
)
379-
.namespace(METRICS_NAMESPACE),
380-
&["date"],
381-
)
382-
.expect("metric can be created")
383-
});
384-
385-
pub static TOTAL_CLUSTER_PARQUETS_STORED_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
386-
IntGaugeVec::new(
387-
Opts::new(
388-
"total_cluster_parquets_stored_by_date",
389-
"Total cluster parquet files stored by date (Gauge for cluster billing)",
390-
)
391-
.namespace(METRICS_NAMESPACE),
392-
&["date"],
393-
)
394-
.expect("metric can be created")
395-
});
396-
397-
pub static TOTAL_CLUSTER_PARQUETS_STORED_SIZE_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
398-
IntGaugeVec::new(
399-
Opts::new(
400-
"total_cluster_parquets_stored_size_by_date",
401-
"Total cluster parquet files stored size in bytes by date (Gauge for cluster billing)",
402-
)
403-
.namespace(METRICS_NAMESPACE),
404-
&["date"],
405-
)
406-
.expect("metric can be created")
407-
});
408-
409-
pub static TOTAL_CLUSTER_QUERY_CALLS_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
410-
IntGaugeVec::new(
411-
Opts::new(
412-
"total_cluster_query_calls_by_date",
413-
"Total cluster query calls by date (Gauge for cluster billing)",
414-
)
415-
.namespace(METRICS_NAMESPACE),
416-
&["date"],
417-
)
418-
.expect("metric can be created")
419-
});
420-
421-
pub static TOTAL_CLUSTER_FILES_SCANNED_IN_QUERY_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
422-
IntGaugeVec::new(
423-
Opts::new(
424-
"total_cluster_files_scanned_in_query_by_date",
425-
"Total cluster files scanned in queries by date (Gauge for cluster billing)",
426-
)
427-
.namespace(METRICS_NAMESPACE),
428-
&["date"],
429-
)
430-
.expect("metric can be created")
431-
});
432-
433-
pub static TOTAL_CLUSTER_BYTES_SCANNED_IN_QUERY_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
434-
IntGaugeVec::new(
435-
Opts::new(
436-
"total_cluster_bytes_scanned_in_query_by_date",
437-
"Total cluster bytes scanned in queries by date (Gauge for cluster billing)",
438-
)
439-
.namespace(METRICS_NAMESPACE),
440-
&["date"],
441-
)
442-
.expect("metric can be created")
443-
});
444-
445-
pub static TOTAL_CLUSTER_OBJECT_STORE_CALLS_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
446-
IntGaugeVec::new(
447-
Opts::new(
448-
"total_cluster_object_store_calls_by_date",
449-
"Total cluster object store calls by date (Gauge for cluster billing)",
450-
)
451-
.namespace(METRICS_NAMESPACE),
452-
&["provider", "method", "date"],
453-
)
454-
.expect("metric can be created")
455-
});
456-
457-
pub static TOTAL_CLUSTER_FILES_SCANNED_IN_OBJECT_STORE_CALLS_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(
458-
|| {
459-
IntGaugeVec::new(
460-
Opts::new(
461-
"total_cluster_files_scanned_in_object_store_calls_by_date",
462-
"Total cluster files scanned in object store calls by date (Gauge for cluster billing)",
463-
)
464-
.namespace(METRICS_NAMESPACE),
465-
&["provider", "method", "date"],
466-
)
467-
.expect("metric can be created")
468-
},
469-
);
470-
471-
pub static TOTAL_CLUSTER_INPUT_LLM_TOKENS_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
472-
IntGaugeVec::new(
473-
Opts::new(
474-
"total_cluster_input_llm_tokens_by_date",
475-
"Total cluster input LLM tokens used by date (Gauge for cluster billing)",
476-
)
477-
.namespace(METRICS_NAMESPACE),
478-
&["provider", "model", "date"],
479-
)
480-
.expect("metric can be created")
481-
});
482-
483-
pub static TOTAL_CLUSTER_OUTPUT_LLM_TOKENS_BY_DATE: Lazy<IntGaugeVec> = Lazy::new(|| {
484-
IntGaugeVec::new(
485-
Opts::new(
486-
"total_cluster_output_llm_tokens_by_date",
487-
"Total cluster output LLM tokens used by date (Gauge for cluster billing)",
488-
)
489-
.namespace(METRICS_NAMESPACE),
490-
&["provider", "model", "date"],
491-
)
492-
.expect("metric can be created")
493-
});
494-
495324
pub static STORAGE_REQUEST_RESPONSE_TIME: Lazy<HistogramVec> = Lazy::new(|| {
496325
HistogramVec::new(
497326
HistogramOpts::new("storage_request_response_time", "Storage Request Latency")
@@ -538,15 +367,6 @@ fn custom_metrics(registry: &Registry) {
538367
registry
539368
.register(Box::new(EVENTS_STORAGE_SIZE_DATE.clone()))
540369
.expect("metric can be registered");
541-
registry
542-
.register(Box::new(TOTAL_EVENTS_INGESTED_DATE.clone()))
543-
.expect("metric can be registered");
544-
registry
545-
.register(Box::new(TOTAL_EVENTS_INGESTED_SIZE_DATE.clone()))
546-
.expect("metric can be registered");
547-
registry
548-
.register(Box::new(TOTAL_EVENTS_STORAGE_SIZE_DATE.clone()))
549-
.expect("metric can be registered");
550370
registry
551371
.register(Box::new(STAGING_FILES.clone()))
552372
.expect("metric can be registered");
@@ -595,46 +415,6 @@ fn custom_metrics(registry: &Registry) {
595415
registry
596416
.register(Box::new(TOTAL_OUTPUT_LLM_TOKENS_BY_DATE.clone()))
597417
.expect("metric can be registered");
598-
// Register cluster billing metrics
599-
registry
600-
.register(Box::new(TOTAL_CLUSTER_EVENTS_INGESTED_BY_DATE.clone()))
601-
.expect("metric can be registered");
602-
registry
603-
.register(Box::new(TOTAL_CLUSTER_EVENTS_INGESTED_SIZE_BY_DATE.clone()))
604-
.expect("metric can be registered");
605-
registry
606-
.register(Box::new(TOTAL_CLUSTER_PARQUETS_STORED_BY_DATE.clone()))
607-
.expect("metric can be registered");
608-
registry
609-
.register(Box::new(TOTAL_CLUSTER_PARQUETS_STORED_SIZE_BY_DATE.clone()))
610-
.expect("metric can be registered");
611-
registry
612-
.register(Box::new(TOTAL_CLUSTER_QUERY_CALLS_BY_DATE.clone()))
613-
.expect("metric can be registered");
614-
registry
615-
.register(Box::new(
616-
TOTAL_CLUSTER_FILES_SCANNED_IN_QUERY_BY_DATE.clone(),
617-
))
618-
.expect("metric can be registered");
619-
registry
620-
.register(Box::new(
621-
TOTAL_CLUSTER_BYTES_SCANNED_IN_QUERY_BY_DATE.clone(),
622-
))
623-
.expect("metric can be registered");
624-
registry
625-
.register(Box::new(TOTAL_CLUSTER_OBJECT_STORE_CALLS_BY_DATE.clone()))
626-
.expect("metric can be registered");
627-
registry
628-
.register(Box::new(
629-
TOTAL_CLUSTER_FILES_SCANNED_IN_OBJECT_STORE_CALLS_BY_DATE.clone(),
630-
))
631-
.expect("metric can be registered");
632-
registry
633-
.register(Box::new(TOTAL_CLUSTER_INPUT_LLM_TOKENS_BY_DATE.clone()))
634-
.expect("metric can be registered");
635-
registry
636-
.register(Box::new(TOTAL_CLUSTER_OUTPUT_LLM_TOKENS_BY_DATE.clone()))
637-
.expect("metric can be registered");
638418
registry
639419
.register(Box::new(STORAGE_REQUEST_RESPONSE_TIME.clone()))
640420
.expect("metric can be registered");

‎src/stats.rs‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ use crate::metrics::{
2929
DELETED_EVENTS_STORAGE_SIZE, EVENTS_DELETED, EVENTS_DELETED_SIZE, EVENTS_INGESTED,
3030
EVENTS_INGESTED_DATE, EVENTS_INGESTED_SIZE, EVENTS_INGESTED_SIZE_DATE,
3131
EVENTS_STORAGE_SIZE_DATE, LIFETIME_EVENTS_INGESTED, LIFETIME_EVENTS_INGESTED_SIZE,
32-
LIFETIME_EVENTS_STORAGE_SIZE, STORAGE_SIZE, TOTAL_EVENTS_INGESTED_DATE,
33-
TOTAL_EVENTS_INGESTED_SIZE_DATE, TOTAL_EVENTS_STORAGE_SIZE_DATE,
32+
LIFETIME_EVENTS_STORAGE_SIZE, STORAGE_SIZE,
3433
};
3534
use crate::storage::{ObjectStorage, ObjectStorageError, ObjectStoreFormat};
3635

@@ -141,15 +140,6 @@ pub async fn update_deleted_stats(
141140
num_row += manifest.events_ingested as i64;
142141
ingestion_size += manifest.ingestion_size as i64;
143142
storage_size += manifest.storage_size as i64;
144-
TOTAL_EVENTS_INGESTED_DATE
145-
.with_label_values(&["json", &manifest_date])
146-
.sub(manifest.events_ingested as i64);
147-
TOTAL_EVENTS_INGESTED_SIZE_DATE
148-
.with_label_values(&["json", &manifest_date])
149-
.sub(manifest.ingestion_size as i64);
150-
TOTAL_EVENTS_STORAGE_SIZE_DATE
151-
.with_label_values(&["parquet", &manifest_date])
152-
.sub(manifest.storage_size as i64);
153143
}
154144
}
155145
EVENTS_DELETED

‎src/storage/object_storage.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ use crate::handlers::http::fetch_schema;
4949
use crate::handlers::http::modal::ingest_server::INGESTOR_EXPECT;
5050
use crate::handlers::http::modal::ingest_server::INGESTOR_META;
5151
use crate::handlers::http::users::{FILTER_DIR, USERS_ROOT_DIR};
52-
use crate::metrics::TOTAL_EVENTS_STORAGE_SIZE_DATE;
5352
use crate::metrics::increment_parquets_stored_by_date;
5453
use crate::metrics::increment_parquets_stored_size_by_date;
5554
use crate::metrics::{EVENTS_STORAGE_SIZE_DATE, LIFETIME_EVENTS_STORAGE_SIZE, STORAGE_SIZE};
@@ -183,9 +182,6 @@ fn update_storage_metrics(
183182
LIFETIME_EVENTS_STORAGE_SIZE
184183
.with_label_values(&["data", stream_name, "parquet"])
185184
.add(compressed_size as i64);
186-
TOTAL_EVENTS_STORAGE_SIZE_DATE
187-
.with_label_values(&["parquet", file_date_part])
188-
.add(compressed_size as i64);
189185

190186
// billing metrics for parquet storage
191187
increment_parquets_stored_by_date(file_date_part);

0 commit comments

Comments
 (0)