Merge pull request #2506 from Shopify/sveiss/port-patches-to-0.56

Port Shopify patches to v0.56

Author: sveiss

.github/dependabot.yml

@@ -158,23 +158,23 @@ gendependabot:
 	@echo "  - package-ecosystem: \"github-actions\"" >> ${DEPENDABOT_PATH}
 	@echo "    directory: \"/\"" >> ${DEPENDABOT_PATH}
 	@echo "    schedule:" >> ${DEPENDABOT_PATH}
-	@echo "      interval: \"weekly\"" >> ${DEPENDABOT_PATH}
+	@echo "      interval: \"monthly\"" >> ${DEPENDABOT_PATH}
 	@echo "Add entry for \"/\" docker"
 	@echo "  - package-ecosystem: \"docker\"" >> ${DEPENDABOT_PATH}
 	@echo "    directory: \"/\"" >> ${DEPENDABOT_PATH}
 	@echo "    schedule:" >> ${DEPENDABOT_PATH}
-	@echo "      interval: \"weekly\"" >> ${DEPENDABOT_PATH}
+	@echo "      interval: \"monthly\"" >> ${DEPENDABOT_PATH}
 	@echo "Add entry for \"/\" gomod"
 	@echo "  - package-ecosystem: \"gomod\"" >> ${DEPENDABOT_PATH}
 	@echo "    directory: \"/\"" >> ${DEPENDABOT_PATH}
 	@echo "    schedule:" >> ${DEPENDABOT_PATH}
-	@echo "      interval: \"weekly\"" >> ${DEPENDABOT_PATH}
+	@echo "      interval: \"monthly\"" >> ${DEPENDABOT_PATH}
 	@set -e; for dir in $(NONROOT_MODS); do \
 		echo "Add entry for \"$${dir:1}\""; \
 		echo "  - package-ecosystem: \"gomod\"" >> ${DEPENDABOT_PATH}; \
 		echo "    directory: \"$${dir:1}\"" >> ${DEPENDABOT_PATH}; \
 		echo "    schedule:" >> ${DEPENDABOT_PATH}; \
-		echo "      interval: \"weekly\"" >> ${DEPENDABOT_PATH}; \
+		echo "      interval: \"monthly\"" >> ${DEPENDABOT_PATH}; \
 	done
 
 # Define a delegation target for each module

Makefile

@@ -948,3 +948,5 @@ exclude github.com/StackExchange/wmi v1.2.0
 
 // see https://github.com/distribution/distribution/issues/3590
 exclude github.com/docker/distribution v2.8.0+incompatible
+
+replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.2-0.20220318110013-3bc8f2c651ff

cmd/configschema/go.mod

@@ -209,11 +209,36 @@ func (c *collector) convertDoubleHistogram(metric pmetric.Metric, resourceAttrs
 		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 pcommon.Value) 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
 	}

cmd/configschema/go.sum

@@ -96,6 +96,84 @@ func TestConvertInvalidMetric(t *testing.T) {
 	}
 }
 
+func TestConvertDoubleHistogramExemplar(t *testing.T) {
+	// initialize empty histogram
+	metric := pmetric.NewMetric()
+	metric.SetDataType(pmetric.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.SetMExplicitBounds(bounds)
+	bc := []uint64{2, 35, 70}
+	hd.SetMBucketCounts(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(pcommon.NewTimestampFromTime(e.Timestamp))
+	}
+
+	c := collector{
+		accumulator: &mockAccumulator{
+			[]pmetric.Metric{metric},
+			pcommon.NewMap(),
+		},
+		logger: zap.NewNop(),
+	}
+
+	pbMetric, _ := c.convertDoubleHistogram(metric, pcommon.NewMap())
+	m := io_prometheus_client.Metric{}
+	require.NoError(t, 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