Create dedicated delta package, add tests, and rename distribution ->…

… histogram Signed-off-by: Kyle Eckhart <[email protected]>
prometheus-community · Jun 9, 2023 · 95ff3ad · 95ff3ad
1 parent 1ad63c1
commit 95ff3ad
Show file tree

Hide file tree

Showing 11 changed files with 554 additions and 399 deletions.
diff --git a/collectors/delta_counter.go b/collectors/delta_counter.go
diff --git a/collectors/delta_distribution.go b/collectors/delta_distribution.go
diff --git a/collectors/fnv.go b/collectors/fnv.go
@@ -23,13 +23,13 @@ const (
 	prime64  = 1099511628211
 )
 
-// hashNew initializies a new fnv64a hash value.
-func hashNew() uint64 {
+// HashNew initializies a new fnv64a hash value.
+func HashNew() uint64 {
 	return offset64
 }
 
-// hashAdd adds a string to a fnv64a hash value, returning the updated hash.
-func hashAdd(h uint64, s string) uint64 {
+// HashAdd adds a string to a fnv64a hash value, returning the updated hash.
+func HashAdd(h uint64, s string) uint64 {
 	for i := 0; i < len(s); i++ {
 		h ^= uint64(s[i])
 		h *= prime64

diff --git a/collectors/monitoring_collector.go b/collectors/monitoring_collector.go
@@ -54,8 +54,8 @@ type MonitoringCollector struct {
 	collectorFillMissingLabels      bool
 	monitoringDropDelegatedProjects bool
 	logger                          log.Logger
-	deltaCounterStore               DeltaCounterStore
-	deltaDistributionStore          DeltaDistributionStore
+	counterStore                    DeltaCounterStore
+	histogramStore                  DeltaHistogramStore
 	aggregateDeltas                 bool
 	descriptorCache                 DescriptorCache
 }
@@ -110,7 +110,17 @@ func (d *googleDescriptorCache) Store(prefix string, data []*monitoring.MetricDe
 	d.inner.Store(prefix, data)
 }
 
-func NewMonitoringCollector(projectID string, monitoringService *monitoring.Service, opts MonitoringCollectorOptions, logger log.Logger, counterStore DeltaCounterStore, distributionStore DeltaDistributionStore) (*MonitoringCollector, error) {
+type DeltaCounterStore interface {
+	Increment(metricDescriptor *monitoring.MetricDescriptor, currentValue *ConstMetric)
+	ListMetrics(metricDescriptorName string) []*ConstMetric
+}
+
+type DeltaHistogramStore interface {
+	Increment(metricDescriptor *monitoring.MetricDescriptor, currentValue *HistogramMetric)
+	ListMetrics(metricDescriptorName string) []*HistogramMetric
+}
+
+func NewMonitoringCollector(projectID string, monitoringService *monitoring.Service, opts MonitoringCollectorOptions, logger log.Logger, counterStore DeltaCounterStore, histogramStore DeltaHistogramStore) (*MonitoringCollector, error) {
 	const subsystem = "monitoring"
 
 	apiCallsTotalMetric := prometheus.NewCounter(
@@ -200,8 +210,8 @@ func NewMonitoringCollector(projectID string, monitoringService *monitoring.Serv
 		collectorFillMissingLabels:      opts.FillMissingLabels,
 		monitoringDropDelegatedProjects: opts.DropDelegatedProjects,
 		logger:                          logger,
-		deltaCounterStore:               counterStore,
-		deltaDistributionStore:          distributionStore,
+		counterStore:                    counterStore,
+		histogramStore:                  histogramStore,
 		aggregateDeltas:                 opts.AggregateDeltas,
 		descriptorCache:                 descriptorCache,
 	}
@@ -401,8 +411,8 @@ func (c *MonitoringCollector) reportTimeSeriesMetrics(
 	timeSeriesMetrics, err := NewTimeSeriesMetrics(metricDescriptor,
 		ch,
 		c.collectorFillMissingLabels,
-		c.deltaCounterStore,
-		c.deltaDistributionStore,
+		c.counterStore,
+		c.histogramStore,
 		c.aggregateDeltas,
 	)
 	if err != nil {