-
Notifications
You must be signed in to change notification settings - Fork 2.7k
[processor/attributes] validate metrics configuration parameters before processing #37435
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e7e582c
[processor/attributes] validate metrics configuration parameters befo…
odubajDT 443e27b
fix lint
odubajDT 41f0f04
fix after rebase
odubajDT 801cd1b
more tests
odubajDT e13be33
Merge branch 'main' into fix-metric-validation
odubajDT 68b2837
Merge branch 'main' into fix-metric-validation
odubajDT 048aa2a
Merge branch 'main' into fix-metric-validation
odubajDT 98a39bb
Merge branch 'main' into fix-metric-validation
odubajDT File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: bug_fix | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) | ||
component: attributesprocessor | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: "Validate metrics configuration parameters before processing" | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [36077] | ||
|
||
# (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: | ||
|
||
# If your change doesn't affect end users or the exported elements of any package, | ||
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
# Optional: The change log or logs in which this entry should be included. | ||
# e.g. '[user]' or '[user, api]' | ||
# Include 'user' if the change is relevant to end users. | ||
# Include 'api' if there is a change to a library API. | ||
# Default: '[user]' | ||
change_logs: [] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -126,9 +126,11 @@ type MatchProperties struct { | |
} | ||
|
||
var ( | ||
ErrMissingRequiredField = errors.New(`at least one of "attributes", "libraries", or "resources" field must be specified`) | ||
ErrInvalidLogField = errors.New("services, span_names, and span_kinds are not valid for log records") | ||
ErrMissingRequiredLogField = errors.New(`at least one of "attributes", "libraries", "span_kinds", "resources", "log_bodies", "log_severity_texts" or "log_severity_number" field must be specified`) | ||
ErrMissingRequiredSpanField = errors.New(`at least one of "attributes", "libraries", or "resources" field must be specified`) | ||
ErrInvalidLogField = errors.New("services, span_names, span_kinds and metric_names are not valid for log records") | ||
ErrMissingRequiredLogField = errors.New(`at least one of "attributes", "libraries", "span_kinds", "resources", "log_bodies", "log_severity_texts" or "log_severity_number" field must be specified`) | ||
ErrMissingRequiredMetricField = errors.New(`at least one of "metric_names" or "resources" field must be specified`) | ||
ErrInvalidMetricField = errors.New(`"span_names", "span_kinds", "log_bodies", "log_severity_texts", "log_severity_number", "services", "attributes" and "libraries" are not valid for metrics`) | ||
|
||
spanKinds = map[string]bool{ | ||
traceutil.SpanKindStr(ptrace.SpanKindInternal): true, | ||
|
@@ -153,9 +155,13 @@ func (mp *MatchProperties) ValidateForSpans() error { | |
return errors.New("log_severity_number should not be specified for trace spans") | ||
} | ||
|
||
if len(mp.MetricNames) > 0 { | ||
return errors.New("metric_names should not be specified for trace spans") | ||
} | ||
|
||
if len(mp.Services) == 0 && len(mp.SpanNames) == 0 && len(mp.Attributes) == 0 && | ||
len(mp.Libraries) == 0 && len(mp.Resources) == 0 && len(mp.SpanKinds) == 0 { | ||
return ErrMissingRequiredField | ||
return ErrMissingRequiredSpanField | ||
} | ||
|
||
if len(mp.SpanKinds) > 0 && mp.MatchType == "strict" { | ||
|
@@ -176,7 +182,7 @@ func (mp *MatchProperties) ValidateForSpans() error { | |
|
||
// ValidateForLogs validates properties for logs. | ||
func (mp *MatchProperties) ValidateForLogs() error { | ||
if len(mp.SpanNames) > 0 || len(mp.Services) > 0 || len(mp.SpanKinds) > 0 { | ||
if len(mp.SpanNames) > 0 || len(mp.Services) > 0 || len(mp.SpanKinds) > 0 || len(mp.MetricNames) > 0 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. According to the documentation, |
||
return ErrInvalidLogField | ||
} | ||
|
||
|
@@ -190,6 +196,26 @@ func (mp *MatchProperties) ValidateForLogs() error { | |
return nil | ||
} | ||
|
||
// ValidateForMetrics validates properties for metrics. | ||
func (mp *MatchProperties) ValidateForMetrics() error { | ||
if len(mp.LogBodies) > 0 || | ||
len(mp.LogSeverityTexts) > 0 || | ||
len(mp.SpanNames) > 0 || | ||
len(mp.Services) > 0 || | ||
len(mp.SpanKinds) > 0 || | ||
len(mp.Attributes) > 0 || | ||
len(mp.Libraries) > 0 || | ||
mp.LogSeverityNumber != nil { | ||
return ErrInvalidMetricField | ||
} | ||
|
||
if len(mp.MetricNames) == 0 && len(mp.Resources) == 0 { | ||
return ErrMissingRequiredMetricField | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// Attribute specifies the attribute key and optional value to match against. | ||
type Attribute struct { | ||
// Key specifies the attribute key. | ||
|
@@ -261,15 +287,19 @@ type MetricMatchProperties struct { | |
ResourceAttributes []Attribute `mapstructure:"resource_attributes"` | ||
} | ||
|
||
func CreateMetricMatchPropertiesFromDefault(properties *MatchProperties) *MetricMatchProperties { | ||
func CreateMetricMatchPropertiesFromDefault(properties *MatchProperties) (*MetricMatchProperties, error) { | ||
if properties == nil { | ||
return nil | ||
return nil, nil | ||
} | ||
|
||
if err := properties.ValidateForMetrics(); err != nil { | ||
return nil, err | ||
} | ||
|
||
return &MetricMatchProperties{ | ||
MatchType: MetricMatchType(properties.Config.MatchType), | ||
RegexpConfig: properties.Config.RegexpConfig, | ||
MetricNames: properties.MetricNames, | ||
ResourceAttributes: properties.Resources, | ||
} | ||
}, nil | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the documentation,
metric_names
should be allowed only for metrics