Skip to content

Sync potel-base with master #4432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 2, 2025
Merged

Sync potel-base with master #4432

merged 7 commits into from
Jun 2, 2025

Conversation

sentrivana
Copy link
Contributor

Testing potel/master sync

szokeasaurusrex and others added 6 commits May 20, 2025 11:36
Previously, if the environment variable `SENTRY_DEBUG` would have an
invalid value, such as "invalid," we would set `rv["debug"]` to `None`.
However, since this value should be a boolean, it should instead be set
to `False`.

This change ensures that `rv["debug"]` always is a boolean. Where we
previously would have set the value to `None`, we now set it to `False`.
Other behavior remains unchanged.

Ref
https://github.com/getsentry/sentry-python/pull/4366/files#r2075294825
…le (#4404)

This
[commit](redis/redis-py@91be4a0)
in `redis-py` moved away from using the Pipeline's `command_stack` and
is now using `_execution_strategy.command_queue` instead. We need to
adapt to use the new command source if present.

This fixes `redis-latest` in CI.

---------

Co-authored-by: Daniel Szoke <[email protected]>
OTel also wraps `grpc.aio.server`, but expects the `interceptors` arg to
be a list, while Sentry [turns it into a
tuple](https://github.com/getsentry/sentry-python/blob/94414cdcdce2a311355967ee7b43e7035cf954ce/sentry_sdk/integrations/grpc/__init__.py#L130).

Non-tuple sequences are actually only supported
[starting](grpc/grpc@9699580)
in grpc 1.42.0. So for older versions we need to still use a tuple.

Fixes #4389
Three new versions of things that need addressing:

- pytest-asyncio 1.0
[removes](https://pytest-asyncio.readthedocs.io/en/latest/reference/changelog.html#id2)
the deprecated `event_loop` fixture
- mypy 1.16.0 finds some new issues
- [redis 6.2.0](https://github.com/redis/redis-py/releases/tag/v6.2.0):
- adds the `execution_strategy` abstraction to async cluster pipelines
as well, so the commands are no longer accessible directly and need to
be accessed via the `strategy`
- renames the `_client` attribute on async cluster pipeline to
`cluster_client`
Fix #4427 by setting an empty list if `settings_cls.cron_jobs` is None.
@sentrivana sentrivana changed the base branch from master to potel-base June 2, 2025 10:10
Copy link

codecov bot commented Jun 2, 2025

❌ 12 Tests Failed:

Tests completed Failed Passed Skipped
27299 12 27287 6220
View the top 3 failed test(s) by shortest run time
tests.integrations.spark.test_spark::test_initialize_spark_integration_after_spark_context_init
Stack Traces | 0s run time
.../integrations/spark/test_spark.py:35: in create_spark_context
    SparkContext._active_spark_context.stop()
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
E   AttributeError: 'NoneType' object has no attribute 'stop'
tests.integrations.spark.test_spark::test_initialize_spark_integration_after_spark_context_init
Stack Traces | 0s run time
.../integrations/spark/test_spark.py:35: in create_spark_context
    SparkContext._active_spark_context.stop()
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
E   AttributeError: 'NoneType' object has no attribute 'stop'
tests.integrations.spark.test_spark::test_initialize_spark_integration_after_spark_context_init
Stack Traces | 0s run time
.../integrations/spark/test_spark.py:35: in create_spark_context
    SparkContext._active_spark_context.stop()
E   AttributeError: 'NoneType' object has no attribute 'stop'

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

@sentrivana sentrivana force-pushed the ivana/potel/sync-sync branch from a0b8c1d to 9983288 Compare June 2, 2025 10:16
@sentrivana sentrivana force-pushed the ivana/potel/sync-sync branch from 9983288 to a012fe4 Compare June 2, 2025 10:28
@sentrivana sentrivana merged commit a012fe4 into potel-base Jun 2, 2025
134 of 145 checks passed
@sentrivana sentrivana deleted the ivana/potel/sync-sync branch June 2, 2025 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants