Bump github.com/influxdata/influxdb-observability/otel2influx from 0.2.15 to 0.2.20 in /exporter/influxdbexporter

exporter/influxdbexporter/go.mod

@@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influx
 go 1.17
 
 require (
-	github.com/influxdata/influxdb-observability/common v0.2.15
-	github.com/influxdata/influxdb-observability/otel2influx v0.2.15
+	github.com/influxdata/influxdb-observability/common v0.2.20
+	github.com/influxdata/influxdb-observability/otel2influx v0.2.20
 	github.com/influxdata/line-protocol/v2 v2.2.1
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.7.1
 	go.opentelemetry.io/collector v0.47.0
 	go.opentelemetry.io/collector/model v0.47.0
 	go.uber.org/zap v1.21.0
@@ -24,27 +24,35 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.15.1 // indirect
 	github.com/knadh/koanf v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	go.opencensus.io v0.23.0 // indirect
+	go.opentelemetry.io/collector/pdata v0.51.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
 	go.opentelemetry.io/otel v1.4.1 // indirect
 	go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
 	go.opentelemetry.io/otel/metric v0.27.0 // indirect
 	go.opentelemetry.io/otel/trace v1.4.1 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	google.golang.org/grpc v1.45.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
+	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+	google.golang.org/grpc v1.46.0 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

exporter/prometheusexporter/collector.go

@@ -176,6 +176,7 @@ func (c *collector) convertDoubleHistogram(metric pdata.Metric) (prometheus.Metr
 
 	indicesMap := make(map[float64]int)
 	buckets := make([]float64, 0, len(ip.BucketCounts()))
+
 	for index, bucket := range ip.ExplicitBounds() {
 		if _, added := indicesMap[bucket]; !added {
 			indicesMap[bucket] = index
@@ -197,11 +198,36 @@ func (c *collector) convertDoubleHistogram(metric pdata.Metric) (prometheus.Metr
 		points[bucket] = cumCount
 	}
 
+	arrLen := ip.Exemplars().Len()
+	exemplars := make([]prometheus.Exemplar, arrLen)
+	for i := 0; i < arrLen; i++ {
+		e := ip.Exemplars().At(i)
+
+		labels := make(prometheus.Labels, e.FilteredAttributes().Len())
+		e.FilteredAttributes().Range(func(k string, v pdata.AttributeValue) bool {
+			labels[k] = v.AsString()
+			return true
+		})
+
+		exemplars[i] = prometheus.Exemplar{
+			Value:     e.DoubleVal(),
+			Labels:    labels,
+			Timestamp: e.Timestamp().AsTime(),
+		}
+	}
+
 	m, err := prometheus.NewConstHistogram(desc, ip.Count(), ip.Sum(), points, attributes...)
 	if err != nil {
 		return nil, err
 	}
 
+	if arrLen > 0 {
+		m, err = prometheus.NewMetricWithExemplars(m, exemplars...)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	if c.sendTimestamps {
 		return prometheus.NewMetricWithTimestamp(ip.Timestamp().AsTime(), m), nil
 	}

exporter/prometheusexporter/collector_test.go

@@ -87,6 +87,83 @@ func TestConvertInvalidMetric(t *testing.T) {
 	}
 }
 
+func TestConvertDoubleHistogramExemplar(t *testing.T) {
+	// initialize empty histogram
+	metric := pdata.NewMetric()
+	metric.SetDataType(pdata.MetricDataTypeHistogram)
+	metric.SetName("test_metric")
+	metric.SetDescription("this is test metric")
+	metric.SetUnit("T")
+
+	// initialize empty datapoint
+	hd := metric.Histogram().DataPoints().AppendEmpty()
+
+	bounds := []float64{5, 25, 90}
+	hd.SetExplicitBounds(bounds)
+	bc := []uint64{2, 35, 70}
+	hd.SetBucketCounts(bc)
+
+	exemplarTs, _ := time.Parse("unix", "Mon Jan _2 15:04:05 MST 2006")
+	exemplars := []prometheus.Exemplar{
+		{
+			Timestamp: exemplarTs,
+			Value:     3,
+			Labels:    prometheus.Labels{"test_label_0": "label_value_0"},
+		},
+		{
+			Timestamp: exemplarTs,
+			Value:     50,
+			Labels:    prometheus.Labels{"test_label_1": "label_value_1"},
+		},
+		{
+			Timestamp: exemplarTs,
+			Value:     78,
+			Labels:    prometheus.Labels{"test_label_2": "label_value_2"},
+		},
+	}
+
+	// add each exemplar value to the metric
+	for _, e := range exemplars {
+		pde := hd.Exemplars().AppendEmpty()
+		pde.SetDoubleVal(e.Value)
+		for k, v := range e.Labels {
+			pde.FilteredAttributes().InsertString(k, v)
+		}
+		pde.SetTimestamp(pdata.NewTimestampFromTime(e.Timestamp))
+	}
+
+	c := collector{
+		accumulator: &mockAccumulator{
+			[]pdata.Metric{metric},
+		},
+		logger: zap.NewNop(),
+	}
+
+	pbMetric, _ := c.convertDoubleHistogram(metric)
+	m := io_prometheus_client.Metric{}
+	pbMetric.Write(&m)
+
+	buckets := m.GetHistogram().GetBucket()
+
+	require.Equal(t, 3, len(buckets))
+
+	require.Equal(t, 3.0, buckets[0].GetExemplar().GetValue())
+	require.Equal(t, int32(128654848), buckets[0].GetExemplar().GetTimestamp().GetNanos())
+	require.Equal(t, 1, len(buckets[0].GetExemplar().GetLabel()))
+	require.Equal(t, "test_label_0", buckets[0].GetExemplar().GetLabel()[0].GetName())
+	require.Equal(t, "label_value_0", buckets[0].GetExemplar().GetLabel()[0].GetValue())
+
+	require.Equal(t, 0.0, buckets[1].GetExemplar().GetValue())
+	require.Equal(t, int32(0), buckets[1].GetExemplar().GetTimestamp().GetNanos())
+	require.Equal(t, 0, len(buckets[1].GetExemplar().GetLabel()))
+
+	require.Equal(t, 78.0, buckets[2].GetExemplar().GetValue())
+	require.Equal(t, int32(128654848), buckets[2].GetExemplar().GetTimestamp().GetNanos())
+	require.Equal(t, 1, len(buckets[2].GetExemplar().GetLabel()))
+	require.Equal(t, "test_label_2", buckets[2].GetExemplar().GetLabel()[0].GetName())
+	require.Equal(t, "label_value_2", buckets[2].GetExemplar().GetLabel()[0].GetValue())
+}
+
 // errorCheckCore keeps track of logged errors
 type errorCheckCore struct {
 	errorMessages []string

exporter/prometheusexporter/config.go

@@ -46,6 +46,9 @@ type Config struct {
 	// ResourceToTelemetrySettings defines configuration for converting resource attributes to metric labels.
 	ResourceToTelemetrySettings resourcetotelemetry.Settings `mapstructure:"resource_to_telemetry_conversion"`
 
+	// EnableOpenMetrics enables the use of the OpenMetrics encoding option for the prometheus exporter.
+	EnableOpenMetrics bool `mapstructure:"enable_open_metrics"`
+
 	// skipSanitizeLabel if enabled, labels that start with _ are not sanitized
 	skipSanitizeLabel bool
 }

exporter/prometheusexporter/factory.go

@@ -46,6 +46,7 @@ func createDefaultConfig() config.Exporter {
 		ConstLabels:       map[string]string{},
 		SendTimestamps:    false,
 		MetricExpiration:  time.Minute * 5,
+		EnableOpenMetrics: false,
 		skipSanitizeLabel: featuregate.IsEnabled(dropSanitizationGate.ID),
 	}
 }

exporter/prometheusexporter/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.47.0
-	github.com/prometheus/client_golang v1.12.1
+	github.com/prometheus/client_golang v1.12.2-0.20220318110013-3bc8f2c651ff
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2
 	github.com/stretchr/testify v1.7.0