|
39 | 39 | from sentry_sdk.scope import should_send_default_pii |
40 | 40 | from sentry_sdk.traces import StreamedSpan |
41 | 41 | from sentry_sdk.tracing import Span as SentrySpan |
42 | | -from sentry_sdk.tracing_utils import has_span_streaming_enabled |
43 | 42 | from sentry_sdk.utils import SENSITIVE_DATA_SUBSTITUTE |
44 | 43 |
|
45 | 44 |
|
@@ -206,40 +205,23 @@ def on_new_span( |
206 | 205 | else: |
207 | 206 | sentry_span_name = "<unknown>" |
208 | 207 |
|
209 | | - span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options) |
210 | | - if span_streaming: |
211 | | - if sentry_sdk.traces.get_current_span() is None: |
212 | | - return None |
213 | | - |
214 | | - sentry_span = sentry_sdk.traces.start_span( |
215 | | - name=sentry_span_name, |
216 | | - attributes={ |
217 | | - "sentry.op": "function", |
218 | | - "sentry.origin": self.origin, |
219 | | - }, |
220 | | - ) |
221 | | - fields = metadata.get("fields", []) |
222 | | - for field in fields: |
223 | | - if self._include_tracing_fields(): |
224 | | - sentry_span.set_attribute(field, attrs.get(field)) |
225 | | - else: |
226 | | - sentry_span.set_attribute(field, SENSITIVE_DATA_SUBSTITUTE) |
227 | | - |
228 | | - return sentry_span |
229 | | - |
230 | | - sentry_span = sentry_sdk.start_span( |
231 | | - op="function", |
| 208 | + if sentry_sdk.traces.get_current_span() is None: |
| 209 | + return None |
| 210 | + |
| 211 | + sentry_span = sentry_sdk.traces.start_span( |
232 | 212 | name=sentry_span_name, |
233 | | - origin=self.origin, |
| 213 | + attributes={ |
| 214 | + "sentry.op": "function", |
| 215 | + "sentry.origin": self.origin, |
| 216 | + }, |
234 | 217 | ) |
235 | 218 | fields = metadata.get("fields", []) |
236 | 219 | for field in fields: |
237 | 220 | if self._include_tracing_fields(): |
238 | | - sentry_span.set_data(field, attrs.get(field)) |
| 221 | + sentry_span.set_attribute(field, attrs.get(field)) |
239 | 222 | else: |
240 | | - sentry_span.set_data(field, SENSITIVE_DATA_SUBSTITUTE) |
| 223 | + sentry_span.set_attribute(field, SENSITIVE_DATA_SUBSTITUTE) |
241 | 224 |
|
242 | | - sentry_span.__enter__() |
243 | 225 | return sentry_span |
244 | 226 |
|
245 | 227 | def on_close(self, span_id: str, sentry_span: "SentrySpan") -> None: |
|
0 commit comments