clean up

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

Author: codeboten

otelconf/config_common.go

@@ -5,6 +5,7 @@ package otelconf // import "go.opentelemetry.io/contrib/otelconf"
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"reflect"
@@ -13,6 +14,7 @@ import (
 	sdklog "go.opentelemetry.io/otel/sdk/log"
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	yaml "go.yaml.in/yaml/v3"
 )
 
 const (
@@ -127,6 +129,53 @@ func newErrInvalid(id string) error {
 	return &errInvalid{Identifier: id}
 }
 
+// unmarshalSamplerTypes handles always_on and always_off sampler unmarshaling.
+func unmarshalSamplerTypes(raw map[string]any, plain *Sampler) {
+	// always_on can be nil, must check and set here
+	if _, ok := raw["always_on"]; ok {
+		plain.AlwaysOn = AlwaysOnSampler{}
+	}
+	// always_off can be nil, must check and set here
+	if _, ok := raw["always_off"]; ok {
+		plain.AlwaysOff = AlwaysOffSampler{}
+	}
+}
+
+// unmarshalTextMapPropagatorTypes handles all propagator type unmarshaling.
+func unmarshalTextMapPropagatorTypes(raw map[string]any, plain *TextMapPropagator) {
+	// b3 can be nil, must check and set here
+	if v, ok := raw["b3"]; ok && v == nil {
+		plain.B3 = B3Propagator{}
+	}
+	if v, ok := raw["b3multi"]; ok && v == nil {
+		plain.B3Multi = B3MultiPropagator{}
+	}
+	if v, ok := raw["baggage"]; ok && v == nil {
+		plain.Baggage = BaggagePropagator{}
+	}
+	if v, ok := raw["jaeger"]; ok && v == nil {
+		plain.Jaeger = JaegerPropagator{}
+	}
+	if v, ok := raw["ottrace"]; ok && v == nil {
+		plain.Ottrace = OpenTracingPropagator{}
+	}
+	if v, ok := raw["tracecontext"]; ok && v == nil {
+		plain.Tracecontext = TraceContextPropagator{}
+	}
+}
+
+// unmarshalMetricProducer handles opencensus metric producer unmarshaling.
+func unmarshalMetricProducer(raw map[string]any, plain *MetricProducer) {
+	// opencensus can be nil, must check and set here
+	if v, ok := raw["opencensus"]; ok && v == nil {
+		delete(raw, "opencensus")
+		plain.Opencensus = OpenCensusMetricProducer{}
+	}
+	if len(raw) > 0 {
+		plain.AdditionalProperties = raw
+	}
+}
+
 // validatePeriodicMetricReader handles validation for PeriodicMetricReader.
 func validatePeriodicMetricReader(plain *PeriodicMetricReader) error {
 	if plain.Timeout != nil && 0 > *plain.Timeout {
@@ -249,3 +298,91 @@ func createHeadersConfig(headers []NameStringValuePair, headersList *string) (ma
 	}
 	return result, nil
 }
+
+var enumValuesAttributeType = []any{
+	nil,
+	"string",
+	"bool",
+	"int",
+	"double",
+	"string_array",
+	"bool_array",
+	"int_array",
+	"double_array",
+}
+
+// MarshalUnmarshaler combines marshal and unmarshal operations.
+type MarshalUnmarshaler interface {
+	Marshal(v any) ([]byte, error)
+	Unmarshal(data []byte, v any) error
+}
+
+// jsonCodec implements MarshalUnmarshaler for JSON.
+type jsonCodec struct{}
+
+func (jsonCodec) Marshal(v any) ([]byte, error) {
+	return json.Marshal(v)
+}
+
+func (jsonCodec) Unmarshal(data []byte, v any) error {
+	return json.Unmarshal(data, v)
+}
+
+// yamlCodec implements MarshalUnmarshaler for YAML.
+type yamlCodec struct{}
+
+func (yamlCodec) Marshal(v any) ([]byte, error) {
+	return yaml.Marshal(v)
+}
+
+func (yamlCodec) Unmarshal(data []byte, v any) error {
+	return yaml.Unmarshal(data, v)
+}
+
+// setConfigDefaults sets default values for disabled and log_level.
+func setConfigDefaults(raw map[string]any, plain *OpenTelemetryConfiguration, codec MarshalUnmarshaler) error {
+	// Configure if the SDK is disabled or not.
+	// If omitted or null, false is used.
+	plain.Disabled = ptr(false)
+	if v, ok := raw["disabled"]; ok && v != nil {
+		marshaled, err := codec.Marshal(v)
+		if err != nil {
+			return err
+		}
+		var disabled bool
+		if err := codec.Unmarshal(marshaled, &disabled); err != nil {
+			return err
+		}
+		plain.Disabled = &disabled
+	}
+
+	// Configure the log level of the internal logger used by the SDK.
+	// If omitted, info is used.
+	plain.LogLevel = ptr("info")
+	if v, ok := raw["log_level"]; ok && v != nil {
+		marshaled, err := codec.Marshal(v)
+		if err != nil {
+			return err
+		}
+		var logLevel string
+		if err := codec.Unmarshal(marshaled, &logLevel); err != nil {
+			return err
+		}
+		plain.LogLevel = &logLevel
+	}
+
+	return nil
+}
+
+// validateStringField validates a string field is present and correct type.
+func validateStringField(raw map[string]any, fieldName string) (string, error) {
+	v, ok := raw[fieldName]
+	if !ok {
+		return "", fmt.Errorf("cannot unmarshal field %s in NameStringValuePair required", fieldName)
+	}
+	str, ok := v.(string)
+	if !ok {
+		return "", fmt.Errorf("cannot unmarshal field %s in NameStringValuePair must be string", fieldName)
+	}
+	return str, nil
+}

otelconf/config_json.go

@@ -191,6 +191,7 @@ func (j *LogRecordExporter) UnmarshalJSON(b []byte) error {
 		sh.Plain.Console = c
 	}
 	*j = LogRecordExporter(sh.Plain)
+	return nil
 }
 
 // MarshalJSON implements json.Marshaler.
@@ -804,63 +805,6 @@ func (j *AttributeNameValue) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *PushMetricExporter) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	type Plain PushMetricExporter
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	// console can be nil, must check and set here
-	if checkConsoleExporter(raw) {
-		plain.Console = ConsoleExporter{}
-	}
-	*j = PushMetricExporter(plain)
-	return nil
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *SpanExporter) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	type Plain SpanExporter
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	// console can be nil, must check and set here
-	if checkConsoleExporter(raw) {
-		plain.Console = ConsoleExporter{}
-	}
-	*j = SpanExporter(plain)
-	return nil
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *LogRecordExporter) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	type Plain LogRecordExporter
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	// console can be nil, must check and set here
-	if checkConsoleExporter(raw) {
-		plain.Console = ConsoleExporter{}
-	}
-	*j = LogRecordExporter(plain)
-	return nil
-}
-
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *Sampler) UnmarshalJSON(b []byte) error {
 	var raw map[string]any
@@ -892,47 +836,3 @@ func (j *MetricProducer) UnmarshalJSON(b []byte) error {
 	*j = MetricProducer(plain)
 	return nil
 }
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *TextMapPropagator) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	type Plain TextMapPropagator
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	unmarshalTextMapPropagatorTypes(raw, (*TextMapPropagator)(&plain))
-	*j = TextMapPropagator(plain)
-	return nil
-}
-
-// 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
-	}
-	if err := validateCardinalityLimits((*CardinalityLimits)(&plain)); err != nil {
-		return err
-	}
-	*j = CardinalityLimits(plain)
-	return nil
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *SpanLimits) UnmarshalJSON(value []byte) error {
-	type Plain SpanLimits
-	var plain Plain
-	if err := json.Unmarshal(value, &plain); err != nil {
-		return err
-	}
-	if err := validateSpanLimits((*SpanLimits)(&plain)); err != nil {
-		return err
-	}
-	*j = SpanLimits(plain)
-	return nil
-}