fixup

Author: realark

py/src/braintrust/env.py

@@ -161,22 +161,22 @@ def _resolve_use_legacy_uuid_ids() -> bool:
     """Resolve whether the SDK should generate legacy UUID-based span/trace IDs.
 
     The default is OpenTelemetry-compatible hex IDs (16-byte trace id / 8-byte
-    span id) with V4 span-component export. Setting BRAINTRUST_LEGACY_UUID_IDS
+    span id) with V4 span-component export. Setting BRAINTRUST_LEGACY_IDS
     opts back into UUID IDs with V3 export.
 
     BRAINTRUST_OTEL_COMPAT (which selects the OpenTelemetry context manager)
-    requires hex IDs, so it always wins: if both it and BRAINTRUST_LEGACY_UUID_IDS
+    requires hex IDs, so it always wins: if both it and BRAINTRUST_LEGACY_IDS
     are set, legacy IDs are disabled and a warning is logged (at most once per
     process, even though this is re-resolved lazily on each access).
     """
     global _warned_legacy_uuid_conflict
 
-    legacy = EnvVar("BRAINTRUST_LEGACY_UUID_IDS", EnvParser.BOOL).get(False)
+    legacy = EnvVar("BRAINTRUST_LEGACY_IDS", EnvParser.BOOL).get(False)
     if EnvVar("BRAINTRUST_OTEL_COMPAT", EnvParser.BOOL).get(False):
         if legacy and not _warned_legacy_uuid_conflict:
             _warned_legacy_uuid_conflict = True
             _logger.warning(
-                "BRAINTRUST_LEGACY_UUID_IDS is ignored because BRAINTRUST_OTEL_COMPAT "
+                "BRAINTRUST_LEGACY_IDS is ignored because BRAINTRUST_OTEL_COMPAT "
                 "requires OpenTelemetry-compatible hex span IDs. Using hex IDs."
             )
         return False
@@ -210,9 +210,4 @@ class BraintrustEnv:
     OTEL_COMPAT = EnvVar("BRAINTRUST_OTEL_COMPAT", EnvParser.BOOL)
     # Opt out of the default OpenTelemetry-compatible hex span/trace IDs and use
     # legacy UUID-based IDs (and V3 span-component export) instead.
-    LEGACY_UUID_IDS = EnvVar("BRAINTRUST_LEGACY_UUID_IDS", EnvParser.BOOL)
-
-    # Whether to use legacy UUID IDs. Lazily resolved on each access from the
-    # current environment, like the other fields above. The conflict warning
-    # (OTEL_COMPAT wins over LEGACY_UUID_IDS) is emitted at most once per process.
-    USE_LEGACY_UUID_IDS = _LegacyUuidIdsField()
+    LEGACY_IDS = _LegacyUuidIdsField()

py/src/braintrust/id_gen.py

@@ -11,10 +11,10 @@ def get_id_generator():
     This eliminates global state and makes tests parallelizable.
     Each caller gets their own generator instance.
 
-    Defaults to OpenTelemetry-compatible hex IDs. Set BRAINTRUST_LEGACY_UUID_IDS
+    Defaults to OpenTelemetry-compatible hex IDs. Set BRAINTRUST_LEGACY_IDS
     to opt back into legacy UUID-based IDs.
     """
-    return UUIDGenerator() if BraintrustEnv.USE_LEGACY_UUID_IDS else OTELIDGenerator()
+    return UUIDGenerator() if BraintrustEnv.LEGACY_IDS else OTELIDGenerator()
 
 
 class IDGenerator(ABC):

py/src/braintrust/logger.py

@@ -164,7 +164,7 @@ def _get_exporter():
     serializing hex IDs via V3 would lose the compact encoding and risk
     corrupting hex values that happen to parse as UUIDs.
     """
-    return SpanComponentsV3 if BraintrustEnv.USE_LEGACY_UUID_IDS else SpanComponentsV4
+    return SpanComponentsV3 if BraintrustEnv.LEGACY_IDS else SpanComponentsV4
 
 
 class Exportable(ABC):
@@ -3914,7 +3914,7 @@ def _parent_span_ids_match_active_format(span_id: str | None, root_span_id: str
     """
     if not span_id or not root_span_id:
         return False
-    if BraintrustEnv.USE_LEGACY_UUID_IDS:
+    if BraintrustEnv.LEGACY_IDS:
         # Legacy mode: accept only non-hex (UUID) ids.
         return not _is_hex_ids(span_id, root_span_id)
     # Hex mode (default): accept only hex-shaped ids.

py/src/braintrust/test_env.py

@@ -149,28 +149,28 @@ def test_otel_compat_uses_shared_bool_parser(self, monkeypatch):
 
 
 class TestIdConfig:
-    # USE_LEGACY_UUID_IDS is lazily resolved from the current environment on each
+    # LEGACY_IDS is lazily resolved from the current environment on each
     # access, like the other settings, so tests just set env vars and read it.
 
     def test_hex_ids_default(self, monkeypatch):
         monkeypatch.delenv("BRAINTRUST_OTEL_COMPAT", raising=False)
-        monkeypatch.delenv("BRAINTRUST_LEGACY_UUID_IDS", raising=False)
-        assert BraintrustEnv.USE_LEGACY_UUID_IDS is False
+        monkeypatch.delenv("BRAINTRUST_LEGACY_IDS", raising=False)
+        assert BraintrustEnv.LEGACY_IDS is False
 
     def test_legacy_uuid_opt_out(self, monkeypatch):
         monkeypatch.delenv("BRAINTRUST_OTEL_COMPAT", raising=False)
-        monkeypatch.setenv("BRAINTRUST_LEGACY_UUID_IDS", "true")
-        assert BraintrustEnv.USE_LEGACY_UUID_IDS is True
+        monkeypatch.setenv("BRAINTRUST_LEGACY_IDS", "true")
+        assert BraintrustEnv.LEGACY_IDS is True
 
     def test_otel_compat_forces_hex(self, monkeypatch):
-        # OTEL_COMPAT implies hex IDs regardless of LEGACY_UUID_IDS being unset.
+        # OTEL_COMPAT implies hex IDs regardless of LEGACY_IDS being unset.
         monkeypatch.setenv("BRAINTRUST_OTEL_COMPAT", "true")
-        monkeypatch.delenv("BRAINTRUST_LEGACY_UUID_IDS", raising=False)
-        assert BraintrustEnv.USE_LEGACY_UUID_IDS is False
+        monkeypatch.delenv("BRAINTRUST_LEGACY_IDS", raising=False)
+        assert BraintrustEnv.LEGACY_IDS is False
 
     def test_conflicting_flags_otel_wins(self, monkeypatch):
-        # OTEL_COMPAT wins over LEGACY_UUID_IDS: legacy is disabled (hex IDs)
+        # OTEL_COMPAT wins over LEGACY_IDS: legacy is disabled (hex IDs)
         # rather than raising.
         monkeypatch.setenv("BRAINTRUST_OTEL_COMPAT", "true")
-        monkeypatch.setenv("BRAINTRUST_LEGACY_UUID_IDS", "true")
-        assert BraintrustEnv.USE_LEGACY_UUID_IDS is False
+        monkeypatch.setenv("BRAINTRUST_LEGACY_IDS", "true")
+        assert BraintrustEnv.LEGACY_IDS is False

py/src/braintrust/test_id_gen.py

@@ -9,17 +9,17 @@
 def reset_id_generator_state():
     """Reset ID generator state and environment variables before each test"""
     original_otel = os.getenv("BRAINTRUST_OTEL_COMPAT")
-    original_legacy = os.getenv("BRAINTRUST_LEGACY_UUID_IDS")
+    original_legacy = os.getenv("BRAINTRUST_LEGACY_IDS")
 
     try:
         yield
     finally:
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+        os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
         if original_otel:
             os.environ["BRAINTRUST_OTEL_COMPAT"] = original_otel
         if original_legacy:
-            os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = original_legacy
+            os.environ["BRAINTRUST_LEGACY_IDS"] = original_legacy
 
 
 def test_uuid_generator():
@@ -60,7 +60,7 @@ def test_otel_id_generator():
 
 def test_id_get_env_var(reset_id_generator_state):
     # By default (no env vars) the generator produces OTEL-compatible hex IDs.
-    # BRAINTRUST_OTEL_COMPAT always implies hex; BRAINTRUST_LEGACY_UUID_IDS opts
+    # BRAINTRUST_OTEL_COMPAT always implies hex; BRAINTRUST_LEGACY_IDS opts
     # back into UUIDs (only when OTEL_COMPAT is off).
     cases = [
         (None, lambda _id: _assert_is_hex(_id)),
@@ -73,7 +73,7 @@ def test_id_get_env_var(reset_id_generator_state):
 
     for env_var_value, assert_func in cases:
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+        os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
         if env_var_value is not None:
             os.environ["BRAINTRUST_OTEL_COMPAT"] = env_var_value
         generator = id_gen.get_id_generator()
@@ -82,7 +82,7 @@ def test_id_get_env_var(reset_id_generator_state):
 
 
 def test_id_get_env_var_legacy_uuid(reset_id_generator_state):
-    # BRAINTRUST_LEGACY_UUID_IDS opts back into UUID IDs.
+    # BRAINTRUST_LEGACY_IDS opts back into UUID IDs.
     cases = [
         ("true", lambda _id: uuid.UUID(_id)),
         ("True", lambda _id: uuid.UUID(_id)),
@@ -91,8 +91,8 @@ def test_id_get_env_var_legacy_uuid(reset_id_generator_state):
 
     for env_var_value, assert_func in cases:
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
-        os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = env_var_value
+        os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
+        os.environ["BRAINTRUST_LEGACY_IDS"] = env_var_value
         generator = id_gen.get_id_generator()
         assert_func(generator.get_span_id())
         assert_func(generator.get_trace_id())
@@ -101,7 +101,7 @@ def test_id_get_env_var_legacy_uuid(reset_id_generator_state):
 def test_otel_compat_wins_over_legacy_uuid(reset_id_generator_state):
     # When both are set, OTEL_COMPAT wins: hex IDs are used (no raise).
     os.environ["BRAINTRUST_OTEL_COMPAT"] = "true"
-    os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = "true"
+    os.environ["BRAINTRUST_LEGACY_IDS"] = "true"
     generator = id_gen.get_id_generator()
     assert generator.share_root_span_id() is False
     _assert_is_hex(generator.get_span_id())

py/src/braintrust/test_logger.py

@@ -2784,18 +2784,18 @@ def reset_id_generator_state():
     logger._state._reset_id_generator()
     logger._state._reset_context_manager()
     original_otel = os.getenv("BRAINTRUST_OTEL_COMPAT")
-    original_legacy = os.getenv("BRAINTRUST_LEGACY_UUID_IDS")
+    original_legacy = os.getenv("BRAINTRUST_LEGACY_IDS")
     try:
         yield
     finally:
         logger._state._reset_id_generator()
         logger._state._reset_context_manager()
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+        os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
         if original_otel:
             os.environ["BRAINTRUST_OTEL_COMPAT"] = original_otel
         if original_legacy:
-            os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = original_legacy
+            os.environ["BRAINTRUST_LEGACY_IDS"] = original_legacy
 
 
 def test_otel_compatible_span_export_import():
@@ -2876,7 +2876,7 @@ def test_span_with_uuid_ids_share_root_span_id(reset_id_generator_state):
 
     # Opt into legacy UUID IDs (hex IDs are the default).
     os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-    os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = "true"
+    os.environ["BRAINTRUST_LEGACY_IDS"] = "true"
     logger._state._reset_id_generator()
 
     init_test_logger(__name__)
@@ -3079,9 +3079,9 @@ def test_update_span_includes_span_id_and_root_span_id_from_export(with_memory_l
 
 def test_get_exporter_returns_v4_by_default():
     """Test that _get_exporter() returns SpanComponentsV4 by default (no env vars)."""
-    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+        os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
         from braintrust.logger import _get_exporter
         from braintrust.span_identifier_v4 import SpanComponentsV4
 
@@ -3091,9 +3091,9 @@ def test_get_exporter_returns_v4_by_default():
 
 def test_get_exporter_returns_v3_when_legacy_uuid():
     """Test that _get_exporter() returns SpanComponentsV3 in legacy UUID mode."""
-    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = "true"
+        os.environ["BRAINTRUST_LEGACY_IDS"] = "true"
         from braintrust.logger import _get_exporter
         from braintrust.span_identifier_v3 import SpanComponentsV3
 
@@ -3114,9 +3114,9 @@ def test_get_exporter_returns_v4_when_otel_enabled():
 
 def test_experiment_export_uses_v4_by_default():
     """Test that Experiment.export() uses V4 by default."""
-    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+        os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
         experiment = init_test_exp("test-exp")
         exported = experiment.export()
 
@@ -3128,9 +3128,9 @@ def test_experiment_export_uses_v4_by_default():
 
 def test_experiment_export_uses_v3_in_legacy_mode():
     """Test that Experiment.export() uses V3 in legacy UUID mode."""
-    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = "true"
+        os.environ["BRAINTRUST_LEGACY_IDS"] = "true"
         experiment = init_test_exp("test-exp")
         exported = experiment.export()
 
@@ -3155,9 +3155,9 @@ def test_experiment_export_respects_otel_compat_enabled():
 
 def test_logger_export_uses_v4_by_default():
     """Test that Logger.export() uses V4 by default."""
-    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+        os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
         test_logger = init_test_logger(__name__)
         exported = test_logger.export()
 
@@ -3169,9 +3169,9 @@ def test_logger_export_uses_v4_by_default():
 
 def test_logger_export_uses_v3_in_legacy_mode():
     """Test that Logger.export() uses V3 in legacy UUID mode."""
-    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = "true"
+        os.environ["BRAINTRUST_LEGACY_IDS"] = "true"
         test_logger = init_test_logger(__name__)
         exported = test_logger.export()
 

py/src/braintrust/test_propagation.py

@@ -331,9 +331,9 @@ def test_inject_noops_in_legacy_uuid_mode():
 
     from braintrust.test_helpers import preserve_env_vars
 
-    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+    with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
         os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-        os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = "true"
+        os.environ["BRAINTRUST_LEGACY_IDS"] = "true"
         with _internal_with_memory_background_logger():
             logger = init_test_logger("legacy-inject")
             with logger.start_span(name="p") as span:

py/src/braintrust/test_span_components.py

@@ -343,17 +343,17 @@ class TestExportFormatSelection:
     """Test that span export format is coupled to the active ID format.
 
     Hex IDs (the default) serialize as V4; legacy UUID IDs (opted into via
-    BRAINTRUST_LEGACY_UUID_IDS) serialize as V3.
+    BRAINTRUST_LEGACY_IDS) serialize as V3.
     """
 
     def test_export_format_based_on_env_variable(self):
         """Test that export format follows the legacy-UUID opt-out flag."""
         from braintrust.test_helpers import init_test_logger, preserve_env_vars
 
-        with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+        with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
             # Legacy UUID mode should use V3.
             os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-            os.environ["BRAINTRUST_LEGACY_UUID_IDS"] = "true"
+            os.environ["BRAINTRUST_LEGACY_IDS"] = "true"
 
             l = init_test_logger("test_export_v3")
             with l.start_span(name="test_span") as span:
@@ -362,7 +362,7 @@ def test_export_format_based_on_env_variable(self):
             assert SpanComponentsV4.get_version(export_v3_mode) == 3
 
             # Default (hex) mode should use V4.
-            os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+            os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
 
             l = init_test_logger("test_export_v4")
             with l.start_span(name="test_span") as span:
@@ -378,9 +378,9 @@ def test_export_uses_v4_by_default(self):
         """Test that export uses V4 format by default (no env vars set)."""
         from braintrust.test_helpers import init_test_logger, preserve_env_vars
 
-        with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_UUID_IDS"):
+        with preserve_env_vars("BRAINTRUST_OTEL_COMPAT", "BRAINTRUST_LEGACY_IDS"):
             os.environ.pop("BRAINTRUST_OTEL_COMPAT", None)
-            os.environ.pop("BRAINTRUST_LEGACY_UUID_IDS", None)
+            os.environ.pop("BRAINTRUST_LEGACY_IDS", None)
 
             l = init_test_logger("test_default_v4")
             with l.start_span(name="test_span") as span: