Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/5673.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`opentelemetry-sdk`: reject character set wildcards (`[`, `]`) in `View.instrument_name` when a custom `name` is provided
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def __init__(
# pylint: disable=broad-exception-raised
raise Exception(f"Some instrument selection criteria must be provided for View {name}")

if name is not None and instrument_name is not None and ("*" in instrument_name or "?" in instrument_name):
if name is not None and instrument_name is not None and any(c in instrument_name for c in "*?[]"):
# pylint: disable=broad-exception-raised
raise Exception(f"View {name} declared with wildcard characters in instrument_name")

Expand Down
20 changes: 18 additions & 2 deletions opentelemetry-sdk/tests/metrics/test_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,21 @@ def test_additive_criteria(self):
)

def test_view_name(self):
with self.assertRaises(Exception):
View(name="name", instrument_name="instrument_name*")
for wildcard_name in (
"instrument_name*",
"*instrument_name",
"instrument?name",
"instrument_[0-9]",
"instrument_[!a-z]",
"instrument_[abc]",
"instrument_[",
"instrument_]",
):
with self.subTest(wildcard_name=wildcard_name):
with self.assertRaises(Exception):
View(name="name", instrument_name=wildcard_name)

# Non-wildcard instrument name should succeed
view = View(name="name", instrument_name="instrument_name")
self.assertEqual(view._name, "name")
self.assertEqual(view._instrument_name, "instrument_name")