add histogram aggregation

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

Author: codeboten

CHANGELOG.md

@@ -18,7 +18,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - 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 a `WithSpanNameFormatter` option to `go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/v2/mongo/otelmongo`. (#7986)
-- Add unmarshaling and validation for `AttributeType`, `AttributeNameValue`, `SimpleSpanProcessor`, `SimpleLogRecordProcessor`, `ZipkinSpanExporter`, `NameStringValuePair`, `InstrumentType`, `ExperimentalPeerInstrumentationServiceMappingElem` to v1.0.0 model in `go.opentelemetry.io/contrib/otelconf`. (#8127)
+- Add unmarshaling and validation for `AttributeType`, `AttributeNameValue`, `SimpleSpanProcessor`, `SimpleLogRecordProcessor`, `ZipkinSpanExporter`, `NameStringValuePair`, `InstrumentType`, `ExperimentalPeerInstrumentationServiceMappingElem`, `ExporterDefaultHistogramAggregation` to v1.0.0 model in `go.opentelemetry.io/contrib/otelconf`. (#8127)
 
 ### Changed
 

otelconf/config_common.go

@@ -42,6 +42,11 @@ var enumValuesViewSelectorInstrumentType = []any{
 	"up_down_counter",
 }
 
+var enumValuesOTLPMetricDefaultHistogramAggregation = []any{
+	"explicit_bucket_histogram",
+	"base2_exponential_bucket_histogram",
+}
+
 type configOptions struct {
 	ctx                   context.Context
 	opentelemetryConfig   OpenTelemetryConfiguration
@@ -273,12 +278,22 @@ func createHeadersConfig(headers []NameStringValuePair, headersList *string) (ma
 	return result, nil
 }
 
-// supportedInstrumentType return true if the instrument type is supported.
-func supportedInstrumentType(in InstrumentType) bool {
+// supportedInstrumentType return an error if the instrument type is not supported.
+func supportedInstrumentType(in InstrumentType) error {
 	for _, expected := range enumValuesViewSelectorInstrumentType {
 		if string(in) == fmt.Sprintf("%s", expected) {
-			return true
+			return nil
+		}
+	}
+	return newErrInvalid(fmt.Sprintf("invalid selector (expected one of %#v): %#v", enumValuesViewSelectorInstrumentType, in))
+}
+
+// supportedHistogramAggregation return an error if the histogram aggregation is not supported.
+func supportedHistogramAggregation(in ExporterDefaultHistogramAggregation) error {
+	for _, expected := range enumValuesOTLPMetricDefaultHistogramAggregation {
+		if string(in) == fmt.Sprintf("%s", expected) {
+			return nil
 		}
 	}
-	return false
+	return newErrInvalid(fmt.Sprintf("invalid histogram aggregation (expected one of %#v): %#v", enumValuesOTLPMetricDefaultHistogramAggregation, in))
 }

otelconf/config_json.go

@@ -644,8 +644,8 @@ func (j *InstrumentType) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &v); err != nil {
 		return errors.Join(newErrUnmarshal(j), err)
 	}
-	if !supportedInstrumentType(InstrumentType(v)) {
-		return newErrInvalid(fmt.Sprintf("invalid selector (expected one of %#v): %#v", enumValuesViewSelectorInstrumentType, v))
+	if err := supportedInstrumentType(InstrumentType(v)); err != nil {
+		return err
 	}
 	*j = InstrumentType(v)
 	return nil
@@ -679,3 +679,16 @@ func (j *ExperimentalPeerInstrumentationServiceMappingElem) UnmarshalJSON(b []by
 	*j = ExperimentalPeerInstrumentationServiceMappingElem(sh.Plain)
 	return nil
 }
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (j *ExporterDefaultHistogramAggregation) UnmarshalJSON(b []byte) error {
+	var v string
+	if err := json.Unmarshal(b, &v); err != nil {
+		return errors.Join(newErrUnmarshal(j), err)
+	}
+	if err := supportedHistogramAggregation(ExporterDefaultHistogramAggregation(v)); err != nil {
+		return err
+	}
+	*j = ExporterDefaultHistogramAggregation(v)
+	return nil
+}

otelconf/config_test.go

@@ -1376,3 +1376,45 @@ func TestUnmarshalExperimentalPeerInstrumentationServiceMappingElemType(t *testi
 		})
 	}
 }
+
+func TestUnmarshalExporterDefaultHistogramAggregation(t *testing.T) {
+	var exporterDefaultHistogramAggregation ExporterDefaultHistogramAggregation
+	for _, tt := range []struct {
+		name                                    string
+		yamlConfig                              []byte
+		jsonConfig                              []byte
+		wantErrT                                error
+		wantExporterDefaultHistogramAggregation ExporterDefaultHistogramAggregation
+	}{
+		{
+			name:       "invalid data",
+			jsonConfig: []byte(`{:2000}`),
+			yamlConfig: []byte("name: []\nvalue: true\ntype: bool\n"),
+			wantErrT:   newErrUnmarshal(&exporterDefaultHistogramAggregation),
+		},
+		{
+			name:       "invalid histogram aggregation",
+			jsonConfig: []byte(`"test"`),
+			yamlConfig: []byte("test"),
+			wantErrT:   newErrInvalid(`invalid histogram aggregation (expected one of []interface {}{"explicit_bucket_histogram", "base2_exponential_bucket_histogram"}): "test""`),
+		},
+		{
+			name:                                    "valid histogram aggregation",
+			jsonConfig:                              []byte(`"base2_exponential_bucket_histogram"`),
+			yamlConfig:                              []byte("base2_exponential_bucket_histogram"),
+			wantExporterDefaultHistogramAggregation: ExporterDefaultHistogramAggregationBase2ExponentialBucketHistogram,
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			val := ExporterDefaultHistogramAggregation("")
+			err := val.UnmarshalJSON(tt.jsonConfig)
+			assert.ErrorIs(t, err, tt.wantErrT)
+			assert.Equal(t, tt.wantExporterDefaultHistogramAggregation, val)
+
+			val = ExporterDefaultHistogramAggregation("")
+			err = yaml.Unmarshal(tt.yamlConfig, &val)
+			assert.ErrorIs(t, err, tt.wantErrT)
+			assert.Equal(t, tt.wantExporterDefaultHistogramAggregation, val)
+		})
+	}
+}

otelconf/config_yaml.go

@@ -388,8 +388,8 @@ func (j *InstrumentType) UnmarshalYAML(node *yaml.Node) error {
 	if err := node.Decode(&plain); err != nil {
 		return errors.Join(newErrUnmarshal(j), err)
 	}
-	if !supportedInstrumentType(InstrumentType(plain)) {
-		return newErrInvalid(fmt.Sprintf("invalid selector (expected one of %#v): %#v", enumValuesViewSelectorInstrumentType, plain))
+	if err := supportedInstrumentType(InstrumentType(plain)); err != nil {
+		return err
 	}
 
 	*j = InstrumentType(plain)
@@ -414,3 +414,18 @@ func (j *ExperimentalPeerInstrumentationServiceMappingElem) UnmarshalYAML(node *
 	*j = ExperimentalPeerInstrumentationServiceMappingElem(plain)
 	return nil
 }
+
+// UnmarshalYAML implements yaml.Unmarshaler.
+func (j *ExporterDefaultHistogramAggregation) UnmarshalYAML(node *yaml.Node) error {
+	type Plain ExporterDefaultHistogramAggregation
+	var plain Plain
+	if err := node.Decode(&plain); err != nil {
+		return errors.Join(newErrUnmarshal(j), err)
+	}
+	if err := supportedHistogramAggregation(ExporterDefaultHistogramAggregation(plain)); err != nil {
+		return err
+	}
+
+	*j = ExporterDefaultHistogramAggregation(plain)
+	return nil
+}