Manual sync: v0.1a2.

Author: Oberon00

MANIFEST.in

@@ -4,3 +4,5 @@ global-exclude onesdk_shared.*
 global-exclude *.pyc
 global-exclude *.pyo
 global-exclude __pycache__/*
+include MANIFEST.in
+include README.md

docs/conf.py

@@ -110,7 +110,7 @@ def iad_add_directive_header(self, sig):
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

setup.py

@@ -153,7 +153,7 @@ def copy_extensions_to_source(self):
         self.__base.copy_extensions_to_source(self)
 
         build_py = self.get_finalized_command('build_py')
-        src_filename = self.get_dll_output_path()
+        src_filename = get_dll_input_path(self.plat_name)
         package = 'oneagent._impl.native'
         package_dir = build_py.get_package_dir(package)
         dest_filename = path.join(package_dir, path.basename(src_filename))

src/oneagent/_impl/native/sdkctypesiface.py

@@ -134,6 +134,7 @@ def _initfn(self, name, args, ret, public=True):
     def __init__(self, libname):
         self._log_cb = None
         self._diag_cb = None
+        self._py_diag_cb = None
 
         self._dll = ctypes.WinDLL(libname) if WIN32 else ctypes.CDLL(libname)
 
@@ -403,14 +404,19 @@ def agent_set_logging_callback(self, callback):
             self._agent_set_logging_callback(
                 ctypes.cast(None, agent_logging_callback_t))
             self._diag_cb = None
+            self._py_diag_cb = None
         else:
+
+            @wraps(callback)
             def cb_wrapper(msg):
                 if isinstance(msg, six.binary_type):
                     msg = u8_to_str(msg)
                 return callback(msg)
+
             c_cb = agent_logging_callback_t(cb_wrapper)
             self._agent_set_logging_callback(c_cb)
             self._diag_cb = c_cb
+            self._py_diag_cb = cb_wrapper
 
     def __del__(self):
         # __del__ is also called when __init__ fails, so safeguard against that
@@ -420,9 +426,7 @@ def __del__(self):
             self.stub_set_logging_callback(None)
 
     def agent_get_logging_callback(self):
-        if self._diag_cb:
-            return self._diag_cb.value
-        return None
+        return self._py_diag_cb
 
     def tracer_get_outgoing_tag(self, tracer, use_byte_tag=False):
         tagsz = ctypes.c_size_t()

test/sdk_diag_prog.py

@@ -3,6 +3,7 @@
 from __future__ import print_function
 
 import sys
+import gc
 
 import oneagent
 from oneagent._impl import six
@@ -19,9 +20,15 @@ def diag_cb(msg):
     try:
         sdk.set_diagnostic_callback(diag_cb)
         sdk.create_database_info(None, None, onesdk.Channel(0))
+        gc.collect()
+        gc.collect()
+        gc.collect()
         print(call_msg)
         n_msgs = len(call_msg)
-        assert n_msgs >= 1
+
+        # Database name must not be null (from CSDK), leaked db info handle
+        assert n_msgs == 2
+
         assert all(isinstance(m, six.text_type) for m in call_msg)
         sdk.set_diagnostic_callback(None)
         sdk.create_database_info(None, None, onesdk.Channel(0))

test/test_init_public_sdk.py

@@ -88,7 +88,7 @@ def main():
 
     if 'tryinit' in flags:
         try:
-            init_result = oneagent.try_init()
+            init_result = oneagent.try_init(['loglevelsdk=finest'])
         except ImportError:
             if 'nonull' in flags:
                 print('ABORTED.')

test/urllib_sandbox_py3.py

@@ -4,7 +4,7 @@
 from oneagent.sdk import SDK
 
 def bench():
-    with SDK.get().trace_incoming_remote_call('a', 'b', 'c').start():
+    with SDK.get().trace_incoming_remote_call('a', 'b', 'c'):
         tdf = 0
         t_tot = 0
         t_inner = None

tox.ini

@@ -5,7 +5,7 @@ envlist = {py27,py36}-{lint,test}, docs
 setenv =
     test: PYTHONDONTWRITEBYTECODE = 1
     PYTHONPATH = test-util-src
-passenv = DT_HOME
+passenv = DT_AGENTLIBRARY
 commands =
     test: pytest test {posargs}
     lint: pylint oneagent