fix: Send ingest_settings to fix backfilled user agent and IP

Author: sentrivana

sentry_sdk/_batcher.py

@@ -153,9 +153,14 @@ def _add_to_envelope(self, envelope: "Envelope") -> None:
                 },
                 payload=PayloadRef(
                     json={
+                        "ingest_settings": {
+                            "infer_ip": "never",
+                            "infer_user_agent": "never",
+                        },
+                        "version": 2,
                         "items": [
                             self._to_transport_format(item) for item in self._buffer
-                        ]
+                        ],
                     }
                 ),
             )

sentry_sdk/_span_batcher.py

@@ -224,10 +224,15 @@ def _flush(self, only_pending: bool = False) -> None:
                             },
                             payload=PayloadRef(
                                 json={
+                                    "ingest_settings": {
+                                        "infer_ip": "never",
+                                        "infer_user_agent": "never",
+                                    },
+                                    "version": 2,
                                     "items": [
                                         self._to_transport_format(spans[j])
                                         for j in range(start, end)
-                                    ]
+                                    ],
                                 }
                             ),
                         )