derive base urls from tokens' regions

Author: adriangb

logfire/_internal/cli.py

@@ -27,7 +27,6 @@
 from .auth import DEFAULT_FILE, HOME_LOGFIRE, DefaultFile, is_logged_in, poll_for_token, request_device_code
 from .config import LogfireCredentials
 from .config_params import ParamManager
-from .constants import LOGFIRE_BASE_URL
 from .tracer import SDKTracerProvider
 from .utils import read_toml_file
 
@@ -398,7 +397,7 @@ def _main(args: list[str] | None = None) -> None:
 
     parser.add_argument('--version', action='store_true', help='show the version and exit')
     global_opts = parser.add_argument_group(title='global options')
-    global_opts.add_argument('--logfire-url', default=LOGFIRE_BASE_URL, help=argparse.SUPPRESS)
+    global_opts.add_argument('--logfire-url', default='', help=argparse.SUPPRESS)
     parser.set_defaults(func=lambda _: parser.print_help())  # type: ignore
     subparsers = parser.add_subparsers(title='commands', metavar='')
 

logfire/_internal/config.py

@@ -158,7 +158,7 @@ class ConsoleOptions:
 class AdvancedOptions:
     """Options primarily used for testing by Logfire developers."""
 
-    base_url: str = 'https://logfire-api.pydantic.dev'
+    base_url: str | None = None
     """Root URL for the Logfire API."""
 
     id_generator: IdGenerator = dataclasses.field(default_factory=lambda: SeededRandomIdGenerator(None))
@@ -173,6 +173,19 @@ class AdvancedOptions:
     log_record_processors: Sequence[LogRecordProcessor] = ()
     """Configuration for OpenTelemetry logging. This is experimental and may be removed."""
 
+    def generate_base_url(self, token: str | None) -> str:
+        if token and '-' in token:
+            region, _ = token.split('-', maxsplit=1)
+        else:
+            region = None
+        if self.base_url is not None:
+            return self.base_url
+        if region:
+            return f'https://api-{region}.pydantic.dev'
+        else:
+            # default to us region for tokens that were created before regions were added
+            return 'https://logfire-api.pydantic.dev'
+
 
 @dataclass
 class PydanticPlugin:
@@ -864,7 +877,9 @@ def add_span_processor(span_processor: SpanProcessor) -> None:
                     # note, we only do this if `send_to_logfire` is explicitly `True`, not 'if-token-present'
                     if self.send_to_logfire is True and credentials is None:
                         credentials = LogfireCredentials.initialize_project(
-                            logfire_api_url=self.advanced.base_url,
+                            # TODO: what happens here? Seems like we need to assume a region to create the new project?
+                            # Should the SDK have the region from when the user logged in to the SDK?
+                            logfire_api_url=self.advanced.generate_base_url(None),
                             session=requests.Session(),
                         )
                         credentials.write_creds_file(self.data_dir)
@@ -891,7 +906,7 @@ def check_token():
                     session = OTLPExporterHttpSession(max_body_size=OTLP_MAX_BODY_SIZE)
                     session.headers.update(headers)
                     span_exporter = OTLPSpanExporter(
-                        endpoint=urljoin(self.advanced.base_url, '/v1/traces'),
+                        endpoint=urljoin(self.advanced.generate_base_url(self.token), '/v1/traces'),
                         session=session,
                         compression=Compression.Gzip,
                     )
@@ -915,7 +930,7 @@ def check_token():
                             PeriodicExportingMetricReader(
                                 QuietMetricExporter(
                                     OTLPMetricExporter(
-                                        endpoint=urljoin(self.advanced.base_url, '/v1/metrics'),
+                                        endpoint=urljoin(self.advanced.generate_base_url(self.token), '/v1/metrics'),
                                         headers=headers,
                                         session=session,
                                         compression=Compression.Gzip,
@@ -930,7 +945,7 @@ def check_token():
                         )
 
                     log_exporter = OTLPLogExporter(
-                        endpoint=urljoin(self.advanced.base_url, '/v1/logs'),
+                        endpoint=urljoin(self.advanced.generate_base_url(self.token), '/v1/logs'),
                         session=session,
                         compression=Compression.Gzip,
                     )
@@ -1151,7 +1166,7 @@ def warn_if_not_initialized(self, message: str):
             )
 
     def _initialize_credentials_from_token(self, token: str) -> LogfireCredentials | None:
-        return LogfireCredentials.from_token(token, requests.Session(), self.advanced.base_url)
+        return LogfireCredentials.from_token(token, requests.Session(), self.advanced.generate_base_url(token))
 
     def _ensure_flush_after_aws_lambda(self):
         """Ensure that `force_flush` is called after an AWS Lambda invocation.

logfire/_internal/config_params.py

@@ -13,7 +13,7 @@
 from logfire.exceptions import LogfireConfigError
 
 from . import config
-from .constants import LOGFIRE_BASE_URL, LevelName
+from .constants import LevelName
 from .exporters.console import ConsoleColorsValues
 from .utils import read_toml_file
 
@@ -98,7 +98,9 @@ class _DefaultCallback:
 """Whether to enable the f-string magic feature. On by default for Python 3.11 and above."""
 IGNORE_NO_CONFIG = ConfigParam(env_vars=['LOGFIRE_IGNORE_NO_CONFIG'], allow_file_config=True, default=False, tp=bool)
 """Whether to show a warning message if logfire if used without calling logfire.configure()"""
-BASE_URL = ConfigParam(env_vars=['LOGFIRE_BASE_URL'], allow_file_config=True, default=LOGFIRE_BASE_URL)
+BASE_URL = ConfigParam(env_vars=['LOGFIRE_BASE_URL'], allow_file_config=True, default=None, tp=Union[str, None])
+REGION = ConfigParam(env_vars=['LOGFIRE_REGION'], allow_file_config=True, default='us')
+"""The region of the Logfire backend."""
 """The base URL of the Logfire backend. Primarily for testing purposes."""
 DISTRIBUTED_TRACING = ConfigParam(env_vars=['LOGFIRE_DISTRIBUTED_TRACING'], allow_file_config=True, default=None, tp=bool)
 """Whether to extract incoming trace context. By default, will extract but warn about it."""
@@ -205,6 +207,8 @@ def _cast(self, value: Any, name: str, tp: type[T]) -> T | None:
             return float(value)  # type: ignore
         if tp is Path:
             return Path(value)  # type: ignore
+        if tp in (None, type(None)) and value in (None, ''):
+            return None
         if get_origin(tp) is set and get_args(tp) == (str,):  # pragma: no branch
             return _extract_set_of_str(value)  # type: ignore
         raise RuntimeError(f'Unexpected type {tp}')  # pragma: no cover

logfire/_internal/constants.py

@@ -137,9 +137,6 @@ def log_level_attributes(level: LevelName | int) -> dict[str, otel_types.Attribu
 ATTRIBUTES_SCRUBBED_KEY = f'{LOGFIRE_ATTRIBUTES_NAMESPACE}.scrubbed'
 """Key in OTEL attributes with metadata about parts of a span that have been scrubbed."""
 
-LOGFIRE_BASE_URL = 'https://logfire-api.pydantic.dev'
-"""The Logfire API base URL."""
-
 RESOURCE_ATTRIBUTES_PACKAGE_VERSIONS = 'logfire.package_versions'
 """Versions of installed packages, serialized as list of json objects with keys 'name' and 'version'."""