From 05ad9a6b894724b1c1f771dc20eb2748219092df Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Tue, 11 Feb 2025 17:17:27 +0100 Subject: [PATCH 1/3] LogtailHandler: Do not expect "host" parameter to include protocol --- logtail/handler.py | 7 +++++-- setup.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/logtail/handler.py b/logtail/handler.py index 91cffaa..b5130eb 100644 --- a/logtail/handler.py +++ b/logtail/handler.py @@ -9,7 +9,7 @@ from .uploader import Uploader from .frame import create_frame -DEFAULT_HOST = 'https://in.logs.betterstack.com' +DEFAULT_HOST = 'in.logs.betterstack.com' DEFAULT_BUFFER_CAPACITY = 1000 DEFAULT_FLUSH_INTERVAL = 1 DEFAULT_CHECK_INTERVAL = 0.1 @@ -32,7 +32,10 @@ def __init__(self, level=logging.NOTSET): super(LogtailHandler, self).__init__(level=level) self.source_token = source_token - self.host = host + if host.startswith('https://') or host.startswith('http://'): + self.host = host + else: + self.host = "https://" + host self.context = context self.pipe = queue.Queue(maxsize=buffer_capacity) self.uploader = Uploader(self.source_token, self.host) diff --git a/setup.py b/setup.py index 08866d0..dd33b5e 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup -VERSION = '0.3.2' +VERSION = '0.3.3' ROOT_DIR = os.path.dirname(__file__) REQUIREMENTS = [ From 8d60c6161b76dd3368ad6327774b7b7f6a57d3cc Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Tue, 11 Feb 2025 17:22:18 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=85=20Expect=20https://dummy=5Fhost?= =?UTF-8?q?=20in=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_handler.py b/tests/test_handler.py index c8d860d..babbff2 100644 --- a/tests/test_handler.py +++ b/tests/test_handler.py @@ -19,7 +19,7 @@ class TestLogtailHandler(unittest.TestCase): def test_handler_creates_uploader_from_args(self, MockWorker): handler = LogtailHandler(source_token=self.source_token, host=self.host) self.assertEqual(handler.uploader.source_token, self.source_token) - self.assertEqual(handler.uploader.host, self.host) + self.assertEqual(handler.uploader.host, "https://" + self.host) @patch('logtail.handler.FlushWorker') def test_handler_creates_pipe_from_args(self, MockWorker): From fdcbde0630bbc2951c9ea026c3a4cd23fb6a15c8 Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Tue, 11 Feb 2025 17:24:14 +0100 Subject: [PATCH 3/3] bump version in __init__.py --- logtail/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logtail/__init__.py b/logtail/__init__.py index 2b06917..0115100 100644 --- a/logtail/__init__.py +++ b/logtail/__init__.py @@ -5,6 +5,6 @@ from .helpers import LogtailContext, DEFAULT_CONTEXT from .formatter import LogtailFormatter -__version__ = '0.3.2' +__version__ = '0.3.3' context = DEFAULT_CONTEXT