Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue-21715 fetching metric values with composite(all) dimension keys #21716

Merged
merged 6 commits into from
Jun 2, 2023
Merged

issue-21715 fetching metric values with composite(all) dimension keys #21716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3301a3
issue-21715 fetching metric vlaues with composite(all) dimension keys
rajim17 May 9, 2023
065f78b
issue #21715- adding testdata with multiple dimensions
rajim17 May 10, 2023
8e443b8
issue #21715 - review comments - removing CompositeKey struct
rajim17 May 16, 2023
6a187bc
Revert "issue #21715 - review comments - removing CompositeKey struct"
rajim17 May 19, 2023
856b74b
#21715 - review comments - sort dimensions strings before hasing
rajim17 May 19, 2023
7034dcb
and use metricCompisteKey as key to map
rajim17 May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions .chloggen/azure_monitor_receiver-composite-dimensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: receiver/azuremonitorreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Retrieve metric values with all dimension keys in filter

# One or more tracking issues related to the change
issues: [21715]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
34 changes: 25 additions & 9 deletions receiver/azuremonitorreceiver/scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
package azuremonitorreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver"

import (
"bytes"
"context"
"fmt"
"sort"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -71,8 +73,8 @@ type azureResource struct {
}

type metricsCompositeKey struct {
rajim17 marked this conversation as resolved.
Show resolved Hide resolved
dimension string
timeGrain string
dimensions string // comma separated sorted dimensions
timeGrain string
}

type azureResourceMetrics struct {
Expand Down Expand Up @@ -266,10 +268,15 @@ func (s *azureScraper) getResourceMetricsDefinitions(ctx context.Context, resour
compositeKey := metricsCompositeKey{timeGrain: timeGrain}

if len(v.Dimensions) > 0 {
var dimensionsSlice []string
for _, dimension := range v.Dimensions {
compositeKey.dimension = *dimension.Value
s.storeMetricsDefinition(resourceID, name, compositeKey)
if len(strings.TrimSpace(*dimension.Value)) > 0 {
dimensionsSlice = append(dimensionsSlice, *dimension.Value)
}
}
sort.Strings(dimensionsSlice)
dimensionsCompositeKey := metricsCompositeKey{timeGrain: timeGrain, dimensions: strings.Join(dimensionsSlice, ",")}
s.storeMetricsDefinition(resourceID, name, dimensionsCompositeKey)
} else {
s.storeMetricsDefinition(resourceID, name, compositeKey)
}
Expand Down Expand Up @@ -309,7 +316,7 @@ func (s *azureScraper) getResourceMetricsValues(ctx context.Context, resourceID

opts := getResourceMetricsValuesRequestOptions(
metricsByGrain.metrics,
compositeKey.dimension,
compositeKey.dimensions,
compositeKey.timeGrain,
start,
end,
Expand Down Expand Up @@ -356,7 +363,7 @@ func (s *azureScraper) getResourceMetricsValues(ctx context.Context, resourceID

func getResourceMetricsValuesRequestOptions(
metrics []string,
dimension string,
dimensionsStr string,
timeGrain string,
start int,
end int,
Expand All @@ -369,9 +376,18 @@ func getResourceMetricsValuesRequestOptions(
Aggregation: to.Ptr(strings.Join(aggregations, ",")),
}

if len(dimension) > 0 {
dimensionFilter := fmt.Sprintf("%s eq '*'", dimension)
filter.Filter = &dimensionFilter
if len(dimensionsStr) > 0 {
var dimensionsFilter bytes.Buffer
dimensions := strings.Split(dimensionsStr, ",")
for i, dimension := range dimensions {
dimensionsFilter.WriteString(dimension)
dimensionsFilter.WriteString(" eq '*' ")
if i < len(dimensions)-1 {
dimensionsFilter.WriteString(" and ")
}
}
dimensionFilterString := dimensionsFilter.String()
filter.Filter = &dimensionFilterString
}

return filter
Expand Down
38 changes: 26 additions & 12 deletions receiver/azuremonitorreceiver/scraper_test.go
View file
Open in desktop
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
Open in desktop
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