Metrics-ingest-delay bugfix

Signed-off-by: eitah <eli@spantree.net>

README.md

@@ -70,6 +70,7 @@ If you are still using the legacy [Access scopes][access-scopes], the `https://w
 | `monitoring.filters`              | No       |         | Formatted string to allow filtering on certain metrics type |
 | `web.listen-address`              | No       | `:9255` | Address to listen on for web interface and telemetry |
 | `web.telemetry-path`              | No       | `/metrics` | Path under which to expose Prometheus metrics |
+| `monitoring.metrics-ingest-delay` | No       |         | Offsets metric collection by a delay appropriate for each metric type, e.g. because bigquery metrics are slow to appear |
 
 ### Metrics
 

collectors/monitoring_collector.go

@@ -266,6 +266,11 @@ func (c *MonitoringCollector) reportMonitoringMetrics(ch chan<- prometheus.Metri
 						metricDescriptor.Type)
 				}
 
+				if metricDescriptor.DisplayName == "Stored bytes" {
+					fmt.Printf("\n start pre \n %+v \n\n\n\n", startTime.Format(time.RFC3339Nano))
+					fmt.Printf("\n\n end pre \n %+v \n\n\n\n", endTime.Format(time.RFC3339Nano))
+				}
+
 				if c.metricsIngestDelay &&
 					metricDescriptor.Metadata != nil &&
 					metricDescriptor.Metadata.IngestDelay != "" {
@@ -277,10 +282,14 @@ func (c *MonitoringCollector) reportMonitoringMetrics(ch chan<- prometheus.Metri
 						return
 					}
 					level.Debug(c.logger).Log("msg", "adding ingest delay", "descriptor", metricDescriptor.Type, "delay", ingestDelay)
-					endTime.Add(ingestDelayDuration)
-					startTime.Add(ingestDelayDuration)
+					endTime = endTime.Add(ingestDelayDuration * -1)
+					startTime = startTime.Add(ingestDelayDuration * -1)
 				}
 
+				if metricDescriptor.DisplayName == "Stored bytes" {
+					fmt.Printf("\n start post \n %+v \n\n\n\n", startTime.Format(time.RFC3339Nano))
+					fmt.Printf("\n\n end post \n %+v \n\n\n\n", endTime.Format(time.RFC3339Nano))
+				}
 				for _, ef := range c.metricsFilters {
 					if strings.Contains(metricDescriptor.Type, ef.Prefix) {
 						filter = fmt.Sprintf("%s AND (%s)", filter, ef.Modifier)
@@ -356,6 +365,7 @@ func (c *MonitoringCollector) reportMonitoringMetrics(ch chan<- prometheus.Metri
 }
 
 func (c *MonitoringCollector) reportTimeSeriesMetrics(
+
 	page *monitoring.ListTimeSeriesResponse,
 	metricDescriptor *monitoring.MetricDescriptor,
 	ch chan<- prometheus.Metric,