logtail-python 0.2.10__py2.py3-none-any.whl → 0.3.1__py2.py3-none-any.whl

logtail/__init__.py

@@ -5,6 +5,6 @@ from .handler import LogtailHandler
 from .helpers import LogtailContext, DEFAULT_CONTEXT
 from .formatter import LogtailFormatter
 
-__version__ = '0.2.10'
+__version__ = '0.3.1'
 
 context = DEFAULT_CONTEXT

logtail/flusher.py

@@ -10,14 +10,17 @@ RETRY_SCHEDULE = (1, 10, 60)  # seconds
 
 
 class FlushWorker(threading.Thread):
-    def __init__(self, upload, pipe, buffer_capacity, flush_interval):
+    def __init__(self, upload, pipe, buffer_capacity, flush_interval, check_interval):
         threading.Thread.__init__(self)
         self.parent_thread = threading.current_thread()
         self.upload = upload
         self.pipe = pipe
         self.buffer_capacity = buffer_capacity
         self.flush_interval = flush_interval
+        self.check_interval = check_interval
         self.should_run = True
+        self._flushing = False
+        self._clean = True
 
     def run(self):
         while self.should_run:
@@ -27,6 +30,7 @@ class FlushWorker(threading.Thread):
         last_flush = time.time()
         time_remaining = _initial_time_remaining(self.flush_interval)
         frame = []
+        self._clean = True
 
         # If the parent thread has exited but there are still outstanding
         # events, attempt to send them before exiting.
@@ -38,16 +42,17 @@ class FlushWorker(threading.Thread):
         # `flush_interval` seconds have passed without sending any events.
         while len(frame) < self.buffer_capacity and time_remaining > 0:
             try:
-                # Blocks for up to 1.0 seconds for each item to prevent
+                # Blocks for up to `check_interval` seconds for each item to prevent
                 # spinning and burning CPU unnecessarily. Could block for the
                 # entire amount of `time_remaining` but then in the case that
                 # the parent thread has exited, that entire amount of time
                 # would be waited before this child worker thread exits.
-                entry = self.pipe.get(block=(not shutdown), timeout=1.0)
+                entry = self.pipe.get(block=(not shutdown), timeout=self.check_interval)
+                self._clean = False
                 frame.append(entry)
                 self.pipe.task_done()
             except queue.Empty:
-                if shutdown:
+                if shutdown or self._flushing:
                     break
             shutdown = not self.parent_thread.is_alive()
             time_remaining = _calculate_time_remaining(last_flush, self.flush_interval)
@@ -68,9 +73,15 @@ class FlushWorker(threading.Thread):
             if response.status_code == 500 and getattr(response, "exception") != None:
                 print('Failed to send logs to Better Stack after {} retries: {}'.format(len(RETRY_SCHEDULE), response.exception))
 
+        self._clean = True
         if shutdown and self.pipe.empty():
             self.should_run = False
 
+    def flush(self):
+        self._flushing = True
+        while not self._clean or not self.pipe.empty():
+            time.sleep(self.check_interval)
+        self._flushing = False
 
 def _initial_time_remaining(flush_interval):
     return flush_interval

logtail/frame.py

@@ -60,6 +60,9 @@ def _parse_custom_events(record, include_extra_attributes):
 def _remove_circular_dependencies(obj, memo=None):
     if memo is None:
         memo = set()
+    # Skip immutable types, which can't contain circular dependencies
+    if isinstance(obj, (str, int, float, bool)):
+        return obj
     if id(obj) in memo:
         return "<omitted circular reference>"
     memo.add(id(obj))
@@ -69,8 +72,11 @@ def _remove_circular_dependencies(obj, memo=None):
             new_dict[key] = _remove_circular_dependencies(value, memo)
         return new_dict
     elif isinstance(obj, list):
-        new_list = [_remove_circular_dependencies(item, memo) for item in obj]
-        return new_list
+        return [_remove_circular_dependencies(item, memo) for item in obj]
+    elif isinstance(obj, tuple):
+        return tuple(_remove_circular_dependencies(item, memo) for item in obj)
+    elif isinstance(obj, set):
+        return {_remove_circular_dependencies(item, memo) for item in obj}
     else:
         return obj
 

logtail/handler.py

@@ -12,6 +12,7 @@ from .frame import create_frame
 DEFAULT_HOST = 'https://in.logs.betterstack.com'
 DEFAULT_BUFFER_CAPACITY = 1000
 DEFAULT_FLUSH_INTERVAL = 1
+DEFAULT_CHECK_INTERVAL = 0.1
 DEFAULT_RAISE_EXCEPTIONS = False
 DEFAULT_DROP_EXTRA_EVENTS = True
 DEFAULT_INCLUDE_EXTRA_ATTRIBUTES = True
@@ -23,6 +24,7 @@ class LogtailHandler(logging.Handler):
                  host=DEFAULT_HOST,
                  buffer_capacity=DEFAULT_BUFFER_CAPACITY,
                  flush_interval=DEFAULT_FLUSH_INTERVAL,
+                 check_interval=DEFAULT_CHECK_INTERVAL,
                  raise_exceptions=DEFAULT_RAISE_EXCEPTIONS,
                  drop_extra_events=DEFAULT_DROP_EXTRA_EVENTS,
                  include_extra_attributes=DEFAULT_INCLUDE_EXTRA_ATTRIBUTES,
@@ -38,6 +40,7 @@ class LogtailHandler(logging.Handler):
         self.include_extra_attributes = include_extra_attributes
         self.buffer_capacity = buffer_capacity
         self.flush_interval = flush_interval
+        self.check_interval = check_interval
         self.raise_exceptions = raise_exceptions
         self.dropcount = 0
         # Do not initialize the flush thread yet because it causes issues on Render.
@@ -51,7 +54,8 @@ class LogtailHandler(logging.Handler):
             self.uploader,
             self.pipe,
             self.buffer_capacity,
-            self.flush_interval
+            self.flush_interval,
+            self.check_interval,
         )
         self.flush_thread.start()
 
@@ -71,3 +75,7 @@ class LogtailHandler(logging.Handler):
         except Exception as e:
             if self.raise_exceptions:
                 raise e
+
+    def flush(self):
+        if self.flush_thread and self.flush_thread.is_alive():
+             self.flush_thread.flush()

{logtail_python-0.2.10.dist-info → logtail_python-0.3.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: logtail-python
-Version: 0.2.10
+Version: 0.3.1
 Summary: Logtail.com client library
 Home-page: https://github.com/logtail/logtail-python
-Download-URL: https://github.com/logtail/logtail-python/tarball/0.2.10
+Download-URL: https://github.com/logtail/logtail-python/tarball/0.3.1
 Author: Logtail
 Author-email: hello@logtail.com
 License: ISC
@@ -11,20 +11,18 @@ Keywords: api,logtail,logging,client
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: ISC License (ISCL)
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: requests >=2.18.4
-Requires-Dist: msgpack >=0.5.6
+Requires-Dist: requests>=2.18.4
+Requires-Dist: msgpack>=0.5.6
 
 # [Better Stack](https://betterstack.com/logs) Python client
 

logtail_python-0.3.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+logtail/__init__.py,sha256=JRaSbr790ELJ9xcEfnnL5H2aVbNDlY2Llbq9dd2nM5w,252
+logtail/compat.py,sha256=KbZmcmDpj_vbMotp16pADPwJ1FkEHGDNjKbOfCy-c10,141
+logtail/flusher.py,sha256=5P9MY6wn8H2rF72DEEtN6X5NTpxCZXFvmMzoUj3QcsE,3749
+logtail/formatter.py,sha256=nk4W1G95P19ijylPBJ8D9FlO_qbh3tfbv7xzCSfpDN8,968
+logtail/frame.py,sha256=JtLvvSdQ5uSj5sYvC0-UDQfGASjqWtOxkmGkmMo97oA,3216
+logtail/handler.py,sha256=5Z9wJQMc0nv72_wwNw_WGXKSCAwgb-z--5OS3c6I5i0,2994
+logtail/helpers.py,sha256=ezDTLsTBAtCtIh_XptSYOiBrZFa-E9wo2SWTnjKgOOU,1156
+logtail/uploader.py,sha256=qBhQjXKMKId4dHC1BRSgajQ6Zh-jOygQEnc5oj2zuN0,805
+logtail_python-0.3.1.dist-info/LICENSE.md,sha256=aCBMqxfm7QNyFR9JiJ2GSMvhAURXN2E0yTcYNQloqI0,737
+logtail_python-0.3.1.dist-info/METADATA,sha256=ALN6wj0EnzjeLsivrRODJHgZAOBtPeM63qTh2Ds-Rus,2125
+logtail_python-0.3.1.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+logtail_python-0.3.1.dist-info/top_level.txt,sha256=QZIbQogN1yFBgjiJ-8NlYArVCL00gBoYbEUT_Ew8l-Q,8
+logtail_python-0.3.1.dist-info/RECORD,,

{logtail_python-0.2.10.dist-info → logtail_python-0.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

logtail_python-0.2.10.dist-info/RECORD

@@ -1,13 +0,0 @@
-logtail/__init__.py,sha256=JuOEcyNujGsnl6bXpXeFrTL6exQyA6zHw1C0TdS9rj4,253
-logtail/compat.py,sha256=KbZmcmDpj_vbMotp16pADPwJ1FkEHGDNjKbOfCy-c10,141
-logtail/flusher.py,sha256=kyV8ikYRaOBHQvp9aA8aDTFOeKFaHxbrWG1YplKbOkU,3311
-logtail/formatter.py,sha256=nk4W1G95P19ijylPBJ8D9FlO_qbh3tfbv7xzCSfpDN8,968
-logtail/frame.py,sha256=21q6jxu-1qrzs6v-fqnP7PFG6a80ZDFlPYEK5PYPYO8,2887
-logtail/handler.py,sha256=IELZWp_GCeylyd2TXFjGX_z69IEMuvlsg56IbCJJYJ4,2706
-logtail/helpers.py,sha256=ezDTLsTBAtCtIh_XptSYOiBrZFa-E9wo2SWTnjKgOOU,1156
-logtail/uploader.py,sha256=qBhQjXKMKId4dHC1BRSgajQ6Zh-jOygQEnc5oj2zuN0,805
-logtail_python-0.2.10.dist-info/LICENSE.md,sha256=aCBMqxfm7QNyFR9JiJ2GSMvhAURXN2E0yTcYNQloqI0,737
-logtail_python-0.2.10.dist-info/METADATA,sha256=bDGWi7HeAXk82pZReTpfjvonjjGQqN773F4ccIsLnVo,2225
-logtail_python-0.2.10.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-logtail_python-0.2.10.dist-info/top_level.txt,sha256=QZIbQogN1yFBgjiJ-8NlYArVCL00gBoYbEUT_Ew8l-Q,8
-logtail_python-0.2.10.dist-info/RECORD,,