Port `sample_rate` update to `potel-base` #4069

sentrivana · Feb 17, 2025

If the SDK uses a specific sample rate for a trace, it needs to update it in the DSC for downstream SDKs.

On an incoming trace, the DSC's sample_rate is updated if:

an explicit sampling decision is forced, e.g. startTransaction(sampled: true)

the tracesSampler is invoked

the tracesSampleRate is used

Closes #4028

codecov · Feb 17, 2025

❌ 736 Tests Failed:

Tests completed	Failed	Passed	Skipped
19719	736	18983	4064

View the top 3 failed test(s) by shortest run time

 tests.integrations.celery.integration_tests.test_celery_beat_cron_monitoring

Stack Traces | 0s run time

.../hostedtoolcache/Python/3.7.17.../x64/lib/python3.7/importlib/__init__.py:127: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
<frozen importlib._bootstrap>:1006: in _gcd_import
    ???
<frozen importlib._bootstrap>:983: in _find_and_load
    ???
<frozen importlib._bootstrap>:953: in _find_and_load_unlocked
    ???
<frozen importlib._bootstrap>:219: in _call_with_frames_removed
    ???
<frozen importlib._bootstrap>:1006: in _gcd_import
    ???
<frozen importlib._bootstrap>:983: in _find_and_load
    ???
<frozen importlib._bootstrap>:967: in _find_and_load_unlocked
    ???
<frozen importlib._bootstrap>:677: in _load_unlocked
    ???
<frozen importlib._bootstrap_external>:728: in exec_module
    ???
<frozen importlib._bootstrap>:219: in _call_with_frames_removed
    ???
.../celery/integration_tests/__init__.py:7: in <module>
    from celery.beat import Scheduler
.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/celery/beat.py:22: in <module>
    from . import __version__, platforms, signals
.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/celery/signals.py:14: in <module>
    from .utils.dispatch import Signal
.tox/py3.7-celery-v5.0.5/lib/python3.7.../celery/utils/__init__.py:16: in <module>
    from .nodenames import nodename, nodesplit, worker_direct
.tox/py3.7-celery-v5.0.5/lib/python3.7.../celery/utils/nodenames.py:6: in <module>
    from kombu.entity import Exchange, Queue
.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/kombu/entity.py:7: in <module>
    from .serialization import prepare_accept_content
.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/kombu/serialization.py:440: in <module>
    for ep, args in entrypoints('kombu.serializers'):  # pragma: no cover
.tox/py3.7-celery-v5.0.5/lib/python3.7.../kombu/utils/compat.py:82: in entrypoints
    for ep in importlib_metadata.entry_points().get(namespace, [])
E   AttributeError: 'EntryPoints' object has no attribute 'get'

 tests.integrations.celery.test_celery

Stack Traces | 0s run time

ImportError while importing test module '.../integrations/celery/test_celery.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/_pytest/python.py:617: in _importtestmodule
    mod = import_path(self.path, mode=importmode, root=self.config.rootpath)
.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/_pytest/pathlib.py:567: in import_path
    importlib.import_module(module_name)
.../hostedtoolcache/Python/3.7.17.../x64/lib/python3.7/importlib/__init__.py:127: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
<frozen importlib._bootstrap>:1006: in _gcd_import
    ???
<frozen importlib._bootstrap>:983: in _find_and_load
    ???
<frozen importlib._bootstrap>:967: in _find_and_load_unlocked
    ???
<frozen importlib._bootstrap>:677: in _load_unlocked
    ???
.tox/py3.7-celery-v5.0.5/lib/python3.7.../_pytest/assertion/rewrite.py:186: in exec_module
    exec(co, module.__dict__)
.../integrations/celery/test_celery.py:6: in <module>
    from celery import Celery, VERSION
E   ImportError: cannot import name 'Celery' from 'celery' (.../sentry-python/sentry-python/.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/celery/__init__.py)

 tests.integrations.celery.test_update_celery_task_headers

Stack Traces | 0s run time

.../integrations/celery/beat.py:28: in <module>
    from celery import Task, Celery  # type: ignore
E   ImportError: cannot import name 'Task' from 'celery' (.../sentry-python/sentry-python/.tox/py3.7-celery-v5.0.5/lib/python3.7.../site-packages/celery/__init__.py)

During handling of the above exception, another exception occurred:
.../integrations/celery/test_update_celery_task_headers.py:7: in <module>
    from sentry_sdk.integrations.celery import _update_celery_task_headers
.../integrations/celery/__init__.py:9: in <module>
    from sentry_sdk.integrations.celery.beat import (
.../integrations/celery/beat.py:37: in <module>
    raise DidNotEnable("Celery not installed")
E   sentry_sdk.integrations.DidNotEnable: Celery not installed

To view more test analytics, go to the Test Analytics Dashboard
_{📋 Got 3 mins? Take this short survey to help us improve Test Analytics.}

…entry/sentry-python into ivana/potel/port-sample-rate-update

tests/test_dsc.py

…entry/sentry-python into ivana/potel/port-sample-rate-update

…ide the sampled field in trace_state

antonpirker

Tested it and works as expected. Nice work!

antonpirker · Feb 28, 2025

sentry_sdk/integrations/opentelemetry/scope.py

@@ -123,7 +123,7 @@ def _incoming_otel_span_context(self):
        # for twp to work, we also need to consider deferred sampling when the sampling
        # flag is not present, so the above TraceFlags are not sufficient
        if self._propagation_context.parent_sampled is None:
-            trace_state = trace_state.add(TRACESTATE_SAMPLED_KEY, "deferred")
+            trace_state = trace_state.update(TRACESTATE_SAMPLED_KEY, "deferred")


Added this change, to make sure we set sentry-sampled to deferred in any case. If there is already a entry sentry-sampled in the trace_state then .add() will not do anything.

(There can be a sentry-sampled in the trace_state if the upstream SDK sends the sentry-sampled DSC entry with the baggage http request. If there was no upstream sampling descision, this entry should either not be sent, of if sent than as None.)

This change works in both cases.

…entry/sentry-python into ivana/potel/port-sample-rate-update

sentrivana force-pushed the ivana/potel/port-sample-rate-update branch from 8d3bfce to 7842236 Compare February 24, 2025 09:40

sentrivana marked this pull request as ready for review February 24, 2025 11:29

sentrivana requested a review from antonpirker February 24, 2025 11:29

Port traces_sample_rate update to potel-base

3061f57

sentrivana force-pushed the ivana/potel/port-sample-rate-update branch from f22283d to 3061f57 Compare February 24, 2025 15:38

sentrivana and others added 3 commits February 27, 2025 09:31

Merge branch 'potel-base' into ivana/potel/port-sample-rate-update

9968358

Added one more test

d2351e7

Merge branch 'ivana/potel/port-sample-rate-update' of github.com:gets…

73c0543

…entry/sentry-python into ivana/potel/port-sample-rate-update

cleptric reviewed Feb 27, 2025

View reviewed changes

tests/test_dsc.py Outdated Show resolved Hide resolved

sentrivana and others added 6 commits February 27, 2025 15:16

update test

d6fae76

Test case to try to override incoming with traces_sample_rate

7649f34

Merge branch 'ivana/potel/port-sample-rate-update' of github.com:gets…

7f95458

…entry/sentry-python into ivana/potel/port-sample-rate-update

updated test

1a09fc5

Updated test

0064118

In case the sentry-trace says we defer the sampling descission, overr…

0f56682

…ide the sampled field in trace_state

antonpirker approved these changes Feb 28, 2025

View reviewed changes

antonpirker reviewed Feb 28, 2025

View reviewed changes

sentrivana and others added 7 commits February 28, 2025 09:56

simplify

56a9eae

fix test

f60670c

cleanup

e434be1

Merge branch 'ivana/potel/port-sample-rate-update' of github.com:gets…

eb93d9c

…entry/sentry-python into ivana/potel/port-sample-rate-update

...testing ci

01acd94

try with monkeypatch

62f3122

Merge branch 'potel-base' into ivana/potel/port-sample-rate-update

d177d6e

antonpirker merged commit 30e1071 into potel-base Feb 28, 2025
91 of 128 checks passed

antonpirker deleted the ivana/potel/port-sample-rate-update branch February 28, 2025 09:54

antonpirker mentioned this pull request Feb 28, 2025

Port sample-rate update to POTel #4028

Closed

sentrivana mentioned this pull request Feb 28, 2025

POtel implementation base branch #3152

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Port `sample_rate` update to `potel-base` #4069

Port `sample_rate` update to `potel-base` #4069

Uh oh!

sentrivana commented Feb 17, 2025 •

edited

Loading

Uh oh!

codecov bot commented Feb 17, 2025 •

edited

Loading

Uh oh!

Uh oh!

antonpirker left a comment

Uh oh!

antonpirker Feb 28, 2025

Uh oh!

Uh oh!

Uh oh!

Search code, repositories, users, issues, pull requests...

Port sample_rate update to potel-base #4069

Port sample_rate update to potel-base #4069

Uh oh!

Conversation

sentrivana commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ 736 Tests Failed:

Uh oh!

Uh oh!

antonpirker left a comment

Choose a reason for hiding this comment

Uh oh!

antonpirker Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Port `sample_rate` update to `potel-base` #4069

Port `sample_rate` update to `potel-base` #4069

sentrivana commented Feb 17, 2025 •

edited

Loading

codecov bot commented Feb 17, 2025 •

edited

Loading