Skip to content

Handle resource module not being available on Windows. #28

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

Merged
brian-brazil merged 1 commit into from
Jun 20, 2015
Merged

Handle resource module not being available on Windows. #28

Show file tree
Hide file tree
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
13 changes: 9 additions & 4 deletions prometheus_client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import copy
import re
import resource
import os
import time
import threading
Expand All @@ -17,6 +16,13 @@
unicode = str
from http.server import BaseHTTPRequestHandler
from http.server import HTTPServer
try:
import resource
_PAGESIZE = resource.getpagesize()
except ImportError:
# Not Unix
_PAGESIZE = 4096

from functools import wraps
from threading import Lock

Expand Down Expand Up @@ -497,15 +503,14 @@ def __init__(self, namespace='', pid=lambda: 'self', proc='/proc', registry=REGI
self._namespace = namespace
self._pid = pid
self._proc = proc
self._pagesize = resource.getpagesize()
if namespace:
self._prefix = namespace + '_process_'
else:
self._prefix = 'process_'
self._ticks = 100.0
try:
self._ticks = os.sysconf('SC_CLK_TCK')
except (ValueError, TypeError):
except (ValueError, TypeError, AttributeError):
pass

# This is used to test if we can access /proc.
Expand Down Expand Up @@ -541,7 +546,7 @@ def collect(self):
vmem = Metric(self._prefix + 'virtual_memory_bytes', 'Virtual memory size in bytes', 'gauge')
vmem.add_sample(self._prefix + 'virtual_memory_bytes', {}, float(parts[20]))
rss = Metric(self._prefix + 'resident_memory_bytes', 'Resident memory size in bytes', 'gauge')
rss.add_sample(self._prefix + 'resident_memory_bytes', {}, float(parts[21]) * self._pagesize)
rss.add_sample(self._prefix + 'resident_memory_bytes', {}, float(parts[21]) * _PAGESIZE)
start_time = Metric(self._prefix + 'start_time_seconds',
'Start time of the process since unix epoch in seconds.', 'gauge')
start_time_secs = float(parts[19]) / self._ticks
Expand Down
4 changes: 0 additions & 4 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ def setUp(self):

def test_working(self):
collector = ProcessCollector(proc=self.test_proc, pid=lambda: 26231, registry=self.registry)
collector._pagesize = 4096
collector._ticks = 100

self.assertEqual(17.21, self.registry.get_sample_value('process_cpu_seconds_total'))
Expand All @@ -325,7 +324,6 @@ def test_working(self):

def test_namespace(self):
collector = ProcessCollector(proc=self.test_proc, pid=lambda: 26231, registry=self.registry, namespace='n')
collector._pagesize = 4096
collector._ticks = 100

self.assertEqual(17.21, self.registry.get_sample_value('n_process_cpu_seconds_total'))
Expand All @@ -338,7 +336,6 @@ def test_namespace(self):

def test_working_584(self):
collector = ProcessCollector(proc=self.test_proc, pid=lambda: "584\n", registry=self.registry)
collector._pagesize = 4096
collector._ticks = 100

self.assertEqual(0.0, self.registry.get_sample_value('process_cpu_seconds_total'))
Expand All @@ -350,7 +347,6 @@ def test_working_584(self):

def test_working_fake_pid(self):
collector = ProcessCollector(proc=self.test_proc, pid=lambda: 123, registry=self.registry)
collector._pagesize = 4096
collector._ticks = 100

self.assertEqual(None, self.registry.get_sample_value('process_cpu_seconds_total'))
Expand Down