[MAINTENANCE] Add organization ID to analytics payloads (#9643)

great-expectations · Mar 25, 2024 · 51c10c2 · 51c10c2
1 parent 982e1d6
commit 51c10c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/great_expectations/data_context/data_context/abstract_data_context.py b/great_expectations/data_context/data_context/abstract_data_context.py
@@ -336,7 +336,9 @@ def _init_factories(self) -> None:
 
     def _init_analytics(self) -> None:
         init_analytics(
+            user_id=None,
             data_context_id=uuid.UUID(self._data_context_id),
+            organization_id=None,
             oss_id=self._get_oss_id(),
         )
 

diff --git a/great_expectations/data_context/data_context/cloud_data_context.py b/great_expectations/data_context/data_context/cloud_data_context.py
@@ -147,9 +147,11 @@ def _check_if_latest_version(self) -> None:
 
     @override
     def _init_analytics(self) -> None:
+        organization_id = self.ge_cloud_config.organization_id
         init_analytics(
             user_id=self._get_cloud_user_id(),
             data_context_id=uuid.UUID(self._data_context_id),
+            organization_id=uuid.UUID(organization_id) if organization_id else None,
             oss_id=self._get_oss_id(),
             cloud_mode=True,
         )

diff --git a/tests/analytics/test_analytics.py b/tests/analytics/test_analytics.py
@@ -84,7 +84,9 @@ def test_ephemeral_context_init(monkeypatch):
     ) as mock_init, mock.patch("posthog.capture") as mock_submit:
         _ = gx.get_context(mode="ephemeral")
 
-    mock_init.assert_called_once_with(data_context_id=mock.ANY, oss_id=mock.ANY)
+    mock_init.assert_called_once_with(
+        data_context_id=mock.ANY, organization_id=None, oss_id=mock.ANY, user_id=None
+    )
     mock_submit.assert_called_once_with(
         mock.ANY,
         "data_context.initialized",
@@ -109,7 +111,8 @@ def test_cloud_context_init(cloud_api_fake, cloud_details, monkeypatch):
 
     mock_init.assert_called_once_with(
         user_id=UUID(FAKE_USER_ID),  # Should be consistent with the fake Cloud API
-        data_context_id=mock.ANY,
+        data_context_id=UUID(cloud_details.org_id),
+        organization_id=UUID(cloud_details.org_id),
         oss_id=mock.ANY,
         cloud_mode=True,
     )