Resolve comments

open-telemetry · Nov 2, 2020 · 61105ad · 61105ad
1 parent 56a732f
commit 61105ad
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/consumer/pdata/metric.go b/consumer/pdata/metric.go
@@ -288,8 +288,8 @@ func (ms Metric) DoubleHistogram() DoubleHistogram {
 	return newDoubleHistogram(&(*ms.orig).Data.(*otlpmetrics.Metric_DoubleHistogram).DoubleHistogram)
 }
 
-// DoubleHistogram returns the data as DoubleHistogram.
-// Calling this function when DataType() != MetricDataTypeDoubleHistogram will cause a panic.
+// DoubleSummary returns the data as DoubleSummary.
+// Calling this function when DataType() != MetricDataTypeDoubleSummary will cause a panic.
 // Calling this function on zero-initialized Metric will cause a panic.
 func (ms Metric) DoubleSummary() DoubleSummary {
 	return newDoubleSummary(&(*ms.orig).Data.(*otlpmetrics.Metric_DoubleSummary).DoubleSummary)

diff --git a/exporter/loggingexporter/logging_exporter_test.go b/exporter/loggingexporter/logging_exporter_test.go
@@ -49,7 +49,7 @@ func TestLoggingMetricsExporterNoErrors(t *testing.T) {
 	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsOneEmptyOneNilResourceMetrics()))
 	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsOneEmptyOneNilInstrumentationLibrary()))
 	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsOneMetricOneNil()))
-	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsWithCountersHistogramsAndSummary()))
+	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GeneratMetricsAllTypesWithSampleDatapoints()))
 	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsAllTypesNilDataPoint()))
 	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsAllTypesEmptyDataPoint()))
 	assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsMetricTypeInvalid()))

diff --git a/internal/data/testdata/metric.go b/internal/data/testdata/metric.go
@@ -353,7 +353,7 @@ func generateMetricsOtlpAllTypesNoDataPoints() []*otlpmetrics.ResourceMetrics {
 	}
 }
 
-func GenerateMetricsWithCountersHistogramsAndSummary() pdata.Metrics {
+func GeneratMetricsAllTypesWithSampleDatapoints() pdata.Metrics {
 	metricData := pdata.NewMetrics()
 	metricData.ResourceMetrics().Resize(1)
 
@@ -373,7 +373,7 @@ func GenerateMetricsWithCountersHistogramsAndSummary() pdata.Metrics {
 	return metricData
 }
 
-func generateMetricsOtlpWithCountersHistogramsAndSummary() []*otlpmetrics.ResourceMetrics {
+func generateMetricsOtlpAllTypesWithSampleDatapoints() []*otlpmetrics.ResourceMetrics {
 	return []*otlpmetrics.ResourceMetrics{
 		{
 			Resource: generateOtlpResource1(),
@@ -384,7 +384,7 @@ func generateMetricsOtlpWithCountersHistogramsAndSummary() []*otlpmetrics.Resour
 						generateOtlpSumDoubleMetric(),
 						generateOtlpDoubleHistogramMetric(),
 						generateOtlpIntHistogramMetric(),
-						generateOtlpDoubleSummaryMetric(),
+						generateOTLPDoubleSummaryMetric(),
 					},
 				},
 			},
@@ -621,7 +621,7 @@ func initDoubleSummaryMetric(sm pdata.Metric) {
 	quantiles.CopyTo(sdp1.QuantileValues())
 }
 
-func generateOtlpDoubleSummaryMetric() *otlpmetrics.Metric {
+func generateOTLPDoubleSummaryMetric() *otlpmetrics.Metric {
 	m := generateOtlpMetric(TestDoubleSummaryMetricName, pdata.MetricDataTypeDoubleSummary)
 	m.Data.(*otlpmetrics.Metric_DoubleSummary).DoubleSummary.DataPoints =
 		[]*otlpmetrics.DoubleSummaryDataPoint{

diff --git a/internal/data/testdata/metric_test.go b/internal/data/testdata/metric_test.go
@@ -97,9 +97,9 @@ func generateAllMetricsTestCases() []traceMetricsCase {
 			otlp: generateMetricsOtlpAllTypesNoDataPoints(),
 		},
 		{
-			name: "counters-histogram",
-			td:   GenerateMetricsWithCountersHistogramsAndSummary(),
-			otlp: generateMetricsOtlpWithCountersHistogramsAndSummary(),
+			name: "all-metric-types",
+			td:   GeneratMetricsAllTypesWithSampleDatapoints(),
+			otlp: generateMetricsOtlpAllTypesWithSampleDatapoints(),
 		},
 	}
 }

diff --git a/processor/cloningfanoutconnector_test.go b/processor/cloningfanoutconnector_test.go
@@ -81,7 +81,7 @@ func TestMetricsProcessorCloningMultiplexing(t *testing.T) {
 	}
 
 	mfc := NewMetricsCloningFanOutConnector(processors)
-	md := testdata.GenerateMetricsWithCountersHistogramsAndSummary()
+	md := testdata.GeneratMetricsAllTypesWithSampleDatapoints()
 
 	var wantMetricsCount = 0
 	for i := 0; i < 2; i++ {

diff --git a/translator/internaldata/metrics_to_oc_test.go b/translator/internaldata/metrics_to_oc_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestMetricsToOC(t *testing.T) {
-	sampleMetricData := testdata.GenerateMetricsWithCountersHistogramsAndSummary()
+	sampleMetricData := testdata.GeneratMetricsAllTypesWithSampleDatapoints()
 	attrs := sampleMetricData.ResourceMetrics().At(0).Resource().Attributes()
 	attrs.Upsert(conventions.AttributeHostHostname, pdata.NewAttributeValueString("host1"))
 	attrs.Upsert(conventions.OCAttributeProcessID, pdata.NewAttributeValueInt(123))

diff --git a/translator/internaldata/oc_to_metrics_test.go b/translator/internaldata/oc_to_metrics_test.go
@@ -35,7 +35,7 @@ func TestOCToMetrics(t *testing.T) {
 	ih.SetDataType(pdata.MetricDataTypeDoubleHistogram)
 	dh.DoubleHistogram().CopyTo(ih.DoubleHistogram())
 
-	sampleMetricData := testdata.GenerateMetricsWithCountersHistogramsAndSummary()
+	sampleMetricData := testdata.GeneratMetricsAllTypesWithSampleDatapoints()
 	dh = sampleMetricData.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2)
 	ih = sampleMetricData.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3)
 	ih.SetDataType(pdata.MetricDataTypeDoubleHistogram)