Skip to content

Commit

Permalink
issue open-telemetry#21715- adding testdata with multiple dimensions
Browse files Browse the repository at this point in the history
  • Loading branch information
@rajim17
rajim17 committed May 10, 2023
1 parent f3301a3 commit 065f78b
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 35 deletions.
2 changes: 1 addition & 1 deletion receiver/azuremonitorreceiver/scraper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ func getResourceMetricsValuesRequestOptions(
for i, dimension := range dimensions {
dimensionsFilter.WriteString(dimension)
dimensionsFilter.WriteString(" eq '*' ")
if i != len(dimensions) {
if i < len(dimensions)-1 {
dimensionsFilter.WriteString(" and ")
}
}
Expand Down
38 changes: 26 additions & 12 deletions receiver/azuremonitorreceiver/scraper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ func TestAzureScraperScrape(t *testing.T) {
expectedFile := filepath.Join("testdata", "expected_metrics", tt.name+".yaml")
expectedMetrics, err := golden.ReadMetrics(expectedFile)
require.NoError(t, err)

require.NoError(t, pmetrictest.CompareMetrics(
expectedMetrics,
metrics,
Expand Down Expand Up @@ -279,8 +278,8 @@ func getResourcesMockData(tags bool) []armresources.ClientListResponse {
}

func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.MetricDefinitionsClientListResponse) {
name1, name2, name3, name4, name5, name6, name7, timeGrain1, timeGrain2, dimension := "metric1",
"metric2", "metric3", "metric4", "metric5", "metric6", "metric7", "PT1M", "PT1H", "dimension"
name1, name2, name3, name4, name5, name6, name7, timeGrain1, timeGrain2, dimension1, dimension2 := "metric1",
"metric2", "metric3", "metric4", "metric5", "metric6", "metric7", "PT1M", "PT1H", "dimension1", "dimension2"

counters := map[string]int{
"resourceId1": 0,
Expand Down Expand Up @@ -352,7 +351,10 @@ func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.Me
},
Dimensions: []*armmonitor.LocalizableString{
{
Value: &dimension,
Value: &dimension1,
},
{
Value: &dimension2,
},
},
},
Expand All @@ -367,7 +369,7 @@ func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.Me
},
Dimensions: []*armmonitor.LocalizableString{
{
Value: &dimension,
Value: &dimension1,
},
},
},
Expand All @@ -390,7 +392,7 @@ func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.Me
},
Dimensions: []*armmonitor.LocalizableString{
{
Value: &dimension,
Value: &dimension1,
},
},
},
Expand All @@ -403,8 +405,8 @@ func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.Me
}

func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientListResponse {
name1, name2, name3, name4, name5, name6, name7, dimension, dimensionValue := "metric1", "metric2",
"metric3", "metric4", "metric5", "metric6", "metric7", "dimension", "dimension value"
name1, name2, name3, name4, name5, name6, name7, dimension1, dimension2, dimensionValue := "metric1", "metric2",
"metric3", "metric4", "metric5", "metric6", "metric7", "dimension1", "dimension2", "dimension value"
var unit1 armmonitor.MetricUnit = "unit1"
var value1 float64 = 1

Expand Down Expand Up @@ -506,7 +508,7 @@ func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientLi
},
},
},
strings.Join([]string{name5, name6}, ","): {
name5: {
Response: armmonitor.Response{
Value: []*armmonitor.Metric{
{
Expand All @@ -528,14 +530,26 @@ func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientLi
Metadatavalues: []*armmonitor.MetadataValue{
{
Name: &armmonitor.LocalizableString{
Value: &dimension,
Value: &dimension1,
},
Value: &dimensionValue,
},
{
Name: &armmonitor.LocalizableString{
Value: &dimension2,
},
Value: &dimensionValue,
},
},
},
},
},
},
},
},
name6: {
Response: armmonitor.Response{
Value: []*armmonitor.Metric{
{
Name: &armmonitor.LocalizableString{
Value: &name6,
Expand All @@ -555,7 +569,7 @@ func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientLi
Metadatavalues: []*armmonitor.MetadataValue{
{
Name: &armmonitor.LocalizableString{
Value: &dimension,
Value: &dimension1,
},
Value: &dimensionValue,
},
Expand Down Expand Up @@ -586,7 +600,7 @@ func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientLi
Metadatavalues: []*armmonitor.MetadataValue{
{
Name: &armmonitor.LocalizableString{
Value: &dimension,
Value: &dimension1,
},
Value: &dimensionValue,
},
Expand Down
37 changes: 26 additions & 11 deletions receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -30,7 +33,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -44,7 +50,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -167,7 +173,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -181,7 +187,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -220,7 +226,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -234,7 +243,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -284,7 +293,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -326,7 +338,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId3
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -340,7 +352,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -393,7 +405,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down
37 changes: 26 additions & 11 deletions receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_tags_golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -30,7 +33,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -44,7 +50,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -188,7 +194,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -202,7 +208,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -244,7 +250,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -258,7 +267,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -311,7 +320,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -359,7 +371,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId3
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand All @@ -373,7 +385,7 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down Expand Up @@ -432,7 +444,10 @@ resourceMetrics:
- key: azuremonitor.resource_id
value:
stringValue: resourceId2
- key: metadata_dimension
- key: metadata_dimension1
value:
stringValue: dimension value
- key: metadata_dimension2
value:
stringValue: dimension value
startTimeUnixNano: "1681790471654481953"
Expand Down

0 comments on commit 065f78b

Please sign in to comment.