merge conflict resolve and test fix

open-telemetry · Sep 16, 2022 · bf2ed93 · bf2ed93
1 parent 4a13dd5
commit bf2ed93
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/exporter/prometheusexporter/collector_test.go b/exporter/prometheusexporter/collector_test.go
@@ -104,7 +104,8 @@ func TestConvertDoubleHistogramExemplar(t *testing.T) {
  metric.SetUnit("T")
 
  // initialize empty datapoint
- histogramDataPoint := metric.Histogram().DataPoints().AppendEmpty()
+ histogramDataPoint := metric.SetEmptyHistogram().DataPoints().AppendEmpty()
+
  bounds := pcommon.NewImmutableFloat64Slice([]float64{5, 25, 90})
  histogramDataPoint.SetExplicitBounds(bounds)
  bc := pcommon.NewImmutableUInt64Slice([]uint64{2, 35, 70})
@@ -115,13 +116,13 @@ func TestConvertDoubleHistogramExemplar(t *testing.T) {
  var tBytes [16]byte
  testTraceID, _ := hex.DecodeString("641d68e314a58152cc2581e7663435d1")
  copy(tBytes[:], testTraceID)
- traceID := pcommon.NewTraceID(tBytes)
+ traceID := pcommon.TraceID(tBytes)
  promExporterExemplars.SetTraceID(traceID)
 
  var sBytes [8]byte
  testSpanID, _ := hex.DecodeString("7436d6ac76178623")
  copy(sBytes[:], testSpanID)
- spanID := pcommon.NewSpanID(sBytes)
+ spanID := pcommon.SpanID(sBytes)
  promExporterExemplars.SetSpanID(spanID)
 
  exemplarTs, _ := time.Parse("unix", "Mon Jan _2 15:04:05 MST 2006")