Merge pull request #103 from microsoft/v3

v2.0.7

Packages/FabricSync/FabricSync.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: FabricSync
-Version: 2.0.6
+Version: 2.0.7
 Summary: Fabric BigQuery Data Sync Utility
 Author-email: Microsoft GBBs North America <[email protected]>
 License: MIT License

Packages/FabricSync/FabricSync/BQ/Logging.py

@@ -10,6 +10,7 @@
 from .Enum import *
 from .Constants import SyncConstants
 from .Utils import *
+from ..Meta import Version as SyncVersion
 
 class SyncLogger:
     def __init__(self, context:SparkSession):
@@ -60,7 +61,10 @@ def sync_status(self, message, *args, **kwargs):
     def telemetry(self, message, *args, **kwargs):
         if (self.logger.isEnabledFor(SyncLogLevel.TELEMETRY.value)):
             if self.Telemetry:
-                self.send_telemetry(message)
+                message["correlation_id"] = self.ApplicationID
+                message["sync_version"] = SyncVersion.CurrentVersion 
+
+                self.send_telemetry(json.dumps(message))
                 #self.logger._log(SyncLogLevel.SYNC_STATUS.value, f"Telemetry: {message}", args, **kwargs)
 
     def send_telemetry(self, payload):
@@ -78,10 +82,7 @@ def send_telemetry(self, payload):
     async def send_telemetry_to_api(self, payload):
         try:
             api_proxy = RestAPIProxy(base_url=f"https://{self.TelemetryEndpoint}")
-            #response = api_proxy.post(endpoint="telemetry", data=payload)
-
             bound = functools.partial(api_proxy.post, endpoint="telemetry", data=payload)
-            #loop = asyncio.get_event_loop()
             await self.loop.run_in_executor(None, bound)
         except Exception as e:
             self.logger.error("Telemetry Send Failure")
@@ -135,9 +136,9 @@ def log_telemetry(operation:str, result=None, data=None):
         }
 
         if data:
-            payload = payload | data
+            payload["operation_data"] = data
 
-        logging.Logger.telemetry(json.dumps(payload))
+        logging.Logger.telemetry(payload)
 
     def Install(func_=None):
         def _decorator(func):

Packages/FabricSync/FabricSync/Meta.py

@@ -1,2 +1,2 @@
 class Version():
-    CurrentVersion = "2.0.6"
+    CurrentVersion = "2.0.7"

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "FabricSync"
-version = "2.0.6"
+version = "2.0.7"
 dependencies = [
   'pydantic == 2.10.4',
   'PyGithub == 2.5.0',