clean up

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

Author: codeboten

otelconf/config_common.go

@@ -324,18 +324,6 @@ func supportedHistogramAggregation(in ExporterDefaultHistogramAggregation) error
 	return newErrInvalid(fmt.Sprintf("invalid histogram aggregation (expected one of %#v): %#v", enumValuesOTLPMetricDefaultHistogramAggregation, in))
 }
 
-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)
@@ -398,16 +386,3 @@ func setConfigDefaults(raw map[string]any, plain *OpenTelemetryConfiguration, co
 
 	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

@@ -199,28 +199,6 @@ func (j *AttributeType) MarshalJSON() ([]byte, error) {
 	return json.Marshal(j.Value)
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *AttributeType) UnmarshalJSON(b []byte) error {
-	var v struct {
-		Value any
-	}
-	if err := json.Unmarshal(b, &v.Value); err != nil {
-		return err
-	}
-	var ok bool
-	for _, expected := range enumValuesAttributeType {
-		if reflect.DeepEqual(v.Value, expected) {
-			ok = true
-			break
-		}
-	}
-	if !ok {
-		return fmt.Errorf("invalid value (expected one of %#v): %#v", enumValuesAttributeType, v.Value)
-	}
-	*j = AttributeType(v)
-	return nil
-}
-
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *TextMapPropagator) UnmarshalJSON(b []byte) error {
 	type Plain TextMapPropagator
@@ -340,81 +318,11 @@ func (j *BatchSpanProcessor) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *ExperimentalPeerInstrumentationServiceMappingElem) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	if _, ok := raw["peer"]; raw != nil && !ok {
-		return errors.New("field peer in ExperimentalPeerInstrumentationServiceMappingElem: required")
-	}
-	if _, ok := raw["service"]; raw != nil && !ok {
-		return errors.New("field service in ExperimentalPeerInstrumentationServiceMappingElem: required")
-	}
-	type Plain ExperimentalPeerInstrumentationServiceMappingElem
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	*j = ExperimentalPeerInstrumentationServiceMappingElem(plain)
-	return nil
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *NameStringValuePair) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-
-	name, err := validateStringField(raw, "name")
-	if err != nil {
-		return err
-	}
-
-	value, err := validateStringField(raw, "value")
-	if err != nil {
-		return err
-	}
-
-	*j = NameStringValuePair{
-		Name:  name,
-		Value: &value,
-	}
-	return nil
-}
-
-var enumValuesOTLPMetricDefaultHistogramAggregation = []any{
-	"explicit_bucket_histogram",
-	"base2_exponential_bucket_histogram",
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *ExporterDefaultHistogramAggregation) UnmarshalJSON(b []byte) error {
-	var v string
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	var ok bool
-	for _, expected := range enumValuesOTLPMetricDefaultHistogramAggregation {
-		if reflect.DeepEqual(v, expected) {
-			ok = true
-			break
-		}
-	}
-	if !ok {
-		return fmt.Errorf("invalid value (expected one of %#v): %#v", enumValuesOTLPMetricDefaultHistogramAggregation, v)
-	}
-	*j = ExporterDefaultHistogramAggregation(v)
-	return nil
-}
-
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *OpenTelemetryConfiguration) UnmarshalJSON(b []byte) error {
 	var raw map[string]any
 	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
+		return errors.Join(newErrUnmarshal(j), err)
 	}
 	if _, ok := raw["file_format"]; raw != nil && !ok {
 		return errors.New("field file_format in OpenTelemetryConfiguration: required")
@@ -425,96 +333,96 @@ func (j *OpenTelemetryConfiguration) UnmarshalJSON(b []byte) error {
 	if v, ok := raw["logger_provider"]; ok && v != nil {
 		marshaled, err := json.Marshal(v)
 		if err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		var lp LoggerProviderJson
 		if err := json.Unmarshal(marshaled, &lp); err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		plain.LoggerProvider = &lp
 	}
 
 	if v, ok := raw["meter_provider"]; ok && v != nil {
 		marshaled, err := json.Marshal(v)
 		if err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 
 		var mp MeterProviderJson
 		if err := json.Unmarshal(marshaled, &mp); err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		plain.MeterProvider = &mp
 	}
 
 	if v, ok := raw["tracer_provider"]; ok && v != nil {
 		marshaled, err := json.Marshal(v)
 		if err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 
 		var tp TracerProviderJson
 		if err := json.Unmarshal(marshaled, &tp); err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		plain.TracerProvider = &tp
 	}
 
 	if v, ok := raw["propagator"]; ok && v != nil {
 		marshaled, err := json.Marshal(v)
 		if err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 
 		var p PropagatorJson
 		if err := json.Unmarshal(marshaled, &p); err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		plain.Propagator = &p
 	}
 
 	if v, ok := raw["resource"]; ok && v != nil {
 		marshaled, err := json.Marshal(v)
 		if err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 
 		var r ResourceJson
 		if err := json.Unmarshal(marshaled, &r); err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		plain.Resource = &r
 	}
 
 	if v, ok := raw["instrumentation/development"]; ok && v != nil {
 		marshaled, err := json.Marshal(v)
 		if err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 
 		var i InstrumentationJson
 		if err := json.Unmarshal(marshaled, &i); err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		plain.InstrumentationDevelopment = &i
 	}
 
 	if v, ok := raw["attribute_limits"]; ok && v != nil {
 		marshaled, err := json.Marshal(v)
 		if err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 
 		var a AttributeLimits
 		if err := json.Unmarshal(marshaled, &a); err != nil {
-			return err
+			return errors.Join(newErrUnmarshal(j), err)
 		}
 		plain.AttributeLimits = &a
 	}
 
 	plainConfig := (*OpenTelemetryConfiguration)(&plain)
 	if err := setConfigDefaults(raw, plainConfig, jsonCodec{}); err != nil {
-		return err
+		return errors.Join(newErrUnmarshal(j), err)
 	}
 
 	plain.FileFormat = fmt.Sprintf("%v", raw["file_format"])
@@ -563,24 +471,6 @@ func (j *CardinalityLimits) UnmarshalJSON(value []byte) error {
 	return nil
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *PullMetricReader) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	if _, ok := raw["exporter"]; raw != nil && !ok {
-		return errors.New("field exporter in PullMetricReader: required")
-	}
-	type Plain PullMetricReader
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	*j = PullMetricReader(plain)
-	return nil
-}
-
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *SpanLimits) UnmarshalJSON(value []byte) error {
 	type Plain SpanLimits
@@ -619,24 +509,6 @@ func (j *OTLPHttpMetricExporter) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *SimpleLogRecordProcessor) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	if _, ok := raw["exporter"]; raw != nil && !ok {
-		return errors.New("field exporter in SimpleLogRecordProcessor: required")
-	}
-	type Plain SimpleLogRecordProcessor
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	*j = SimpleLogRecordProcessor(plain)
-	return nil
-}
-
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *OTLPGrpcMetricExporter) UnmarshalJSON(b []byte) error {
 	type Plain OTLPGrpcMetricExporter
@@ -661,54 +533,6 @@ func (j *OTLPGrpcMetricExporter) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *SimpleSpanProcessor) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	if _, ok := raw["exporter"]; raw != nil && !ok {
-		return errors.New("field exporter in SimpleSpanProcessor: required")
-	}
-	type Plain SimpleSpanProcessor
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	*j = SimpleSpanProcessor(plain)
-	return nil
-}
-
-var enumValuesViewSelectorInstrumentType = []any{
-	"counter",
-	"gauge",
-	"histogram",
-	"observable_counter",
-	"observable_gauge",
-	"observable_up_down_counter",
-	"up_down_counter",
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *InstrumentType) UnmarshalJSON(b []byte) error {
-	var v string
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	var ok bool
-	for _, expected := range enumValuesViewSelectorInstrumentType {
-		if reflect.DeepEqual(v, expected) {
-			ok = true
-			break
-		}
-	}
-	if !ok {
-		return fmt.Errorf("invalid value (expected one of %#v): %#v", enumValuesViewSelectorInstrumentType, v)
-	}
-	*j = InstrumentType(v)
-	return nil
-}
-
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *OTLPHttpExporter) UnmarshalJSON(b []byte) error {
 	type Plain OTLPHttpExporter
@@ -733,27 +557,6 @@ func (j *OTLPHttpExporter) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-func (j *ZipkinSpanExporter) UnmarshalJSON(b []byte) error {
-	var raw map[string]any
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	if _, ok := raw["endpoint"]; raw != nil && !ok {
-		return errors.New("field endpoint in ZipkinSpanExporter: required")
-	}
-	type Plain ZipkinSpanExporter
-	var plain Plain
-	if err := json.Unmarshal(b, &plain); err != nil {
-		return err
-	}
-	if plain.Timeout != nil && 0 > *plain.Timeout {
-		return fmt.Errorf("field %s: must be >= %v", "timeout", 0)
-	}
-	*j = ZipkinSpanExporter(plain)
-	return nil
-}
-
 // UnmarshalJSON implements json.Unmarshaler.
 func (j *OTLPGrpcExporter) UnmarshalJSON(b []byte) error {
 	type Plain OTLPGrpcExporter