use sed to translate optional -> oneof

Makefile

@@ -230,7 +230,7 @@ gendependabot: $(eval SHELL:=/bin/bash)
 OPENTELEMETRY_PROTO_SRC_DIR=model/internal/opentelemetry-proto
 
 # The SHA matching the current version of the proto to use
-OPENTELEMETRY_PROTO_VERSION=v0.12.0
+OPENTELEMETRY_PROTO_VERSION=6f6a18c6b9522672bc0cbbe70a3d973f9a08ef2b
 
 # Find all .proto files.
 OPENTELEMETRY_PROTO_FILES := $(subst $(OPENTELEMETRY_PROTO_SRC_DIR)/,,$(wildcard $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1/*.proto))

model/internal/cmd/pdatagen/internal/metrics_structs.go

@@ -289,6 +289,20 @@ var histogramDataPoint = &messageValueStruct{
  explicitBoundsField,
  exemplarsField,
  dataPointFlagsField,
+ &oneOfField{
+ typeName: "OptionalType",
+ originFieldName: "Min_",
+ originTypePrefix: "otlpmetrics.HistogramDataPoint_",
+ testValueIdx: 0, // Double
+ values: []oneOfValue{minField},
+ },
+ &oneOfField{
+ typeName: "OptionalType",
+ originFieldName: "Max_",
+ originTypePrefix: "otlpmetrics.HistogramDataPoint_",
+ testValueIdx: 0, // Double
+ values: []oneOfValue{maxField},
+ },
  },
 }
 
@@ -338,6 +352,20 @@ var exponentialHistogramDataPoint = &messageValueStruct{
  },
  exemplarsField,
  dataPointFlagsField,
+ &oneOfField{
+ typeName: "OptionalType",
+ originFieldName: "Min_",
+ originTypePrefix: "otlpmetrics.ExponentialHistogramDataPoint_",
+ testValueIdx: 0, // Double
+ values: []oneOfValue{minField},
+ },
+ &oneOfField{
+ typeName: "OptionalType",
+ originFieldName: "Max_",
+ originTypePrefix: "otlpmetrics.ExponentialHistogramDataPoint_",
+ testValueIdx: 0, // Double
+ values: []oneOfValue{maxField},
+ },
  },
 }
 
@@ -524,3 +552,21 @@ var dataPointFlagsField = &primitiveTypedField{
  defaultVal: "MetricDataPointFlagsNone",
  testVal: "MetricDataPointFlagsNone",
 }
+
+var minField = &oneOfPrimitiveValue{
+ fieldName: "Min",
+ fieldType: "Double",
+ originFieldName: "Min",
+ returnType: "float64",
+ defaultVal: "float64(0.0)",
+ testVal: "float64(17.13)",
+}
+
+var maxField = &oneOfPrimitiveValue{
+ fieldName: "Max",
+ fieldType: "Double",
+ originFieldName: "Max",
+ returnType: "float64",
+ defaultVal: "float64(0.0)",
+ testVal: "float64(17.13)",
+}

model/otlp/pb_test.go

@@ -81,6 +81,29 @@ func TestProtobufMetricsSizer_withNil(t *testing.T) {
  assert.Equal(t, 0, sizer.MetricsSize(pdata.NewMetrics()))
 }
 
+func TestProtobufMetricsSizerWithOptional(t *testing.T) {
+ sizer := NewProtobufMetricsMarshaler().(pdata.MetricsSizer)
+ marshaler := NewProtobufMetricsMarshaler()
+ md := pdata.NewMetrics()
+ metric := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics().AppendEmpty()
+ metric.SetDataType(pdata.MetricDataTypeHistogram)
+ datapoint := metric.Histogram().DataPoints().AppendEmpty()
+ datapoint.SetMin(0.1)
+ datapoint.SetMax(100)
+
+ size := sizer.MetricsSize(md)
+
+ bytes, err := marshaler.MarshalMetrics(md)
+ require.NoError(t, err)
+ assert.Equal(t, len(bytes), size)
+
+ p := NewProtobufMetricsUnmarshaler()
+ unmarshalled, err := p.UnmarshalMetrics(bytes)
+ assert.NoError(t, err)
+ assert.Equal(t, metric, unmarshalled.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0))
+
+}
+
 func TestProtobufLogsSizer(t *testing.T) {
  sizer := NewProtobufLogsMarshaler().(pdata.LogsSizer)
  marshaler := NewProtobufLogsMarshaler()

model/pdata/metrics.go

@@ -255,3 +255,22 @@ func (ms NumberDataPoint) Type() MetricValueType {
 func (ms Exemplar) Type() MetricValueType {
  return ms.ValueType()
 }
+
+// OptionalType wraps optional fields into oneof fields
+type OptionalType int32
+
+const (
+ OptionalTypeNone OptionalType = iota
+ OptionalTypeDouble
+)
+
+// String returns the string representation of the OptionalType.
+func (ot OptionalType) String() string {
+ switch ot {
+ case OptionalTypeNone:
+ return "None"
+ case OptionalTypeDouble:
+ return "Double"
+ }
+ return ""
+}

model/pdata/metrics_test.go

@@ -521,6 +521,8 @@ func TestOtlpToFromInternalHistogramMutating(t *testing.T) {
  histogramDataPoints.At(0).SetExplicitBounds([]float64{1})
  assert.EqualValues(t, []float64{1}, histogramDataPoints.At(0).ExplicitBounds())
  histogramDataPoints.At(0).SetBucketCounts([]uint64{21, 32})
+ histogramDataPoints.At(0).SetMin(10.1)
+ histogramDataPoints.At(0).SetMax(27)
  // Test that everything is updated.
  assert.EqualValues(t, &otlpmetrics.MetricsData{
  ResourceMetrics: []*otlpmetrics.ResourceMetrics{
@@ -549,6 +551,8 @@ func TestOtlpToFromInternalHistogramMutating(t *testing.T) {
  TimeUnixNano: endTime + 1,
  BucketCounts: []uint64{21, 32},
  ExplicitBounds: []float64{1},
+ Min_: histogramDataPoints.At(0).orig.Min_,
+ Max_: histogramDataPoints.At(0).orig.Max_,
  },
  },
  },

proto_patch.sed

@@ -50,4 +50,7 @@ s+repeated Exemplar exemplars = \(.*\);+repeated Exemplar exemplars = \1\
  [ (gogoproto.nullable) = false ];+g
 
 s+Buckets \(.*\)tive = \(.*\);+Buckets \1tive = \2\
- [ (gogoproto.nullable) = false ];+g
+ [ (gogoproto.nullable) = false ];+g
+
+# optional fixed64 foo = 1 -> oneof foo_ { fixed64 foo = 1;}
+s+optional \(.*\) \(.*\) = \(.*\);+ oneof \2_ { \1 \2 = \3;}+g