# HG changeset patch # User Thierry Florac # Date 1537347357 -7200 # Node ID e78763bdfb3f525b53e1596998a8cd1bd6cc0cb6 # Parent 57857e3d151cd5eab7eb9e23dad2b25221e46a01 Version 0.1.1 diff -r 57857e3d151c -r e78763bdfb3f buildout.cfg --- a/buildout.cfg Tue Sep 18 17:38:43 2018 +0200 +++ b/buildout.cfg Wed Sep 19 10:55:57 2018 +0200 @@ -48,4 +48,4 @@ eggs = pyams_apm [test] [versions] -pyams_apm = 0.1.0 +pyams_apm = 0.1.1 diff -r 57857e3d151c -r e78763bdfb3f docs/HISTORY.txt --- a/docs/HISTORY.txt Tue Sep 18 17:38:43 2018 +0200 +++ b/docs/HISTORY.txt Wed Sep 19 10:55:57 2018 +0200 @@ -1,6 +1,10 @@ History ======= +0.1.1 +----- + - added LDAP3 module + 0.1.0 ----- - first preview release diff -r 57857e3d151c -r e78763bdfb3f setup.py --- a/setup.py Tue Sep 18 17:38:43 2018 +0200 +++ b/setup.py Wed Sep 19 10:55:57 2018 +0200 @@ -22,7 +22,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.0' +version = '0.1.1' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] diff -r 57857e3d151c -r e78763bdfb3f src/pyams_apm.egg-info/PKG-INFO --- a/src/pyams_apm.egg-info/PKG-INFO Tue Sep 18 17:38:43 2018 +0200 +++ b/src/pyams_apm.egg-info/PKG-INFO Wed Sep 19 10:55:57 2018 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyams-apm -Version: 0.1.0 +Version: 0.1.1 Summary: PyAMS Elasticsearch APM integration package Home-page: http://hg.ztfy.org/pyams/pyams_apm Author: Thierry Florac @@ -15,6 +15,10 @@ History ======= + 0.1.1 + ----- + - added LDAP3 module + 0.1.0 ----- - first preview release diff -r 57857e3d151c -r e78763bdfb3f src/pyams_apm.egg-info/SOURCES.txt --- a/src/pyams_apm.egg-info/SOURCES.txt Tue Sep 18 17:38:43 2018 +0200 +++ b/src/pyams_apm.egg-info/SOURCES.txt Wed Sep 19 10:55:57 2018 +0200 @@ -13,4 +13,5 @@ src/pyams_apm.egg-info/requires.txt src/pyams_apm.egg-info/top_level.txt src/pyams_apm/packages/__init__.py -src/pyams_apm/packages/chameleon.py \ No newline at end of file +src/pyams_apm/packages/chameleon.py +src/pyams_apm/packages/ldap3.py \ No newline at end of file diff -r 57857e3d151c -r e78763bdfb3f src/pyams_apm/include.py --- a/src/pyams_apm/include.py Tue Sep 18 17:38:43 2018 +0200 +++ b/src/pyams_apm/include.py Wed Sep 19 10:55:57 2018 +0200 @@ -26,6 +26,8 @@ @subscriber(IApplicationCreated) def handle_apm_application(event): + register.register('pyams_apm.packages.ldap3.LDAP3BindInstrumentation') + register.register('pyams_apm.packages.ldap3.LDAP3SearchInstrumentation') register.register('pyams_apm.packages.chameleon.ChameleonCookingInstrumentation') register.register('pyams_apm.packages.chameleon.ChameleonRenderingInstrumentation') elasticapm.instrument() diff -r 57857e3d151c -r e78763bdfb3f src/pyams_apm/packages/chameleon.py --- a/src/pyams_apm/packages/chameleon.py Tue Sep 18 17:38:43 2018 +0200 +++ b/src/pyams_apm/packages/chameleon.py Wed Sep 19 10:55:57 2018 +0200 @@ -13,17 +13,12 @@ __docformat__ = 'restructuredtext' -# import standard library - -# import interfaces - -# import packages from elasticapm.instrumentation.packages.base import AbstractInstrumentedModule from elasticapm.traces import capture_span class ChameleonCookingInstrumentation(AbstractInstrumentedModule): - name = "chameleon" + name = "chameleon_cooking" instrument_list = [("chameleon.template", "BaseTemplate.cook")] @@ -34,7 +29,7 @@ class ChameleonRenderingInstrumentation(AbstractInstrumentedModule): - name = "chameleon" + name = "chameleon_rendering" instrument_list = [("chameleon.template", "BaseTemplate.render")] diff -r 57857e3d151c -r e78763bdfb3f src/pyams_apm/tween.py --- a/src/pyams_apm/tween.py Tue Sep 18 17:38:43 2018 +0200 +++ b/src/pyams_apm/tween.py Wed Sep 19 10:55:57 2018 +0200 @@ -12,20 +12,14 @@ __docformat__ = 'restructuredtext' - -# import standard library -import pkg_resources -from pkg_resources import DistributionNotFound - import sys -# import interfaces - -# import packages import elasticapm +import pkg_resources from elasticapm.utils import compat, get_url_dict +from pkg_resources import DistributionNotFound +from pyramid.compat import reraise from pyramid.settings import asbool -from pyramid.compat import reraise def list_from_setting(config, setting):