matching code rewritten

open-telemetry · May 28, 2024 · 3f0a4e8 · 3f0a4e8
1 parent 33983f5
commit 3f0a4e8
Show file tree

Hide file tree

Showing 3 changed files with 806 additions and 356 deletions.
diff --git a/cmd/mdatagen/templates/config.go.tmpl b/cmd/mdatagen/templates/config.go.tmpl
@@ -56,13 +56,13 @@ func (msc *MetricsConfig) Unmarshal(parser *confmap.Conf) error {
 	if parser == nil {
 		return nil
 	}
-	if ContainsPattern(parser.AllKeys()) {
-		confStrMap := parser.ToStringMap()
-		expandedConfig := ExpandPatternMap(confStrMap, MetricNames)
-		newParser := confmap.NewFromStringMap(expandedConfig)
-		return newParser.Unmarshal(msc)
+	confStrMap := parser.ToStringMap()
+	expandedConfig, err := expandPatternMap(confStrMap, MetricNames)
+	if err != nil {
+		return err
 	}
-	return parser.Unmarshal(msc)
+	newParser := confmap.NewFromStringMap(expandedConfig)
+	return newParser.Unmarshal(msc)
 }
 {{- end }}
 
@@ -122,13 +122,13 @@ func (rasc *ResourceAttributesConfig) Unmarshal(parser *confmap.Conf) error {
 	if parser == nil {
 		return nil
 	}
-	if ContainsPattern(parser.AllKeys()) {
-		confStrMap := parser.ToStringMap()
-		expandedConfig := ExpandPatternMap(confStrMap, ResourceAttributeNames)
-		newParser := confmap.NewFromStringMap(expandedConfig)
-		return newParser.Unmarshal(rasc)
+	confStrMap := parser.ToStringMap()
+	expandedConfig, err := expandPatternMap(confStrMap, ResourceAttributeNames)
+	if err != nil {
+		return err
 	}
-	return parser.Unmarshal(rasc)
+	newParser := confmap.NewFromStringMap(expandedConfig)
+	return newParser.Unmarshal(rasc)
 }
 {{- end }}