reuse kv code

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

Author: codeboten

otelconf/resource.go

@@ -5,47 +5,12 @@ package otelconf // import "go.opentelemetry.io/contrib/otelconf/v1.0.0-rc.1"
 
 import (
 	"errors"
-	"fmt"
-	"strconv"
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/sdk/resource"
-)
 
-func keyVal(k string, v any) attribute.KeyValue {
-	switch val := v.(type) {
-	case bool:
-		return attribute.Bool(k, val)
-	case int64:
-		return attribute.Int64(k, val)
-	case uint64:
-		return attribute.String(k, strconv.FormatUint(val, 10))
-	case float64:
-		return attribute.Float64(k, val)
-	case int8:
-		return attribute.Int64(k, int64(val))
-	case uint8:
-		return attribute.Int64(k, int64(val))
-	case int16:
-		return attribute.Int64(k, int64(val))
-	case uint16:
-		return attribute.Int64(k, int64(val))
-	case int32:
-		return attribute.Int64(k, int64(val))
-	case uint32:
-		return attribute.Int64(k, int64(val))
-	case float32:
-		return attribute.Float64(k, float64(val))
-	case int:
-		return attribute.Int(k, val)
-	case uint:
-		return attribute.String(k, strconv.FormatUint(uint64(val), 10))
-	case string:
-		return attribute.String(k, val)
-	default:
-		return attribute.String(k, fmt.Sprint(v))
-	}
-}
+	"go.opentelemetry.io/contrib/otelconf/internal/kv"
+)
 
 func newResource(res OpenTelemetryConfigurationResource) (*resource.Resource, error) {
 	if res == nil {
@@ -59,7 +24,7 @@ func newResource(res OpenTelemetryConfigurationResource) (*resource.Resource, er
 
 	var attrs []attribute.KeyValue
 	for _, v := range r.Attributes {
-		attrs = append(attrs, keyVal(v.Name, v.Value))
+		attrs = append(attrs, kv.FromNameValue(v.Name, v.Value))
 	}
 
 	if r.SchemaUrl == nil {

otelconf/resource_test.go

@@ -4,7 +4,6 @@
 package otelconf
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -14,10 +13,7 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
 )
 
-type mockType struct{}
-
 func TestNewResource(t *testing.T) {
-	other := mockType{}
 	tests := []struct {
 		name         string
 		config       OpenTelemetryConfigurationResource
@@ -68,40 +64,12 @@ func TestNewResource(t *testing.T) {
 				Attributes: []AttributeNameValue{
 					{Name: "service.name", Value: "service-a"},
 					{Name: "attr-bool", Value: true},
-					{Name: "attr-int64", Value: int64(-164)},
-					{Name: "attr-uint64", Value: uint64(164)},
-					{Name: "attr-float64", Value: float64(64.0)},
-					{Name: "attr-int8", Value: int8(-18)},
-					{Name: "attr-uint8", Value: uint8(18)},
-					{Name: "attr-int16", Value: int16(-116)},
-					{Name: "attr-uint16", Value: uint16(116)},
-					{Name: "attr-int32", Value: int32(-132)},
-					{Name: "attr-uint32", Value: uint32(132)},
-					{Name: "attr-float32", Value: float32(32.0)},
-					{Name: "attr-int", Value: int(-1)},
-					{Name: "attr-uint", Value: uint(1)},
-					{Name: "attr-string", Value: "string-val"},
-					{Name: "attr-default", Value: other},
 				},
 				SchemaUrl: ptr(semconv.SchemaURL),
 			},
 			wantResource: resource.NewWithAttributes(semconv.SchemaURL,
 				semconv.ServiceName("service-a"),
-				attribute.Bool("attr-bool", true),
-				attribute.String("attr-uint64", fmt.Sprintf("%d", 164)),
-				attribute.Int64("attr-int64", int64(-164)),
-				attribute.Float64("attr-float64", float64(64.0)),
-				attribute.Int64("attr-int8", int64(-18)),
-				attribute.Int64("attr-uint8", int64(18)),
-				attribute.Int64("attr-int16", int64(-116)),
-				attribute.Int64("attr-uint16", int64(116)),
-				attribute.Int64("attr-int32", int64(-132)),
-				attribute.Int64("attr-uint32", int64(132)),
-				attribute.Float64("attr-float32", float64(32.0)),
-				attribute.Int64("attr-int", int64(-1)),
-				attribute.String("attr-uint", fmt.Sprintf("%d", 1)),
-				attribute.String("attr-string", "string-val"),
-				attribute.String("attr-default", fmt.Sprintf("%v", other))),
+				attribute.Bool("attr-bool", true)),
 		},
 	}
 	for _, tt := range tests {