remove cache headers due to race condition

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
webdevops · May 10, 2021 · b6619bb · b6619bb
1 parent e4efdcd
commit b6619bb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/azure_insights.go b/azure_insights.go
@@ -99,7 +99,7 @@ func (m *AzureInsightMetrics) azureResponseInsepector(subscriptionId string) aut
 	}
 }
 
-func (m *AzureInsightMetrics) ListResources(ctx context.Context, logger *log.Entry, subscriptionId, filter string, w http.ResponseWriter) ([]AzureResource, error) {
+func (m *AzureInsightMetrics) ListResources(ctx context.Context, logger *log.Entry, subscriptionId, filter string) ([]AzureResource, error) {
 	var cacheDuration *time.Duration
 	cacheKey := ""
 
@@ -118,7 +118,6 @@ func (m *AzureInsightMetrics) ListResources(ctx context.Context, logger *log.Ent
 			if cacheData, ok := v.([]byte); ok {
 				if err := json.Unmarshal(cacheData, &resourceList); err == nil {
 					logger.Debug("fetched servicediscovery from cache")
-					w.Header().Add("X-servicediscovery-cached", "true")
 					return resourceList, nil
 				} else {
 					logger.Debug("unable to parse cached servicediscovery")
@@ -152,7 +151,6 @@ func (m *AzureInsightMetrics) ListResources(ctx context.Context, logger *log.Ent
 	if cacheDuration != nil {
 		logger.Debug("saving servicedisccovery to cache")
 		if cacheData, err := json.Marshal(resourceList); err == nil {
-			w.Header().Add("X-servicediscovery-cached-until", time.Now().Add(*cacheDuration).Format(time.RFC3339))
 			azureCache.Set(cacheKey, cacheData, *cacheDuration)
 			logger.Debugf("saved servicediscovery to cache for %s", cacheDuration.String())
 		}

diff --git a/probe_metrics_list.go b/probe_metrics_list.go
@@ -62,7 +62,7 @@ func probeMetricsListHandler(w http.ResponseWriter, r *http.Request) {
 				wgResource := sizedwaitgroup.New(opts.Prober.ConcurrencySubscriptionResource)
 
 				// fetch list of resources
-				list, err := azureInsightMetrics.ListResources(ctx, contextLogger, subscription, settings.Filter, w)
+				list, err := azureInsightMetrics.ListResources(ctx, contextLogger, subscription, settings.Filter)
 				if err != nil {
 					contextLogger.Errorln(err)
 					http.Error(w, err.Error(), http.StatusBadRequest)

diff --git a/probe_metrics_scrape.go b/probe_metrics_scrape.go
@@ -75,7 +75,7 @@ func probeMetricsScrapeHandler(w http.ResponseWriter, r *http.Request) {
 				defer wg.Done()
 				wgResource := sizedwaitgroup.New(opts.Prober.ConcurrencySubscriptionResource)
 
-				list, err := azureInsightMetrics.ListResources(ctx, contextLogger, subscription, settings.Filter, w)
+				list, err := azureInsightMetrics.ListResources(ctx, contextLogger, subscription, settings.Filter)
 				if err != nil {
 					contextLogger.Errorln(err)
 					http.Error(w, err.Error(), http.StatusBadRequest)