fix

Author: rashmichandrashekar

.chloggen/fix-keepequal-dropequal.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: target allocator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix for keepequal/dropequal action
+
+# One or more tracking issues related to the change
+issues: [2793]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

cmd/otel-allocator/server/server.go

@@ -120,8 +120,44 @@ func (s *Server) UpdateScrapeConfigResponse(configs map[string]*promconfig.Scrap
 	if err != nil {
 		return err
 	}
+
+	var jobToScrapeConfig map[string]interface{}
+	err = json.Unmarshal(jsonConfig, &jobToScrapeConfig)
+	if jobToScrapeConfig != nil {
+		for _, scrapeConfig := range jobToScrapeConfig {
+			scrapeConfig := scrapeConfig.(map[string]interface{})
+			if scrapeConfig["relabel_configs"] != nil {
+				relabelConfigs := scrapeConfig["relabel_configs"].([]interface{})
+				for _, relabelConfig := range relabelConfigs {
+					relabelConfig := relabelConfig.(map[string]interface{})
+					// Dropping regex key from the map since unmarshalling this on the client(metrics_receiver.go) results in error
+					// because of the bug here - https://github.com/prometheus/prometheus/issues/12534
+					if relabelConfig["action"] == "keepequal" || relabelConfig["action"] == "dropequal" {
+						delete(relabelConfig, "regex")
+					}
+				}
+			}
+			if scrapeConfig["metric_relabel_configs"] != nil {
+				metricRelabelConfigs := scrapeConfig["metric_relabel_configs"].([]interface{})
+				for _, metricRelabelConfig := range metricRelabelConfigs {
+					metricRelabelConfig := metricRelabelConfig.(map[string]interface{})
+					// Dropping regex key from the map since unmarshalling this on the client(metrics_receiver.go) results in error
+					// because of the bug here - https://github.com/prometheus/prometheus/issues/12534
+					if metricRelabelConfig["action"] == "keepequal" || metricRelabelConfig["action"] == "dropequal" {
+						delete(metricRelabelConfig, "regex")
+					}
+				}
+			}
+		}
+	}
+
+	jsonConfigNew, err := json.Marshal(jobToScrapeConfig)
+	if err != nil {
+		return err
+	}
+
 	s.mtx.Lock()
-	s.scrapeConfigResponse = jsonConfig
+	s.scrapeConfigResponse = jsonConfigNew
 	s.mtx.Unlock()
 	return nil
 }