logtail-python 0.3.3__tar.gz → 0.4.0__tar.gz

{logtail_python-0.3.3/logtail_python.egg-info → logtail_python-0.4.0}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: logtail-python
-Version: 0.3.3
-Summary: Logtail.com client library
+Version: 0.4.0
+Summary: Better Stack client library
 Home-page: https://github.com/logtail/logtail-python
-Download-URL: https://github.com/logtail/logtail-python/tarball/0.3.3
+Download-URL: https://github.com/logtail/logtail-python/tarball/0.4.0
 Author: Logtail
 Author-email: hello@logtail.com
 License: ISC
@@ -12,17 +12,31 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: ISC License (ISCL)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-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 :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests>=2.18.4
 Requires-Dist: msgpack>=0.5.6
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # [Better Stack](https://betterstack.com/logs) Python client
 

{logtail_python-0.3.3 → logtail_python-0.4.0}/logtail/__init__.py

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

{logtail_python-0.3.3 → logtail_python-0.4.0}/logtail/flusher.py

@@ -26,6 +26,16 @@ class FlushWorker(threading.Thread):
         while self.should_run:
             self.step()
 
+    def _is_parent_alive(self):
+        try:
+            return self.parent_thread.is_alive()
+        except RuntimeError:
+            # Starting with Python 3.14, calling is_alive() on an
+            # already-terminated thread raises a RuntimeError instead of
+            # returning False (see the parent thread being torn down during
+            # interpreter shutdown). Treat that as "no longer alive".
+            return False
+
     def step(self):
         last_flush = time.time()
         time_remaining = _initial_time_remaining(self.flush_interval)
@@ -34,7 +44,7 @@ class FlushWorker(threading.Thread):
 
         # If the parent thread has exited but there are still outstanding
         # events, attempt to send them before exiting.
-        shutdown = not self.parent_thread.is_alive()
+        shutdown = not self._is_parent_alive()
 
         # Fill phase: take events out of the queue and group them for sending.
         # Takes up to `buffer_capacity` events out of the queue and groups them
@@ -54,11 +64,11 @@ class FlushWorker(threading.Thread):
             except queue.Empty:
                 if shutdown or self._flushing:
                     break
-            shutdown = not self.parent_thread.is_alive()
+            shutdown = not self._is_parent_alive()
             time_remaining = _calculate_time_remaining(last_flush, self.flush_interval)
 
         # Send phase: takes the outstanding events (up to `buffer_capacity`
-        # count) and sends them to the Logtail endpoint all at once. If the
+        # count) and sends them to the Better Stack endpoint all at once. If the
         # request fails in a way that can be retried, it is retried with an
         # exponential backoff in between attempts.
         if frame:

{logtail_python-0.3.3 → logtail_python-0.4.0}/logtail/handler.py

@@ -16,6 +16,7 @@ DEFAULT_CHECK_INTERVAL = 0.1
 DEFAULT_RAISE_EXCEPTIONS = False
 DEFAULT_DROP_EXTRA_EVENTS = True
 DEFAULT_INCLUDE_EXTRA_ATTRIBUTES = True
+DEFAULT_TIMEOUT = 30
 
 
 class LogtailHandler(logging.Handler):
@@ -29,6 +30,7 @@ class LogtailHandler(logging.Handler):
                  drop_extra_events=DEFAULT_DROP_EXTRA_EVENTS,
                  include_extra_attributes=DEFAULT_INCLUDE_EXTRA_ATTRIBUTES,
                  context=DEFAULT_CONTEXT,
+                 timeout=DEFAULT_TIMEOUT,
                  level=logging.NOTSET):
         super(LogtailHandler, self).__init__(level=level)
         self.source_token = source_token
@@ -38,7 +40,7 @@ class LogtailHandler(logging.Handler):
             self.host = "https://" + host
         self.context = context
         self.pipe = queue.Queue(maxsize=buffer_capacity)
-        self.uploader = Uploader(self.source_token, self.host)
+        self.uploader = Uploader(self.source_token, self.host, timeout)
         self.drop_extra_events = drop_extra_events
         self.include_extra_attributes = include_extra_attributes
         self.buffer_capacity = buffer_capacity

{logtail_python-0.3.3 → logtail_python-0.4.0}/logtail/uploader.py

@@ -9,9 +9,10 @@ class Fake500(object):
         self.exception = exception
 
 class Uploader(object):
-    def __init__(self, source_token, host):
+    def __init__(self, source_token, host, timeout):
         self.source_token = source_token
         self.host = host
+        self.timeout = timeout
         self.session = requests.Session()
         self.headers = {
             'Authorization': 'Bearer %s' % source_token,
@@ -21,6 +22,6 @@ class Uploader(object):
     def __call__(self, frame):
         data = msgpack.packb(frame, use_bin_type=True)
         try:
-            return self.session.post(self.host, data=data, headers=self.headers)
+            return self.session.post(self.host, data=data, headers=self.headers, timeout=self.timeout)
         except requests.RequestException as e:
-            return Fake500(e)
+            return Fake500(e)

{logtail_python-0.3.3 → logtail_python-0.4.0/logtail_python.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: logtail-python
-Version: 0.3.3
-Summary: Logtail.com client library
+Version: 0.4.0
+Summary: Better Stack client library
 Home-page: https://github.com/logtail/logtail-python
-Download-URL: https://github.com/logtail/logtail-python/tarball/0.3.3
+Download-URL: https://github.com/logtail/logtail-python/tarball/0.4.0
 Author: Logtail
 Author-email: hello@logtail.com
 License: ISC
@@ -12,17 +12,31 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: ISC License (ISCL)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-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 :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests>=2.18.4
 Requires-Dist: msgpack>=0.5.6
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # [Better Stack](https://betterstack.com/logs) Python client
 

{logtail_python-0.3.3 → logtail_python-0.4.0}/logtail_python.egg-info/SOURCES.txt

@@ -26,9 +26,17 @@ tests/test_handler.py
 tests/test_helpers.py
 tests/test_uploader.py
 tests/__pycache__/__init__.cpython-311.pyc
+tests/__pycache__/__init__.cpython-314.pyc
 tests/__pycache__/test_flusher.cpython-311.pyc
+tests/__pycache__/test_flusher.cpython-314-pytest-9.1.1.pyc
+tests/__pycache__/test_flusher.cpython-314.pyc
 tests/__pycache__/test_formatter.cpython-311.pyc
+tests/__pycache__/test_formatter.cpython-314-pytest-9.1.1.pyc
 tests/__pycache__/test_frame.cpython-311.pyc
+tests/__pycache__/test_frame.cpython-314-pytest-9.1.1.pyc
 tests/__pycache__/test_handler.cpython-311.pyc
+tests/__pycache__/test_handler.cpython-314-pytest-9.1.1.pyc
 tests/__pycache__/test_helpers.cpython-311.pyc
-tests/__pycache__/test_uploader.cpython-311.pyc
+tests/__pycache__/test_helpers.cpython-314-pytest-9.1.1.pyc
+tests/__pycache__/test_uploader.cpython-311.pyc
+tests/__pycache__/test_uploader.cpython-314-pytest-9.1.1.pyc

{logtail_python-0.3.3 → logtail_python-0.4.0}/setup.py

@@ -3,7 +3,7 @@ import os
 from setuptools import setup
 
 
-VERSION = '0.3.3'
+VERSION = '0.4.0'
 ROOT_DIR = os.path.dirname(__file__)
 
 REQUIREMENTS = [
@@ -20,13 +20,14 @@ setup(
     packages=['logtail'],
     include_package_data=True,
     license='ISC',
-    description='Logtail.com client library',
+    description='Better Stack client library',
     long_description=long_description,
     long_description_content_type='text/markdown',
     url='https://github.com/logtail/logtail-python',
     download_url='https://github.com/logtail/logtail-python/tarball/%s' % (VERSION),
     keywords=['api', 'logtail', 'logging', 'client'],
     install_requires=REQUIREMENTS,
+    python_requires='>=3.10',
     author='Logtail',
     author_email='hello@logtail.com',
     classifiers=[
@@ -34,11 +35,11 @@ setup(
           'License :: OSI Approved :: ISC License (ISCL)',
           'Operating System :: OS Independent',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
-          'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: 3.11',
+          'Programming Language :: Python :: 3.12',
+          'Programming Language :: Python :: 3.13',
+          'Programming Language :: Python :: 3.14',
           'Programming Language :: Python',
           'Topic :: Software Development :: Libraries :: Python Modules',
     ],

{logtail_python-0.3.3 → logtail_python-0.4.0}/tests/test_flusher.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import print_function, unicode_literals
 import mock
-import sys
 import time
 import threading
 import unittest
@@ -20,10 +19,11 @@ class TestFlushWorker(unittest.TestCase):
     buffer_capacity = 5
     flush_interval = 2
     check_interval = 0.01
+    timeout = 0.1
 
     def _setup_worker(self, uploader=None):
         pipe = queue.Queue(maxsize=self.buffer_capacity)
-        uploader = uploader or Uploader(self.source_token, self.host)
+        uploader = uploader or Uploader(self.source_token, self.host, self.timeout)
         fw = FlushWorker(uploader, pipe, self.buffer_capacity, self.flush_interval, self.check_interval)
         return pipe, uploader, fw
 
@@ -145,8 +145,39 @@ class TestFlushWorker(unittest.TestCase):
         self.assertEqual(self.upload_calls, 1)
         self.assertFalse(fw.should_run)
 
-    # test relies on overriding excepthook which is available from 3.8+
-    @unittest.skipIf(sys.version_info < (3, 8), "Test skipped because overriding excepthook is only available on Python 3.8+")
+    def test_is_parent_alive_handles_runtime_error(self):
+        # Starting with Python 3.14, is_alive() raises RuntimeError when
+        # called on an already-terminated thread instead of returning False.
+        # The worker must treat that as the parent no longer being alive.
+        _, _, fw = self._setup_worker()
+        fw.parent_thread = mock.MagicMock()
+        fw.parent_thread.is_alive.side_effect = RuntimeError('cannot join current thread')
+
+        self.assertFalse(fw._is_parent_alive())
+
+    def test_shutdown_condition_when_parent_is_alive_raises(self):
+        self.buffer_capacity = 10
+        num_items = 5
+        first_frame = list(range(self.buffer_capacity))
+        self.assertLess(num_items, self.buffer_capacity)
+
+        self.upload_calls = 0
+        def uploader(frame):
+            self.upload_calls += 1
+            self.assertEqual(frame, first_frame[:num_items])
+            return mock.MagicMock(status_code=202)
+
+        pipe, _, fw = self._setup_worker(uploader)
+        fw.parent_thread = mock.MagicMock()
+        fw.parent_thread.is_alive.side_effect = RuntimeError('cannot join current thread')
+
+        for i in range(num_items):
+            pipe.put(first_frame[i], block=False)
+
+        fw.step()
+        self.assertEqual(self.upload_calls, 1)
+        self.assertFalse(fw.should_run)
+
     def test_shutdown_dont_raise_exception_in_thread(self):
         original_excepthook = threading.excepthook
         threading.excepthook = mock.Mock()

{logtail_python-0.3.3 → logtail_python-0.4.0}/tests/test_frame.py

@@ -3,7 +3,6 @@
 from logtail.frame import create_frame
 from logtail.handler import LogtailHandler
 from logtail.helpers import LogtailContext
-from sys import version_info
 import datetime
 import unittest
 import logging
@@ -17,11 +16,8 @@ class TestLogtailLogEntry(unittest.TestCase):
         # ISO timestamp must end with timezone info
         self.assertTrue(frame['dt'].endswith("+00:00"))
 
-        # These tests require Python >= 3.7
-        if version_info.major == 2 or version_info.minor <= 6:
-            return
         # Sent date matches log record date
-        date_ref = datetime.datetime.utcfromtimestamp(log_record.created).replace(tzinfo=datetime.timezone.utc)
+        date_ref = datetime.datetime.fromtimestamp(log_record.created, datetime.timezone.utc)
         date_sent = datetime.datetime.fromisoformat(frame['dt'])
         self.assertEqual(date_ref, date_sent)
 

{logtail_python-0.3.3 → logtail_python-0.4.0}/tests/test_handler.py

@@ -20,6 +20,16 @@ class TestLogtailHandler(unittest.TestCase):
         handler = LogtailHandler(source_token=self.source_token, host=self.host)
         self.assertEqual(handler.uploader.source_token, self.source_token)
         self.assertEqual(handler.uploader.host, "https://" + self.host)
+        
+    @patch('logtail.handler.FlushWorker')
+    def test_handler_passes_timeout_to_uploader(self, MockWorker):
+        # Test default timeout
+        handler = LogtailHandler(source_token=self.source_token, host=self.host)
+        self.assertEqual(handler.uploader.timeout, 30)
+        
+        # Test custom timeout
+        handler = LogtailHandler(source_token=self.source_token, host=self.host, timeout=10)
+        self.assertEqual(handler.uploader.timeout, 10)
 
     @patch('logtail.handler.FlushWorker')
     def test_handler_creates_pipe_from_args(self, MockWorker):

{logtail_python-0.3.3 → logtail_python-0.4.0}/tests/test_uploader.py

@@ -13,10 +13,11 @@ class TestUploader(unittest.TestCase):
     host = 'https://in.logtail.com'
     source_token = 'dummy_source_token'
     frame = [1, 2, 3]
+    timeout = 30
 
     @patch('logtail.uploader.requests.Session.post')
     def test_call(self, post):
-        def mock_post(endpoint, data=None, headers=None):
+        def mock_post(endpoint, data=None, headers=None, timeout=None):
             # Check that the data is sent to ther correct endpoint
             self.assertEqual(endpoint, self.host)
             # Check the content-type
@@ -25,9 +26,11 @@ class TestUploader(unittest.TestCase):
             self.assertEqual('application/msgpack', headers.get('Content-Type'))
             # Check the content was msgpacked correctly
             self.assertEqual(msgpack.unpackb(data, raw=False), self.frame)
+            # Check that timeout is passed to the request
+            self.assertEqual(timeout, 30)
 
         post.side_effect = mock_post
-        u = Uploader(self.source_token, self.host)
+        u = Uploader(self.source_token, self.host, self.timeout)
         u(self.frame)
 
         self.assertTrue(post.called)