redesign the log adapter

bigframes/core/__init__.py

@@ -26,7 +26,6 @@
 import bigframes.core.compile.compiled as compiled
 import bigframes.core.compile.compiler as compiler
 import bigframes.core.guid
-from bigframes.core.log_adapter import class_logger, method_logger
 import bigframes.core.nodes as nodes
 from bigframes.core.ordering import OrderingColumnReference
 import bigframes.core.ordering as orderings
@@ -42,8 +41,6 @@
 ORDER_ID_COLUMN = "bigframes_ordering_id"
 PREDICATE_COLUMN = "bigframes_predicate"
 
-__all__ = ["class_logger", "method_logger"]
-
 
 @dataclass(frozen=True)
 class ArrayValue:

bigframes/core/log_adapter.py

@@ -1,29 +1,51 @@
-import functools
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-from loguru import logger
+import functools
+import threading
 
-_log_file_path = None
-_logger = logger
-_api_methods = []
+_lock = threading.Lock()
+MAX_LABELS_COUNT = 64
 
 
-def class_logger(decorated_cls):
+def class_logger(api_methods=None):
     """Decorator that adds logging functionality to each method of the class."""
-    for attr_name, attr_value in decorated_cls.__dict__.items():
-        if callable(attr_value):
-            setattr(decorated_cls, attr_name, method_logger(attr_value))
-    return decorated_cls
 
+    def decorator(decorated_cls):
+        for attr_name, attr_value in decorated_cls.__dict__.items():
+            if callable(attr_value):
+                setattr(decorated_cls, attr_name, method_logger(attr_value))
+
+        # Initialize or extend _api_methods attribute
+        decorated_cls._api_methods = getattr(decorated_cls, "_api_methods", [])
+        if api_methods:
+            decorated_cls._api_methods.extend(api_methods)
+
+        return decorated_cls
 
-def method_logger(method):
+    return decorator
+
+
+def method_logger(method, cls):
     """Decorator that adds logging functionality to a method."""
 
     @functools.wraps(method)
     def wrapper(*args, **kwargs):
         api_method_name = str(method.__name__)
         # Track regular and "dunder" methods
         if api_method_name.startswith("__") or not api_method_name.startswith("_"):
-            add_api_method(api_method_name)
+            add_api_method(api_method_name, cls)
         try:
             result = method(*args, **kwargs)
             return result
@@ -33,6 +55,18 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-def add_api_method(method: str):
-    global _api_methods
-    _api_methods.append(method)
+def add_api_method(api_method_name, cls):
+    global _lock
+    with _lock:
+        # Push the method to the front of the _api_methods list
+        cls._api_methods.insert(0, api_method_name)
+        # Keep the list length within the maximum limit (adjust MAX_LABELS_COUNT as needed)
+        cls._api_methods = cls._api_methods[:MAX_LABELS_COUNT]
+
+
+def get_and_reset_api_methods(cls):
+    global _lock
+    with _lock:
+        previous_api_methods = list(cls._api_methods)
+        cls._api_methods.clear()
+    return previous_api_methods

bigframes/core/nodes.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 from __future__ import annotations
 
 from dataclasses import dataclass, field

bigframes/session/__init__.py

@@ -1365,14 +1365,12 @@ def _start_query(
         """
         Starts query job and waits for results.
         """
-        api_methods = log_adapter._api_methods
+        api_methods = log_adapter.get_and_reset_api_methods(self)
         job_config = self._prepare_job_config(job_config)
         job_config.labels = bigframes_io.create_job_configs_labels(
             job_configs_labels=job_config.labels, api_methods=api_methods
         )
         query_job = self.bqclient.query(sql, job_config=job_config)
-        # Clear out the global api logger
-        log_adapter._api_methods = []
 
         opts = bigframes.options.display
         if opts.progress_bar is not None and not query_job.configuration.dry_run:

bigframes/session/_io/bigquery.py

@@ -41,7 +41,7 @@ def create_job_configs_labels(
     labels = list(
         itertools.chain(
             job_configs_labels.keys(),
-            (f"bigframes-api-{i}" for i in range(len(api_methods))),
+            (f"recent-bigframes-api-{i}" for i in range(len(api_methods))),
         )
     )
     values = list(itertools.chain(job_configs_labels.values(), api_methods))

setup.py

@@ -52,7 +52,6 @@
     "sqlalchemy >=1.4,<3.0dev",
     "ipywidgets >=7.7.1",
     "humanize >= 4.6.0",
-    "loguru >=0.6.0",
 ]
 extras = {
     # Optional test dependencies packages. If they're missed, may skip some tests.

testing/constraints-3.9.txt

@@ -96,7 +96,6 @@ pytest-xdist==3.2.1
 python-dateutil==2.8.2
 pytz==2023.3
 PyYAML==6.0
-loguru==0.6.0
 readme-renderer==37.3
 requests==2.27.1
 requests-oauthlib==1.3.1