Skip to content

Use object instead of Any for labels() parameters #1186

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

Open
gregoiredx wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

Use object instead of Any for labels() parameters #1186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions prometheus_client/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def __init__(self: T,
if registry:
registry.register(self)

def labels(self: T, *labelvalues: Any, **labelkwargs: Any) -> T:
def labels(self: T, *labelvalues: object, **labelkwargs: object) -> T:
"""Return the child for the given labelset.

All metrics can have labels, allowing grouping of related time series.
Expand Down Expand Up @@ -173,13 +173,13 @@ def labels(self: T, *labelvalues: Any, **labelkwargs: Any) -> T:
if labelkwargs:
if sorted(labelkwargs) != sorted(self._labelnames):
raise ValueError('Incorrect label names')
labelvalues = tuple(str(labelkwargs[l]) for l in self._labelnames)
str_labelvalues = tuple(str(labelkwargs[l]) for l in self._labelnames)
else:
if len(labelvalues) != len(self._labelnames):
raise ValueError('Incorrect label count')
labelvalues = tuple(str(l) for l in labelvalues)
str_labelvalues = tuple(str(l) for l in labelvalues)
with self._lock:
if labelvalues not in self._metrics:
if str_labelvalues not in self._metrics:

original_name = getattr(self, '_original_name', self._name)
namespace = getattr(self, '_namespace', '')
Expand All @@ -190,17 +190,17 @@ def labels(self: T, *labelvalues: Any, **labelkwargs: Any) -> T:
for k in ('namespace', 'subsystem', 'unit'):
child_kwargs.pop(k, None)

self._metrics[labelvalues] = self.__class__(
self._metrics[str_labelvalues] = self.__class__(
original_name,
documentation=self._documentation,
labelnames=self._labelnames,
namespace=namespace,
subsystem=subsystem,
unit=unit,
_labelvalues=labelvalues,
_labelvalues=str_labelvalues,
**child_kwargs
)
return self._metrics[labelvalues]
return self._metrics[str_labelvalues]

def remove(self, *labelvalues: Any) -> None:
if 'prometheus_multiproc_dir' in os.environ or 'PROMETHEUS_MULTIPROC_DIR' in os.environ:
Expand Down