fix conflicts

Signed-off-by: pyalex <[email protected]>
feast-dev · Nov 2, 2021 · 7d78276 · 7d78276
1 parent 961c771
commit 7d78276
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/sdk/python/feast/infra/online_stores/redis.py b/sdk/python/feast/infra/online_stores/redis.py
@@ -37,8 +37,7 @@
 from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto
 from feast.protos.feast.types.Value_pb2 import Value as ValueProto
 from feast.repo_config import FeastConfigBaseModel
-from feast.telemetry import tracing_span
-from feast.usage import log_exceptions_and_usage
+from feast.telemetry import enable_telemetry, tracing_span
 
 try:
     from redis import Redis
@@ -90,7 +89,7 @@ def delete_table_values(
 
         logger.debug(f"Deleted {deleted_count} keys for {table.name}")
 
-    @log_exceptions_and_usage(online_store="redis")
+    @enable_telemetry(online_store="redis")
     def update(
         self,
         config: RepoConfig,
@@ -163,7 +162,7 @@ def _get_client(self, online_store_config: RedisOnlineStoreConfig):
                 self._client = Redis(**kwargs)
         return self._client
 
-    @log_exceptions_and_usage(online_store="redis")
+    @enable_telemetry(online_store="redis")
     def online_write_batch(
         self,
         config: RepoConfig,
@@ -227,7 +226,7 @@ def online_write_batch(
             if progress:
                 progress(len(results))
 
-    @log_exceptions_and_usage(online_store="redis")
+    @enable_telemetry(online_store="redis")
     def online_read(
         self,
         config: RepoConfig,