POtel implementation base branch #3152
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sl0thentr0py
force-pushed
the
potel-base
branch
2 times, most recently
from
f7f153c to
28effd6
Compare
sl0thentr0py
force-pushed
the
potel-base
branch
2 times, most recently
from
16f9341 to
951477f
Compare
Codecov ReportAttention: Patch coverage is
✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## master #3152 +/- ##
==========================================
+ Coverage 80.28% 84.36% +4.08%
==========================================
Files 142 144 +2
Lines 15919 14636 -1283
Branches 2722 2326 -396
==========================================
- Hits 12780 12348 -432
+ Misses 2263 1561 -702
+ Partials 876 727 -149
|
szokeasaurusrex
force-pushed
the
potel-base
branch
from
d4b1d00 to
4428ee9
Compare
antonpirker
changed the title
I messed up the merge. If an error happens, we should still report it, whatever the HTTP method. Fixing here.
* Populates a DSC with correct values when we don't have an incoming trace. * We rely on `trace_state.add` only adding new keys to the tracestate so these values will be populated in the first sampling decision on the root and just be propagated further. Note that transaction name is missing here for now and will be dealt with separately as part of the transaction name PRs. closes #3479
Set the correct span `op` for database spans, instead of the generic `"db"`.
…ts (#3631) Otel `span.set_attribute()` does not allow `dict` values, thus we change the data to be compatible
* while sending the event in the final payload, the transaction name
will be picked up from the attributes `sentry.name` or fallback to the
`description` when we only have otel instrumentation
* for populating DSC in the head case, we are doing a best attempt
solution and fetching the transaction name/source from the current and
isolation scopes
* NOTE that there are cases where this will be
inaccurate if we never set the transaction name on the scope in some
integration, so we will go through and fix those cases separately.
- trytond<5, falcon<3, django<2 are all more than 5 years old Closes #4049
Changing the default of `traces_sample_rate` to `0`. This means incoming traces will be continued, but we will not start traces on our own. (It used to be set to: never start or continue traces by default) Refs #4102
BREAKING CHANGE: Remove `Span.containing_transaction`. Use `Span.root_span` instead. Closes #4253 <!-- Describe your PR here --> --- Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`. Running the test suite on your PR might require maintainer approval.
Moving stuff out of `integrations/opentelemetry/` step by step since there is no OpenTelemetry integration anymore -- it's part of the core SDK. This moves `sentry_sdk/integrations/opentelemetry/sampler.py` -> `sentry_sdk/opentelemetry/sampler.py` Ref #3853
This reverts commit 955108e (#3791) and simply enables `cache_spans` by default. Co-authored-by: Anton Pirker <[email protected]> Co-authored-by: Ivana Kellyer <[email protected]>
Closes #4235 --------- Co-authored-by: Ivana Kellyer <[email protected]>
Moving stuff out of `integrations/opentelemetry/` step by step since there is no OpenTelemetry integration anymore -- it's part of the core SDK. This moves `sentry_sdk/integrations/opentelemetry/span_processor.py` -> `sentry_sdk/opentelemetry/span_processor.py` Ref #3853 --------- Co-authored-by: Daniel Szoke <[email protected]>
Moving stuff out of `integrations/opentelemetry/` step by step since there is no OpenTelemetry integration anymore -- it's part of the core SDK. This moves `sentry_sdk/integrations/opentelemetry/propagator.py` -> `sentry_sdk/opentelemetry/propagator.py` Ref #3853 --------- Co-authored-by: Daniel Szoke <[email protected]>
Moving stuff out of `integrations/opentelemetry/` step by step since there is no OpenTelemetry integration anymore -- it's part of the core SDK. This moves `sentry_sdk/integrations/opentelemetry/contextvars_context.py` -> `sentry_sdk/opentelemetry/contextvars_context.py` Ref #3853
Port of #4278 for POTel. <!-- Describe your PR here --> --- Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`. Running the test suite on your PR might require maintainer approval.
Moving stuff out of `integrations/opentelemetry/` step by step since
there is no OpenTelemetry integration anymore -- it's part of the core
SDK. This moves
`sentry_sdk/integrations/opentelemetry/{utils,consts}.py` ->
`sentry_sdk/opentelemetry/{utils,consts}.py`.
There's quite some stuff moving around in this PR in order to remove
circular dependencies that have to do with `tracing.py`:
- `get_span_status_from_http_code` from `tracing.py` is now in
`tracing_utils.py`
- various constants from `tracing.py` are now in `consts.py`
Additionally, Sphinx was unhappy, so tweaked the way we type some things
in `api.py` and `_init_implementation.py`.
I'll possibly follow this up with creating a nice structure for the
tracing files, maybe a common `tracing` directory with `tracing.py`,
`tracing_utils.py` -> `utils.py`, and dedicated `consts.py`.
Ref #3853
Moving stuff out of `integrations/opentelemetry/` step by step since there is no OpenTelemetry integration anymore -- it's part of the core SDK. This moves `sentry_sdk/integrations/opentelemetry/scope.py` -> `sentry_sdk/opentelemetry/scope.py` Ref #3853
Moving stuff out of `integrations/opentelemetry/` step by step since there is no OpenTelemetry integration anymore -- it's part of the core SDK. - Moved `sentry_sdk/integrations/opentelemetry/integration.py` -> `sentry_sdk/opentelemetry/tracing.py`. - Removed all the experimental autoinstrumentation stuff from `integration.py`. - Removed `integrations/opentelemetry/` altogether (there was nothing left but `__init__.py`, which is now also gone). - Moved all tests from `tests/integrations/opentelemetry` to `tests/opentelemetry`. - Removed the potel/opentelemetry integration test targets from `tox.ini`. These will now be run as part of the Common test suite. Ref #3853
Porting stuff from master and other fixes * add correct `event_level` to new logging tests (on `potel-base`, we don't capture logging errors by default so this has to be set explicitly) * add compat for `start_transaction` * re-enable an old test **Note:** This still leaves one failing threading test, will address that separately
For testing purposes I set the next major version of the SDK.
Currently, this property has type `Any`, but it can now be changed to `Optional[Span]` Depends on: - #4263
`ThreadingIntegration` can optionally **NOT** propagate scope data to
threads (`propagate_scope=False`). In that case, in POTel we were
wrapping the thread's task in an `isolation_scope()`:
```python
with sentry_sdk.isolation_scope() as scope:
return _run_old_run_func()
```
But as this forks the currently active isolation scope, the thread
effectively gets all scope data from the parent isolation scope -- so
the scope is actually propagated to the thread, even though it shouldn't
be since `propagate_scope=False`.
~We effectively need some way to give the thread a clear isolation scope
instead. In this PR, I'm just clearing the forked iso scope, but I'm not
sure if this is good enough and if something doesn't need to be done on
the OTel side too.~
~Another option would be to set the iso/current scopes to the initial,
empty iso/current scopes instead, before running the thread's target
function.~
UPDATE: we're just instantiating new scopes now
Another change is that in OTel, the spans in the threads, now without a
parent, automatically get promoted to transactions. (On master they'd
just be orphaned spans, so they wouldn't be taken into account at all.)
We probably need to instruct folks to add `only_if_parent` if they don't
want this to happen.
---------
Co-authored-by: Neel Shah <[email protected]>
With the switch to OTel, the Common test suite is now dependent on an otel package, so it technically fits the toxgen usecase. By letting toxgen take care of it, we're making sure we're always testing a good range of otel versions, including the oldest one (to catch regressions) and the newest one (to catch incompatibilities early). Couple things surfaced in terms of incompatibility with older versions: - Some semantic attributes we're using weren't there from the get go open-telemetry/opentelemetry-python@495d705. Changed the code that uses them to handle failure. - The signature of `span.set_status()` changed at some point open-telemetry/opentelemetry-python@6e282d2. Added a compat version of `set_status()` for older otel. Also included: - removing the `opentelemetry-experimental` extra (not used anymore) - ❗ switching to using `opentelemetry-sdk` instead of `opentelemetry-distro` -- the `distro` only seems to [be setting up some defaults](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/8390db35ae2062c09d4d74a08d310c7bde1912c4/opentelemetry-distro/src/opentelemetry/distro/__init__.py) that we're not using Closes #3241
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Full state of CI: #3744
Contains:
propagate_scope=FalseinThreadingIntegration#4310Scope.root_spanlogic #4274Scope.root_span#4273LoggingIntegrationto Sentry by default #4300integrations/opentelemetry/#4277integrations/opentelemetry/#4276integrations/opentelemetry/#4272integrations/opentelemetry/#4260integrations/opentelemetry/#4259integrations/opentelemetry/#4258cache_spansby default #3994start_spanfail if unsupported args are provided #4201Span.set_data()#4261sample_randto POTel #4106propagate_traces#4206warningsmodule for deprecation messagse. #4180sample_rateupdate topotel-base#4069SystemExit(0)not as a span status of 'internal_error' #4094use_scope#3851None#3816only_if_parentoption to POTelSpan and use it in integrations #3748_serialize_span_attributeintoset_attribute#3732subprocessbreadcrumbs frommaybe_create_breadcrumbs_from_spanto integration. #3637addto trace state if key does not exist #3645op. #3628make aws lambda layer#3586use_scope,use_isolation_scope#3522use_scope,use_isolation_scope#3500OpenTelemetryIntegrationtoDEFAULT_INTEGRATIONS#3471activeflag onPOTelSpan#3470start_transaction#3379Huband related code for good. #3446Simple test
References
startSpan& friendsstart_span& friendsMisc
In OTel, this:
is equivalent to