remove functionality for user to specify correlation scope

Author: Max Wang

README.md

@@ -300,25 +300,6 @@ except ValidationError as e:
     print(f"Validation error: {e.message}")
 ```
 
-### Correlate multiple requests to debug
-
-Give your own identifier to every HTTP call by wrapping operations in
-`DataverseClient.correlation_scope()`:
-
-```python
-from uuid import uuid4
-
-with client.correlation_scope(str(uuid4())):
-    client.create("account", {"name": "Scoped Request"})
-    pages = client.get("account", filter="statecode eq 0")
-    for batch in pages:
-        ...
-```
-
-All nested SDK calls inside the block (including pagination and retries) reuse
-the provided value for the `x-ms-correlation-request-id` header, which makes it
-easy to align Dataverse traces. If you omit the context manager, the SDK automatically generates unique correlation IDs.
-
 ### Authentication issues
 
 **Common fixes:** 

src/PowerPlatform/Dataverse/client.py

@@ -698,37 +698,4 @@ def flush_cache(self, kind) -> int:
         with self._scoped_odata() as od:
             return od._flush_cache(kind)
 
-    # Other utilities
-    @contextmanager
-    def correlation_scope(self, correlation_id: str) -> Iterator["DataverseClient"]:
-        """Share a caller-specified correlation id across nested SDK calls.
-
-        Use this context manager to stamp your own identifier on every Dataverse
-        request made within the ``with`` block. Nested SDK calls reuse the
-        existing correlation id, and concurrent scopes remain isolated.
-
-        :param correlation_id: Non-empty identifier to propagate to
-            ``x-ms-correlation-request-id``.
-        :type correlation_id: :class:`str`
-        :raises TypeError: If ``correlation_id`` is not a string.
-        :raises ValueError: If ``correlation_id`` is empty after trimming.
-
-        Example::
-
-            with client.correlation_scope("6f187988-5fb4-4bd2-9f25-4d7a1c9e24ce"):
-                client.create("account", {"name": "Scoped Run"})
-                for batch in client.get("account", filter="statecode eq 0"):
-                    ...
-        """
-
-        if not isinstance(correlation_id, str):
-            raise TypeError("correlation_id must be str")
-        trimmed = correlation_id.strip()
-        if not trimmed:
-            raise ValueError("correlation_id cannot be empty")
-        od = self._get_odata()
-        with od._call_scope(trimmed):
-            yield self
-
-
 __all__ = ["DataverseClient"]

src/PowerPlatform/Dataverse/data/_odata.py

@@ -154,17 +154,9 @@ def __init__(
         self._picklist_cache_ttl_seconds = 3600  # 1 hour TTL
 
     @contextmanager
-    def _call_scope(self, correlation_id: Optional[str] = None):
-        """Context manager to share a correlation id across nested SDK calls."""
-        existing = _CALL_SCOPE_CORRELATION_ID.get()
-        if correlation_id is not None:
-            if not (_GUID_RE.fullmatch(correlation_id)):
-                raise ValueError("correlation_id provided must be a GUID string")
-            shared_id = correlation_id
-        elif existing is not None:
-            shared_id = existing
-        else:
-            shared_id = str(uuid.uuid4())
+    def _call_scope(self):
+        """Context manager to generate a new correlation id for each SDK call scope."""
+        shared_id = str(uuid.uuid4())
         token = _CALL_SCOPE_CORRELATION_ID.set(shared_id)
         try:
             yield shared_id

tests/unit/core/test_http_errors.py

@@ -182,35 +182,3 @@ def test_correlation_id_shared_inside_call_scope():
     assert h1["x-ms-correlation-id"] == h2["x-ms-correlation-id"]
 
 
-def test_dataverse_client_correlation_scope_accepts_guid_and_sets_header():
-    responses = [
-        (200, {}, {"value": []}),
-        (200, {}, {"value": []}),
-    ]
-    client = DataverseClient("https://org.example", DummyCredential(), DataverseConfig())
-    mock = MockClient([])
-    recorder = RecordingHTTP(responses)
-    mock._http = recorder
-    client._odata = mock
-    guid = "2f3cbe8f-2d3d-4f0a-9bb2-1c9a1f8f0b1b"
-    with client.correlation_scope(guid):
-        mock._request("get", mock.api + "/accounts")
-        mock._request("get", mock.api + "/accounts")
-    assert len(recorder.recorded_headers) == 2
-    h1, h2 = recorder.recorded_headers
-    assert h1["x-ms-correlation-id"] == guid
-    assert h2["x-ms-correlation-id"] == guid
-
-
-def test_correlation_scope_rejects_blank_identifier():
-    client = DataverseClient("https://org.example", DummyCredential(), DataverseConfig())
-    with pytest.raises(ValueError):
-        with client.correlation_scope("   "):
-            pass
-
-
-def test_correlation_scope_rejects_non_guid_identifier():
-    client = DataverseClient("https://org.example", DummyCredential(), DataverseConfig())
-    with pytest.raises(ValueError):
-        with client.correlation_scope("not-a-guid"):
-            pass