small fixes

open-telemetry · Apr 21, 2023 · a9fa1ba · a9fa1ba
1 parent 9a737c8
commit a9fa1ba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/receiver/azuremonitorreceiver/factory.go b/receiver/azuremonitorreceiver/factory.go
@@ -57,7 +57,7 @@ func createMetricsReceiver(ctx context.Context, params receiver.CreateSettings,
 	}
 
 	azureScraper := newScraper(cfg, params)
-	scraper, err := scraperhelper.NewScraper(typeStr, azureScraper.scrape, scraperhelper.WithStart(azureScraper.start))
+	scraper, err := scraperhelper.NewScraper(metadata.Type, azureScraper.scrape, scraperhelper.WithStart(azureScraper.start))
 	if err != nil {
 		return nil, err
 	}

diff --git a/receiver/azuremonitorreceiver/factory_test.go b/receiver/azuremonitorreceiver/factory_test.go
@@ -37,7 +37,7 @@ func TestNewFactory(t *testing.T) {
 			desc: "creates a new factory with correct type",
 			testFunc: func(t *testing.T) {
 				factory := NewFactory()
-				require.EqualValues(t, typeStr, factory.Type())
+				require.EqualValues(t, metadata.Type, factory.Type())
 			},
 		},
 		{

diff --git a/receiver/azuremonitorreceiver/scraper.go b/receiver/azuremonitorreceiver/scraper.go
@@ -317,10 +317,10 @@ func (s *azureScraper) getResourceMetricsValues(ctx context.Context, resourceID
 
 			for _, metric := range result.Value {
 
-				for _, timeserie := range metric.Timeseries {
-					if timeserie.Data != nil {
-						for _, timeserieData := range timeserie.Data {
-							s.processTimeserieData(resourceID, metric, timeserieData, timeserie.Metadatavalues)
+				for _, timeseriesElement := range metric.Timeseries {
+					if timeseriesElement.Data != nil {
+						for _, metricValue := range timeseriesElement.Data {
+							s.processTimeseriesData(resourceID, metric, metricValue, timeseriesElement.Metadatavalues)
 						}
 					}
 				}
@@ -352,10 +352,10 @@ func getResourceMetricsValuesRequestOptions(
 	return filter
 }
 
-func (s *azureScraper) processTimeserieData(
+func (s *azureScraper) processTimeseriesData(
 	resourceID string,
 	metric *armmonitor.Metric,
-	timeserieData *armmonitor.MetricValue,
+	metricValue *armmonitor.MetricValue,
 	metadataValues []*armmonitor.MetadataValue,
 ) {
 	s.mutex.Lock()
@@ -367,11 +367,11 @@ func (s *azureScraper) processTimeserieData(
 		name  string
 		value *float64
 	}{
-		{"Average", timeserieData.Average},
-		{"Count", timeserieData.Count},
-		{"Maximum", timeserieData.Maximum},
-		{"Minimum", timeserieData.Minimum},
-		{"Total", timeserieData.Total},
+		{"Average", metricValue.Average},
+		{"Count", metricValue.Count},
+		{"Maximum", metricValue.Maximum},
+		{"Minimum", metricValue.Minimum},
+		{"Total", metricValue.Total},
 	}
 	for _, aggregation := range aggregationsData {
 		if aggregation.value != nil {