Check empty tokens before making connection attempt (#1110)

Co-authored-by: nagaraj-poojari <[email protected]>
Co-authored-by: Alex Hall <[email protected]>

Author: 3 people

logfire/_internal/config.py

@@ -880,7 +880,7 @@ def add_span_processor(span_processor: SpanProcessor) -> None:
 
                 # try loading credentials (and thus token) from file if a token is not already available
                 # this takes the lowest priority, behind the token passed to `configure` and the environment variable
-                if self.token is None:
+                if not self.token:
                     credentials = LogfireCredentials.load_creds_file(self.data_dir)
 
                     # if we still don't have a token, try initializing a new project and writing a new creds file
@@ -896,7 +896,7 @@ def add_span_processor(span_processor: SpanProcessor) -> None:
                         self.token = credentials.token
                         self.advanced.base_url = self.advanced.base_url or credentials.logfire_api_url
 
-                if self.token is not None:
+                if self.token:
 
                     def check_token():
                         assert self.token is not None

logfire/_internal/config_params.py

@@ -160,7 +160,7 @@ def load_param(self, name: str, runtime: Any = None) -> Any:
         Returns:
             The value of the parameter.
         """
-        if runtime is not None:
+        if runtime is not None and runtime != '':
             return runtime
 
         param = CONFIG_PARAMS[name]

tests/test_configure.py

@@ -1328,6 +1328,15 @@ def test_send_to_logfire_if_token_present_empty_via_env_var() -> None:
     assert len(requests_mocker.request_history) == 0
 
 
+def test_send_to_logfire_if_token_present_empty_via_arg() -> None:
+    with ExitStack() as stack:
+        stack.enter_context(mock.patch('logfire._internal.config.Confirm.ask', side_effect=RuntimeError))
+        requests_mocker = stack.enter_context(requests_mock.Mocker())
+        configure(token='', send_to_logfire='if-token-present', console=False)
+        wait_for_check_token_thread()
+        assert len(requests_mocker.request_history) == 0
+
+
 def wait_for_check_token_thread():
     for thread in threading.enumerate():
         if thread.name == 'check_logfire_token':  # pragma: no cover
@@ -1350,6 +1359,22 @@ def test_send_to_logfire_if_token_present_not_empty(capsys: pytest.CaptureFixtur
         del os.environ['LOGFIRE_TOKEN']
 
 
+def test_send_to_logfire_if_token_present_not_empty_via_env_with_empty_arg(capsys: pytest.CaptureFixture[str]) -> None:
+    os.environ['LOGFIRE_TOKEN'] = 'non_empty_token'
+    try:
+        with requests_mock.Mocker() as request_mocker:
+            request_mocker.get(
+                'https://logfire-us.pydantic.dev/v1/info',
+                json={'project_name': 'myproject', 'project_url': 'fake_project_url'},
+            )
+            configure(token='', send_to_logfire='if-token-present')
+            wait_for_check_token_thread()
+            assert len(request_mocker.request_history) == 1
+            assert capsys.readouterr().err == 'Logfire project URL: fake_project_url\n'
+    finally:
+        del os.environ['LOGFIRE_TOKEN']
+
+
 def test_send_to_logfire_if_token_present_in_logfire_dir(tmp_path: Path, capsys: pytest.CaptureFixture[str]) -> None:
     creds_file = tmp_path / 'logfire_credentials.json'
     creds_file.write_text(