-
Notifications
You must be signed in to change notification settings - Fork 916
fix(metrics): accurate error messages for instrument name and unit validation #5283
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
Open
ersalil
wants to merge
4
commits into
open-telemetry:main
Choose a base branch
from
ersalil:fix/metrics-instrument-error-message
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+37
−5
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ff034b2
fix(metrics): provide distinct, accurate error messages for instrumen…
ersalil ad23ad0
chore(changelog): add fragment for PR #5283
ersalil f3b3f07
Potential fix for pull request finding
ersalil e332d9f
Merge branch 'main' into fix/metrics-instrument-error-message
lzchen 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 @@ | ||
| metrics: clarify instrument name validation error message to reflect spec constraints (start with a letter, allowed chars, max length 255) | ||
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
26 changes: 26 additions & 0 deletions
26
opentelemetry-sdk/tests/metrics/test_instrument_error_message.py
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,26 @@ | ||
| import unittest | ||
|
|
||
| from opentelemetry.sdk.metrics._internal.instrument import _Synchronous | ||
| from opentelemetry.sdk.util.instrumentation import InstrumentationScope | ||
|
|
||
| class TestInstrumentErrorMessage(unittest.TestCase): | ||
| def test_invalid_name_error_message(self): | ||
| scope = InstrumentationScope("test") | ||
| with self.assertRaises(Exception) as cm: | ||
| _Synchronous("1invalid", scope, object()) | ||
| msg = str(cm.exception) | ||
| self.assertIn("start with a letter", msg) | ||
| self.assertIn("255", msg) | ||
|
|
||
|
|
||
| def test_invalid_unit_error_message(self): | ||
| scope = InstrumentationScope("test") | ||
| # name valid, unit invalid (non-ASCII) | ||
| with self.assertRaises(Exception) as cm: | ||
| _Synchronous("validname", scope, object(), unit="Ñ") | ||
| msg = str(cm.exception) | ||
| self.assertIn("maximum length 63", msg) | ||
| self.assertIn("ASCII", msg) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
|
Contributor
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. Please remove this. |
||
| unittest.main() | ||
|
Comment on lines
+25
to
+26
|
||
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.
Please include the full package name here.