fix context

apache · Nov 24, 2020 · aab4d2d · aab4d2d
1 parent b03b59e
commit aab4d2d
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 45 deletions.
diff --git a/superset/annotation_layers/api.py b/superset/annotation_layers/api.py
@@ -111,7 +111,7 @@ class AnnotationLayerRestApi(BaseSupersetModelRestApi):
     @safe
     @statsd_metrics
     @permission_name("delete")
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def delete(self, pk: int) -> Response:
         """Delete an annotation layer
         ---
@@ -161,7 +161,7 @@ def delete(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @permission_name("post")
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def post(self) -> Response:
         """Creates a new Annotation Layer
         ---
@@ -221,7 +221,7 @@ def post(self) -> Response:
     @safe
     @statsd_metrics
     @permission_name("put")
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def put(self, pk: int) -> Response:
         """Updates an Annotation Layer
         ---
@@ -288,7 +288,7 @@ def put(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @rison(get_delete_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def bulk_delete(self, **kwargs: Any) -> Response:
         """Delete bulk Annotation layers
         ---

diff --git a/superset/cachekeys/api.py b/superset/cachekeys/api.py
@@ -45,10 +45,10 @@ class CacheRestApi(BaseSupersetModelRestApi):
     openapi_spec_component_schemas = (CacheInvalidationRequestSchema,)
 
     @expose("/invalidate", methods=["POST"])
-    @event_logger.log_this
     @protect()
     @safe
     @statsd_metrics
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def invalidate(self) -> Response:
         """
         Takes a list of datasources, finds the associated cache records and

diff --git a/superset/charts/api.py b/superset/charts/api.py
@@ -214,7 +214,7 @@ def __init__(self) -> None:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def post(self) -> Response:
         """Creates a new Chart
         ---
@@ -271,7 +271,7 @@ def post(self) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def put(self, pk: int) -> Response:
         """Changes a Chart
         ---
@@ -345,7 +345,7 @@ def put(self, pk: int) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def delete(self, pk: int) -> Response:
         """Deletes a Chart
         ---
@@ -396,7 +396,7 @@ def delete(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @rison(get_delete_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def bulk_delete(self, **kwargs: Any) -> Response:
         """Delete bulk Charts
         ---
@@ -448,10 +448,10 @@ def bulk_delete(self, **kwargs: Any) -> Response:
             return self.response_422(message=str(ex))
 
     @expose("/data", methods=["POST"])
-    @event_logger.log_this
     @protect()
     @safe
     @statsd_metrics
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def data(self) -> Response:
         """
         Takes a query context constructed in the client and returns payload
@@ -536,7 +536,7 @@ def data(self) -> Response:
     @rison(screenshot_query_schema)
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def cache_screenshot(self, pk: int, **kwargs: Dict[str, bool]) -> WerkzeugResponse:
         """
         ---
@@ -609,7 +609,7 @@ def trigger_celery() -> WerkzeugResponse:
     @rison(screenshot_query_schema)
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
         """Get Chart screenshot
         ---
@@ -663,7 +663,7 @@ def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
     @rison(thumbnail_query_schema)
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def thumbnail(
         self, pk: int, digest: str, **kwargs: Dict[str, bool]
     ) -> WerkzeugResponse:
@@ -737,7 +737,7 @@ def thumbnail(
     @safe
     @statsd_metrics
     @rison(get_export_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def export(self, **kwargs: Any) -> Response:
         """Export charts
         ---
@@ -795,7 +795,7 @@ def export(self, **kwargs: Any) -> Response:
     @safe
     @statsd_metrics
     @rison(get_fav_star_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def favorite_status(self, **kwargs: Any) -> Response:
         """Favorite stars for Charts
         ---

diff --git a/superset/css_templates/api.py b/superset/css_templates/api.py
@@ -88,7 +88,7 @@ class CssTemplateRestApi(BaseSupersetModelRestApi):
     @safe
     @statsd_metrics
     @rison(get_delete_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def bulk_delete(self, **kwargs: Any) -> Response:
         """Delete bulk CSS Templates
         ---

diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
@@ -206,7 +206,7 @@ def __init__(self) -> None:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def post(self) -> Response:
         """Creates a new Dashboard
         ---
@@ -265,7 +265,7 @@ def post(self) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def put(self, pk: int) -> Response:
         """Changes a Dashboard
         ---
@@ -336,7 +336,7 @@ def put(self, pk: int) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def delete(self, pk: int) -> Response:
         """Deletes a Dashboard
         ---
@@ -387,7 +387,7 @@ def delete(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @rison(get_delete_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def bulk_delete(self, **kwargs: Any) -> Response:
         """Delete bulk Dashboards
         ---
@@ -445,7 +445,7 @@ def bulk_delete(self, **kwargs: Any) -> Response:
     @safe
     @statsd_metrics
     @rison(get_export_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def export(self, **kwargs: Any) -> Response:
         """Export dashboards
         ---
@@ -521,7 +521,7 @@ def export(self, **kwargs: Any) -> Response:
     @protect()
     @safe
     @rison(thumbnail_query_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def thumbnail(
         self, pk: int, digest: str, **kwargs: Dict[str, bool]
     ) -> WerkzeugResponse:
@@ -609,7 +609,7 @@ def thumbnail(
     @safe
     @statsd_metrics
     @rison(get_fav_star_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def favorite_status(self, **kwargs: Any) -> Response:
         """Favorite Stars for Dashboards
         ---

diff --git a/superset/databases/api.py b/superset/databases/api.py
@@ -184,7 +184,7 @@ class DatabaseRestApi(BaseSupersetModelRestApi):
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def post(self) -> Response:
         """Creates a new Database
         ---
@@ -247,7 +247,7 @@ def post(self) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def put(  # pylint: disable=too-many-return-statements, arguments-differ
         self, pk: int
     ) -> Response:
@@ -321,7 +321,7 @@ def put(  # pylint: disable=too-many-return-statements, arguments-differ
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def delete(self, pk: int) -> Response:  # pylint: disable=arguments-differ
         """Deletes a Database
         ---
@@ -372,7 +372,7 @@ def delete(self, pk: int) -> Response:  # pylint: disable=arguments-differ
     @safe
     @rison(database_schemas_query_schema)
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def schemas(self, pk: int, **kwargs: Any) -> FlaskResponse:
         """Get all schemas from a database
         ---
@@ -426,8 +426,8 @@ def schemas(self, pk: int, **kwargs: Any) -> FlaskResponse:
     @protect()
     @check_datasource_access
     @safe
-    @event_logger.log_this
     @statsd_metrics
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def table_metadata(
         self, database: Database, table_name: str, schema_name: str
     ) -> FlaskResponse:
@@ -483,8 +483,8 @@ def table_metadata(
     @protect()
     @check_datasource_access
     @safe
-    @event_logger.log_this
     @statsd_metrics
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def select_star(
         self, database: Database, table_name: str, schema_name: Optional[str] = None
     ) -> FlaskResponse:
@@ -540,8 +540,8 @@ def select_star(
     @expose("/test_connection", methods=["POST"])
     @protect()
     @safe
-    @event_logger.log_this
     @statsd_metrics
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def test_connection(  # pylint: disable=too-many-return-statements
         self,
     ) -> FlaskResponse:
@@ -621,7 +621,7 @@ def test_connection(  # pylint: disable=too-many-return-statements
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def related_objects(self, pk: int) -> Response:
         """Get charts and dashboards count associated to a database
         ---
@@ -680,7 +680,7 @@ def related_objects(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @rison(get_export_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def export(self, **kwargs: Any) -> Response:
         """Export database(s) with associated datasets
         ---

diff --git a/superset/datasets/api.py b/superset/datasets/api.py
@@ -181,7 +181,7 @@ class DatasetRestApi(BaseSupersetModelRestApi):
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def post(self) -> Response:
         """Creates a new Dataset
         ---
@@ -238,7 +238,7 @@ def post(self) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def put(self, pk: int) -> Response:
         """Changes a Dataset
         ---
@@ -309,7 +309,7 @@ def put(self, pk: int) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def delete(self, pk: int) -> Response:
         """Deletes a Dataset
         ---
@@ -360,7 +360,7 @@ def delete(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @rison(get_export_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def export(self, **kwargs: Any) -> Response:
         """Export datasets
         ---
@@ -436,7 +436,7 @@ def export(self, **kwargs: Any) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def refresh(self, pk: int) -> Response:
         """Refresh a Dataset
         ---
@@ -486,7 +486,7 @@ def refresh(self, pk: int) -> Response:
     @protect()
     @safe
     @statsd_metrics
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def related_objects(self, pk: int) -> Response:
         """Get charts and dashboards count associated to a dataset
         ---
@@ -545,7 +545,7 @@ def related_objects(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @rison(get_delete_ids_schema)
-    @event_logger.log_this
+    @event_logger.log_this_with_context(log_to_statsd=False)
     def bulk_delete(self, **kwargs: Any) -> Response:
         """Delete bulk Datasets
         ---

diff --git a/superset/utils/log.py b/superset/utils/log.py
@@ -113,14 +113,14 @@ def log_context(
         )
 
     def _wrapper(
-        self, f: Callable[..., Any], action: Optional[str] = None
+        self, f: Callable[..., Any], **wrapper_kwargs: Any
     ) -> Callable[..., Any]:
-        action_str: str = action or f.__name__
+        action_str = wrapper_kwargs.get("action") or f.__name__
         ref = f.__qualname__ if hasattr(f, "__qualname__") else None
 
         @functools.wraps(f)
         def wrapper(*args: Any, **kwargs: Any) -> Any:
-            with self.log_context(action_str, ref) as log:
+            with self.log_context(action_str, ref, **wrapper_kwargs) as log:
                 value = f(*args, **kwargs)
                 log(**kwargs)
             return value
@@ -131,11 +131,11 @@ def log_this(self, f: Callable[..., Any]) -> Callable[..., Any]:
         """Decorator that uses the function name as the action"""
         return self._wrapper(f)
 
-    def log_this_as(self, action: str) -> Callable[..., Any]:
-        """Decorator that uses the function name as the action"""
+    def log_this_with_context(self, **kwargs: Any) -> Callable[..., Any]:
+        """Decorator that can override kwargs of log_context"""
 
         def func(f: Callable[..., Any]) -> Callable[..., Any]:
-            return self._wrapper(f, action)
+            return self._wrapper(f, **kwargs)
 
         return func