add NameStringValuePair

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

Author: codeboten

CHANGELOG.md

@@ -17,7 +17,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Add unmarshaling and validation for `BatchLogRecordProcessor`, `BatchSpanProcessor`, and `PeriodicMetricReader` to v1.0.0 model in `go.opentelemetry.io/contrib/otelconf`. (#8049)
 - Add unmarshaling and validation for `TextMapPropagator` to v1.0.0 model in `go.opentelemetry.io/contrib/otelconf`. (#8052)
 - Add unmarshaling and validation for `OTLPHttpExporter`, `OTLPGrpcExporter`, `OTLPGrpcMetricExporter` and `OTLPHttpMetricExporter` to v1.0.0 model in `go.opentelemetry.io/contrib/otelconf`. (#8112)
-- Add unmarshaling and validation for `AttributeType`, `AttributeNameValue`, `SimpleSpanProcessor`, `SimpleLogRecordProcessor`, `ZipkinSpanExporter` to v1.0.0 model in `go.opentelemetry.io/contrib/otelconf`. (#8127)
+- Add unmarshaling and validation for `AttributeType`, `AttributeNameValue`, `SimpleSpanProcessor`, `SimpleLogRecordProcessor`, `ZipkinSpanExporter`, `NameStringValuePair` to v1.0.0 model in `go.opentelemetry.io/contrib/otelconf`. (#8127)
 
 ### Changed
 

otelconf/config_json.go

@@ -608,3 +608,32 @@ func (j *ZipkinSpanExporter) UnmarshalJSON(b []byte) error {
 	*j = ZipkinSpanExporter(sh.Plain)
 	return nil
 }
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (j *NameStringValuePair) UnmarshalJSON(b []byte) error {
+	type Plain NameStringValuePair
+	type shadow struct {
+		Plain
+		Name  json.RawMessage `json:"name"`
+		Value json.RawMessage `json:"value"`
+	}
+	var sh shadow
+	if err := json.Unmarshal(b, &sh); err != nil {
+		return errors.Join(newErrUnmarshal(j), err)
+	}
+	if sh.Name == nil {
+		return newErrRequired(j, "name")
+	}
+	if err := json.Unmarshal(sh.Name, &sh.Plain.Name); err != nil {
+		return errors.Join(newErrUnmarshal(j), err)
+	}
+	if sh.Value == nil {
+		return newErrRequired(j, "value")
+	}
+	if err := json.Unmarshal(sh.Value, &sh.Plain.Value); err != nil {
+		return errors.Join(newErrUnmarshal(j), err)
+	}
+
+	*j = NameStringValuePair(sh.Plain)
+	return nil
+}

otelconf/config_test.go

@@ -1210,3 +1210,59 @@ func TestUnmarshalAttributeNameValueType(t *testing.T) {
 		})
 	}
 }
+
+func TestUnmarshalNameStringValuePairType(t *testing.T) {
+	for _, tt := range []struct {
+		name                    string
+		yamlConfig              []byte
+		jsonConfig              []byte
+		wantErrT                error
+		wantNameStringValuePair NameStringValuePair
+	}{
+		{
+			name:       "invalid data",
+			jsonConfig: []byte(`{:2000}`),
+			yamlConfig: []byte("name: []\nvalue: true\ntype: bool\n"),
+			wantErrT:   newErrUnmarshal(&NameStringValuePair{}),
+		},
+		{
+			name:       "missing required name field",
+			jsonConfig: []byte(`{}`),
+			yamlConfig: []byte("{}"),
+			wantErrT:   newErrRequired(&NameStringValuePair{}, "name"),
+		},
+		{
+			name:       "missing required value field",
+			jsonConfig: []byte(`{"name":"test"}`),
+			yamlConfig: []byte("name: test"),
+			wantErrT:   newErrRequired(&NameStringValuePair{}, "value"),
+		},
+		{
+			name:       "valid string value",
+			jsonConfig: []byte(`{"name":"test", "value": "test-val", "type": "string"}`),
+			yamlConfig: []byte("name: test\nvalue: test-val\ntype: string\n"),
+			wantNameStringValuePair: NameStringValuePair{
+				Name:  "test",
+				Value: ptr("test-val"),
+			},
+		},
+		{
+			name:       "invalid string_array value",
+			jsonConfig: []byte(`{"name":"test", "value": ["test-val", "test-val-2"], "type": "string_array"}`),
+			yamlConfig: []byte("name: test\nvalue: [test-val, test-val-2]\ntype: string_array\n"),
+			wantErrT:   newErrUnmarshal(&NameStringValuePair{}),
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			val := NameStringValuePair{}
+			err := val.UnmarshalJSON(tt.jsonConfig)
+			assert.ErrorIs(t, err, tt.wantErrT)
+			assert.Equal(t, tt.wantNameStringValuePair, val)
+
+			val = NameStringValuePair{}
+			err = yaml.Unmarshal(tt.yamlConfig, &val)
+			assert.ErrorIs(t, err, tt.wantErrT)
+			assert.Equal(t, tt.wantNameStringValuePair, val)
+		})
+	}
+}

otelconf/config_yaml.go

@@ -361,3 +361,22 @@ func (j *ZipkinSpanExporter) UnmarshalYAML(node *yaml.Node) error {
 	*j = ZipkinSpanExporter(plain)
 	return nil
 }
+
+// UnmarshalYAML implements yaml.Unmarshaler.
+func (j *NameStringValuePair) UnmarshalYAML(node *yaml.Node) error {
+	if !hasYAMLMapKey(node, "name") {
+		return newErrRequired(j, "name")
+	}
+	if !hasYAMLMapKey(node, "value") {
+		return newErrRequired(j, "value")
+	}
+
+	type Plain NameStringValuePair
+	var plain Plain
+	if err := node.Decode(&plain); err != nil {
+		return errors.Join(newErrUnmarshal(j), err)
+	}
+
+	*j = NameStringValuePair(plain)
+	return nil
+}