cover case with invalid json/yaml

Signed-off-by: alex boten <[email protected]>

Author: codeboten

otelconf/config_json.go

@@ -3,14 +3,17 @@
 
 package otelconf // import "go.opentelemetry.io/contrib/otelconf"
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"errors"
+)
 
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *CardinalityLimits) UnmarshalJSON(value []byte) error {
 	type Plain CardinalityLimits
 	var plain Plain
 	if err := json.Unmarshal(value, &plain); err != nil {
-		return err
+		return errors.Join(errors.New("unmarshaling error cardinality_limit"))
 	}
 	if err := validateCardinalityLimits((*CardinalityLimits)(&plain)); err != nil {
 		return err
@@ -24,7 +27,7 @@ func (j *SpanLimits) UnmarshalJSON(value []byte) error {
 	type Plain SpanLimits
 	var plain Plain
 	if err := json.Unmarshal(value, &plain); err != nil {
-		return err
+		return errors.Join(errors.New("unmarshaling error span_limit"), err)
 	}
 	if err := validateSpanLimits((*SpanLimits)(&plain)); err != nil {
 		return err

otelconf/config_test.go

@@ -32,6 +32,12 @@ func TestUnmarshalCardinalityLimits(t *testing.T) {
 			jsonConfig: []byte(`{}`),
 			yamlConfig: []byte("{}"),
 		},
+		{
+			name:       "invalid data",
+			jsonConfig: []byte(`{:2000}`),
+			yamlConfig: []byte("counter: !!str 2000"),
+			wantErr:    "unmarshaling error cardinality_limit",
+		},
 		{
 			name:       "invalid counter zero",
 			jsonConfig: []byte(`{"counter":0}`),
@@ -172,6 +178,12 @@ func TestUnmarshalSpanLimits(t *testing.T) {
 			jsonConfig: []byte(`{}`),
 			yamlConfig: []byte("{}"),
 		},
+		{
+			name:       "invalid data",
+			jsonConfig: []byte(`{:2000}`),
+			yamlConfig: []byte("attribute_count_limit: !!str 2000"),
+			wantErr:    "unmarshaling error span_limit",
+		},
 		{
 			name:       "invalid attribute_count_limit negative",
 			jsonConfig: []byte(`{"attribute_count_limit":-1}`),

otelconf/config_yaml.go

@@ -3,14 +3,18 @@
 
 package otelconf // import "go.opentelemetry.io/contrib/otelconf"
 
-import "go.yaml.in/yaml/v3"
+import (
+	"errors"
+
+	"go.yaml.in/yaml/v3"
+)
 
 // UnmarshalYAML implements yaml.Unmarshaler.
 func (j *CardinalityLimits) UnmarshalYAML(node *yaml.Node) error {
 	type Plain CardinalityLimits
 	var plain Plain
 	if err := node.Decode(&plain); err != nil {
-		return err
+		return errors.Join(errors.New("unmarshaling error cardinality_limit"), err)
 	}
 	if err := validateCardinalityLimits((*CardinalityLimits)(&plain)); err != nil {
 		return err
@@ -24,7 +28,7 @@ func (j *SpanLimits) UnmarshalYAML(node *yaml.Node) error {
 	type Plain SpanLimits
 	var plain Plain
 	if err := node.Decode(&plain); err != nil {
-		return err
+		return errors.Join(errors.New("unmarshaling error span_limit"), err)
 	}
 	if err := validateSpanLimits((*SpanLimits)(&plain)); err != nil {
 		return err