Skip to content

Commit 1cab48b

Browse files
author
Arik Bar-on
committed
PEP8: Reformat files according to PEP8 standards.
Done automatically using `black` (https://github.com/ambv/black).
1 parent a691743 commit 1cab48b

34 files changed

+653
-400
lines changed

example_pymetrics.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
from pyformance import global_registry
1515

16-
1716

1817
class Collector(object):
1918
# TODO: use meters and histograms instead of gauges if possible
@@ -23,7 +22,7 @@ def __init__(self, registry=None):
2322
registry = global_registry()
2423
self.registry = registry
2524
self._memory_usage = 0
26-
25+
2726
def collect_memory(self):
2827
if resource:
2928
usage = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
@@ -34,22 +33,22 @@ def collect_memory(self):
3433
self._memory_usage = usage
3534
self.registry.gauge("python.memory.usage").set_value(usage)
3635
self.registry.gauge("python.memory.increase").set_value(increase)
37-
36+
3837
def collect_threads(self):
3938
counter = 0
4039
alive = 0
4140
daemon = 0
4241
for thread in threading.enumerate():
43-
counter +=1
42+
counter += 1
4443
if thread.isDaemon():
4544
daemon += 1
4645
if thread.isAlive():
4746
alive += 1
48-
#switch_interval = sys.getcheckinterval()
47+
# switch_interval = sys.getcheckinterval()
4948
self.registry.gauge("python.thread.count").set_value(counter)
5049
self.registry.gauge("python.thread.daemon").set_value(daemon)
5150
self.registry.gauge("python.thread.alive").set_value(alive)
52-
51+
5352
def collect_garbage(self):
5453
(count0, count1, count2) = gc.get_count()
5554
(threshold0, threshold1, threshold2) = gc.get_threshold()
@@ -62,7 +61,7 @@ def collect_garbage(self):
6261
self.registry.gauge("python.gc.objects.count").set_value(object_count)
6362
self.registry.gauge("python.gc.referrers.count").set_value(referrers_count)
6463
self.registry.gauge("python.gc.referents.count").set_value(referents_count)
65-
64+
6665
def collect_processes(self):
6766
counter = 0
6867
alive = 0
@@ -76,18 +75,17 @@ def collect_processes(self):
7675
self.registry.gauge("python.processes.count").set_value(counter)
7776
self.registry.gauge("python.processes.alive").set_value(alive)
7877
self.registry.gauge("python.processes.daemon").set_value(daemon)
79-
80-
78+
8179
def collect(self):
8280
self.collect_memory()
8381
self.collect_garbage()
8482
self.collect_threads()
8583
self.collect_processes()
8684

87-
88-
85+
8986
if __name__ == "__main__":
9087
from pyformance.reporters import ConsoleReporter
88+
9189
reporter = ConsoleReporter()
9290
col = Collector()
9391
col.collect()

example_sysmetrics.py

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ def collect_disk_io(self, whitelist=[]):
2525
if not whitelist or entry in whitelist:
2626
for k, v in six.iteritems(stat._asdict()):
2727
self.registry.gauge("disk-%s.%s" % (entry, k)).set_value(v)
28-
28+
2929
def collect_network_io(self, whitelist=[]):
3030
stats = psutil.net_io_counters(pernic=True)
3131
for entry, stat in six.iteritems(stats):
3232
if not whitelist or entry in whitelist:
3333
for k, v in six.iteritems(stat._asdict()):
34-
self.registry.gauge("nic-%s.%s" % (entry.replace(" ", "_"), k)).set_value(v)
34+
self.registry.gauge(
35+
"nic-%s.%s" % (entry.replace(" ", "_"), k)
36+
).set_value(v)
3537

3638
def collect_cpu_times(self, whitelist=[]):
3739
stats = psutil.cpu_times(percpu=True)
@@ -44,23 +46,28 @@ def collect_swap_usage(self):
4446
stats = psutil.swap_memory()
4547
for k, v in six.iteritems(stats._asdict()):
4648
self.registry.gauge("swap.%s" % k).set_value(v)
47-
49+
4850
def collect_virtmem_usage(self):
4951
stats = psutil.virtual_memory()
5052
for k, v in six.iteritems(stats._asdict()):
51-
self.registry.gauge("virtmem.%s" % k).set_value(v)
52-
53+
self.registry.gauge("virtmem.%s" % k).set_value(v)
54+
5355
def collect_uptime(self):
5456
uptime = int(time.time()) - int(psutil.boot_time())
5557
self.registry.gauge("uptime").set_value(uptime)
5658

5759
def collect_disk_usage(self, whitelist=[]):
5860
for partition in psutil.disk_partitions():
59-
if not whitelist or partition.mountpoint in whitelist or partition.device in whitelist:
61+
if (
62+
not whitelist
63+
or partition.mountpoint in whitelist
64+
or partition.device in whitelist
65+
):
6066
usage = psutil.disk_usage(partition.mountpoint)
6167
if platform.system() == "Windows":
62-
disk_name = "-" + \
63-
partition.mountpoint.replace("\\", "").replace(":", "")
68+
disk_name = "-" + partition.mountpoint.replace("\\", "").replace(
69+
":", ""
70+
)
6471
else:
6572
disk_name = partition.mountpoint.replace("/", "-")
6673
if disk_name == "-":
@@ -71,9 +78,9 @@ def collect_disk_usage(self, whitelist=[]):
7178

7279
def collect_loadavgs(self):
7380
loadavgs = os.getloadavg()
74-
self.registry.gauge('loadavg_1min').set_value(loadavgs[0])
75-
self.registry.gauge('loadavg_5min').set_value(loadavgs[1])
76-
self.registry.gauge('loadavg_15min').set_value(loadavgs[2])
81+
self.registry.gauge("loadavg_1min").set_value(loadavgs[0])
82+
self.registry.gauge("loadavg_5min").set_value(loadavgs[1])
83+
self.registry.gauge("loadavg_15min").set_value(loadavgs[2])
7784

7885
def collect(self):
7986
self.collect_disk_io()
@@ -85,9 +92,10 @@ def collect(self):
8592
self.collect_disk_usage()
8693
self.collect_loadavgs()
8794

88-
95+
8996
if __name__ == "__main__":
9097
from pyformance.reporters import ConsoleReporter
98+
9199
reporter = ConsoleReporter()
92100
col = Collector()
93101
col.collect()

pyformance/__init__.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
__import__('pkg_resources').declare_namespace(__name__)
1+
__import__("pkg_resources").declare_namespace(__name__)
22

33
from .registry import MetricsRegistry, global_registry, set_global_registry
44
from .registry import timer, counter, meter, histogram, gauge
5-
from .registry import dump_metrics, clear, count_calls, meter_calls, hist_calls, time_calls
5+
from .registry import (
6+
dump_metrics,
7+
clear,
8+
count_calls,
9+
meter_calls,
10+
hist_calls,
11+
time_calls,
12+
)
613
from .meters.timer import call_too_long

pyformance/meters/histogram.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import time
22
import math
33
from threading import Lock
4-
from ..stats. samples import ExpDecayingSample, DEFAULT_SIZE, DEFAULT_ALPHA
4+
from ..stats.samples import ExpDecayingSample, DEFAULT_SIZE, DEFAULT_ALPHA
55

66

77
class Histogram(object):
@@ -10,8 +10,7 @@ class Histogram(object):
1010
A metric which calculates the distribution of a value.
1111
"""
1212

13-
def __init__(self, size=DEFAULT_SIZE, alpha=DEFAULT_ALPHA, clock=time,
14-
sample=None):
13+
def __init__(self, size=DEFAULT_SIZE, alpha=DEFAULT_ALPHA, clock=time, sample=None):
1514
"""
1615
Creates a new instance of a L{Histogram}.
1716
"""

pyformance/meters/timer.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import time
2+
23
try:
34
from blinker import Namespace
45
except ImportError:
@@ -21,8 +22,15 @@ class Timer(object):
2122
2223
"""
2324

24-
def __init__(self, threshold=None, size=DEFAULT_SIZE, alpha=DEFAULT_ALPHA,
25-
clock=time, sink=None, sample=None):
25+
def __init__(
26+
self,
27+
threshold=None,
28+
size=DEFAULT_SIZE,
29+
alpha=DEFAULT_ALPHA,
30+
clock=time,
31+
sink=None,
32+
sample=None,
33+
):
2634
super(Timer, self).__init__()
2735
self.meter = Meter(clock=clock)
2836
self.hist = Histogram(size=size, alpha=alpha, clock=clock, sample=sample)
@@ -99,7 +107,6 @@ def clear(self):
99107

100108

101109
class TimerContext(object):
102-
103110
def __init__(self, timer, clock, *args, **kwargs):
104111
super(TimerContext, self).__init__()
105112
self.clock = clock
@@ -111,9 +118,12 @@ def __init__(self, timer, clock, *args, **kwargs):
111118
def stop(self):
112119
elapsed = self.clock.time() - self.start_time
113120
self.timer._update(elapsed)
114-
if self.timer.threshold and self.timer.threshold < elapsed and call_too_long is not None:
115-
call_too_long.send(
116-
self.timer, elapsed=elapsed, *self.args, **self.kwargs)
121+
if (
122+
self.timer.threshold
123+
and self.timer.threshold < elapsed
124+
and call_too_long is not None
125+
):
126+
call_too_long.send(self.timer, elapsed=elapsed, *self.args, **self.kwargs)
117127
return elapsed
118128

119129
def __enter__(self):

0 commit comments

Comments
 (0)