prometheus · b-orlov · Oct 28, 2015 · Oct 28, 2015 · Oct 13, 2015 · Nov 2, 2015
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,14 @@
+[run]
+branch = True
+source = prometheus_client
+omit =
+    prometheus_client/decorator.py
+
+[paths]
+source =
+   prometheus_client
+   .tox/*/lib/python*/site-packages/prometheus_client
+   .tox/pypy/site-packages/prometheus_client
+
+[report]
+show_missing = True
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@ dist
 *.egg-info
 *.pyc
 *.swp
+.coverage.*
+.coverage
+.tox
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,32 @@
+sudo: false
+cache:
+  directories:
+    - $HOME/.cache/pip
+
+language: python
+
+matrix:
+  include:
+    - python: "2.6"
+      env: TOXENV=py26
+    - python: "2.7"
+      env: TOXENV=py27
+    - python: "2.7"
+      env: TOXENV=py27-nooptionals
+    - python: "3.4"
+      env: TOXENV=py34
+    - python: "3.5"
+      env: TOXENV=py35
+    - python: "3.5"
+      env: TOXENV=py35-nooptionals
+    - python: "pypy"
+      env: TOXENV=pypy
+
+install:
+  - pip install tox
+
+script:
+  - tox
+
+notifications:
+  email: false
diff --git a/NOTICE b/NOTICE
@@ -1,2 +1,5 @@
 Prometheus instrumentation library for Python applications
 Copyright 2015 The Prometheus Authors
+
+This product bundles decorator 4.0.10 which is available under a "2-clause BSD"
+license. For details, see prometheus_client/decorator.py.
diff --git a/README.md b/README.md
@@ -185,13 +185,13 @@ c.labels('get', '/').inc()
 c.labels('post', '/submit').inc()
 ```
 
-Labels can also be provided as a dict:
+Labels can also be passed as keyword-arguments:
 
 ```python
 from prometheus_client import Counter
 c = Counter('my_requests_total', 'HTTP Failures', ['method', 'endpoint'])
-c.labels({'method': 'get', 'endpoint': '/'}).inc()
-c.labels({'method': 'post', 'endpoint': '/submit'}).inc()
+c.labels(method='get', endpoint='/').inc()
+c.labels(method='post', endpoint='/submit').inc()
 ```
 
 ### Process Collector
@@ -229,6 +229,50 @@ To add Prometheus exposition to an existing HTTP server, see the `MetricsHandler
 which provides a `BaseHTTPRequestHandler`. It also serves as a simple example of how
 to write a custom endpoint.
 
+#### Twisted
+
+To use prometheus with [twisted](https://twistedmatrix.com/), there is `MetricsResource` which exposes metrics as a twisted resource.
+
+```python
+from prometheus_client.twisted import MetricsResource
+from twisted.web.server import Site
+from twisted.web.resource import Resource
+from twisted.internet import reactor
+
+root = Resource()
+root.putChild(b'metrics', MetricsResource())
+
+factory = Site(root)
+reactor.listenTCP(8000, factory)
+reactor.run()
+```
+
+#### WSGI
+
+To use Prometheus with [WSGI](http://wsgi.readthedocs.org/en/latest/), there is
+`make_wsgi_app` which creates a WSGI application.
+
+```python
+from prometheus_client import make_wsgi_app
+from wsgiref.simple_server import make_server
+
+app = make_wsgi_app()
+httpd = make_server('', 8000, app)
+httpd.serve_forever()
+```
+
+Such an application can be useful when integrating Prometheus metrics with WSGI
+apps.
+
+The method `start_wsgi_server` can be used to serve the metrics through the
+WSGI reference implementation in a new thread.
+
+```python
+from prometheus_client import start_wsgi_server
+
+start_wsgi_server(8000)
+```
+
 ### Node exporter textfile collector
 
 The [textfile collector](https://github.com/prometheus/node_exporter#textfile-collector)
@@ -325,14 +369,13 @@ REGISTRY.register(CustomCollector())
 ## Parser
 
 The Python client supports parsing the Promeheus text format.
-This is intended for advanced use cases where you have servers 
+This is intended for advanced use cases where you have servers
 exposing Prometheus metrics and need to get them into some other
 system.
 
-```
+```python
 from prometheus_client.parser import text_string_to_metric_families
 for family in text_string_to_metric_families("my_gauge 1.0\n"):
   for sample in family.samples:
     print("Name: {0} Labels: {1} Value: {2}".format(*sample))
 ```
-
diff --git a/prometheus_client/__init__.py b/prometheus_client/__init__.py
@@ -19,7 +19,9 @@
 CONTENT_TYPE_LATEST = exposition.CONTENT_TYPE_LATEST
 generate_latest = exposition.generate_latest
 MetricsHandler = exposition.MetricsHandler
+make_wsgi_app = exposition.make_wsgi_app
 start_http_server = exposition.start_http_server
+start_wsgi_server = exposition.start_wsgi_server
 write_to_textfile = exposition.write_to_textfile
 push_to_gateway = exposition.push_to_gateway
 pushadd_to_gateway = exposition.pushadd_to_gateway