From 988962d24e7b50399fe82e97055cc4f74da2d6e7 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Wed, 6 May 2020 16:27:01 -0600 Subject: [PATCH] Add Django instrumentation (#593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Initial Instrumentation Co-authored-by: Mauricio Vásquez Co-authored-by: Mathieu Hinderyckx Co-authored-by: alrex Co-authored-by: Yusuke Tsutsumi --- .flake8 | 3 ++- tox.ini | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.flake8 b/.flake8 index 5922f31d8..f511c4c3e 100644 --- a/.flake8 +++ b/.flake8 @@ -2,7 +2,8 @@ ignore = E501 # line too long, defer to black F401 # unused import, defer to pylint - W503 # allow line breaks after binary ops, not after + W503 # allow line breaks before binary ops + W504 # allow line breaks after binary ops E203 # allow whitespace before ':' (https://github.com/psf/black#slices) exclude = .bzr diff --git a/tox.ini b/tox.ini index 1570df787..84dd157db 100644 --- a/tox.ini +++ b/tox.ini @@ -28,6 +28,9 @@ envlist = py3{4,5,6,7,8}-test-example-http pypy3-test-example-http + py3{6,7,8}-test-ext-django + pypy3-test-ext-django + ; opentelemetry-ext-dbapi py3{4,5,6,7,8}-test-ext-dbapi pypy3-test-ext-dbapi @@ -127,6 +130,7 @@ changedir = test-ext-requests: ext/opentelemetry-ext-requests/tests test-ext-jaeger: ext/opentelemetry-ext-jaeger/tests test-ext-dbapi: ext/opentelemetry-ext-dbapi/tests + test-ext-django: ext/opentelemetry-ext-django/tests test-ext-mysql: ext/opentelemetry-ext-mysql/tests test-ext-otcollector: ext/opentelemetry-ext-otcollector/tests test-ext-prometheus: ext/opentelemetry-ext-prometheus/tests @@ -168,13 +172,15 @@ commands_pre = grpc: pip install {toxinidir}/ext/opentelemetry-ext-grpc[test] - wsgi,flask: pip install {toxinidir}/ext/opentelemetry-ext-wsgi - - flask: pip install {toxinidir}/opentelemetry-auto-instrumentation + wsgi,flask,django: pip install {toxinidir}/tests/util + wsgi,flask,django: pip install {toxinidir}/ext/opentelemetry-ext-wsgi + flask,django: pip install {toxinidir}/opentelemetry-auto-instrumentation flask: pip install {toxinidir}/ext/opentelemetry-ext-flask[test] dbapi: pip install {toxinidir}/ext/opentelemetry-ext-dbapi[test] + django: pip install {toxinidir}/ext/opentelemetry-ext-django[test] + mysql: pip install {toxinidir}/ext/opentelemetry-ext-dbapi mysql: pip install {toxinidir}/ext/opentelemetry-ext-mysql[test]