Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/test-integrations-misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-loguru"
- name: Test opentelemetry
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-opentelemetry"
- name: Test otlp
run: |
set -x # print commands that are executed
Expand Down
1 change: 1 addition & 0 deletions MIGRATION_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh

- Transaction profiling and related code was removed.
- Removed the deprecated Hub class and all uses of hub throughout the SDK in arguments, options, etc. Use a scope instead.
- The `SentrySpanProcessor`, `SentryPropagator`, `instrumenter`, and associated OpenTelemetry compatibility code was removed along with the `opentelemetry` extra and the `SentryPropagator` entrypoint. Use the `OTLPIntegration` instead.
- Removed the `auto_session_tracing` decorator. Use `track_session` instead.
- The experimental option `otel_powered_performance` has been removed together with the associated `OpenTelemetryIntegration` and `opentelemetry-experimental` extra.

Expand Down
1 change: 0 additions & 1 deletion scripts/populate_tox/populate_tox.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
"shadowed_module",
"gcp",
"gevent",
"opentelemetry",
"otlp",
}

Expand Down
8 changes: 0 additions & 8 deletions scripts/populate_tox/tox.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ envlist =
# GCP
{py3.7}-gcp

# OpenTelemetry (OTel)
{py3.7,py3.9,py3.12,py3.13,py3.14,py3.14t}-opentelemetry

# OpenTelemetry with OTLP
{py3.7,py3.9,py3.12,py3.13,py3.14}-otlp

Expand Down Expand Up @@ -136,10 +133,6 @@ deps =
aws_lambda: uvicorn
aws_lambda: pyyaml

# OpenTelemetry (OTel)
Comment thread
cursor[bot] marked this conversation as resolved.
opentelemetry: opentelemetry-distro
opentelemetry: pytest-forked

# OpenTelemetry with OTLP
otlp: opentelemetry-distro[otlp]
otlp: responses
Expand Down Expand Up @@ -233,7 +226,6 @@ setenv =
aws_lambda: _TESTPATH=tests/integrations/aws_lambda
cloud_resource_context: _TESTPATH=tests/integrations/cloud_resource_context
gcp: _TESTPATH=tests/integrations/gcp
opentelemetry: _TESTPATH=tests/integrations/opentelemetry
otlp: _TESTPATH=tests/integrations/otlp
socket: _TESTPATH=tests/integrations/socket

Expand Down
1 change: 0 additions & 1 deletion scripts/split_tox_gh_actions/split_tox_gh_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@
],
"Misc": [
"loguru",
"opentelemetry",
"otlp",
"pure_eval",
"trytond",
Expand Down
6 changes: 1 addition & 5 deletions sentry_sdk/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

from sentry_sdk import Client, tracing_utils
from sentry_sdk._init_implementation import init
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.crons import monitor
from sentry_sdk.scope import Scope, _ScopeManager, isolation_scope, new_scope
from sentry_sdk.traces import StreamedSpan
Expand Down Expand Up @@ -383,7 +382,6 @@ def start_span(
@scopemethod
def start_transaction(
transaction: "Optional[Transaction]" = None,
instrumenter: str = INSTRUMENTER.SENTRY,
custom_sampling_context: "Optional[SamplingContext]" = None,
**kwargs: "Unpack[TransactionKwargs]",
) -> "Union[Transaction, NoOpSpan]":
Expand Down Expand Up @@ -411,15 +409,13 @@ def start_transaction(

:param transaction: The transaction to start. If omitted, we create and
start a new transaction.
:param instrumenter: This parameter is meant for internal use only. It
will be removed in the next major version.
:param custom_sampling_context: The transaction's custom sampling context.
:param kwargs: Optional keyword arguments to be passed to the Transaction
constructor. See :py:class:`sentry_sdk.tracing.Transaction` for
available arguments.
"""
return get_current_scope().start_transaction(
transaction, instrumenter, custom_sampling_context, **kwargs
transaction, custom_sampling_context, **kwargs
)


Expand Down
4 changes: 0 additions & 4 deletions sentry_sdk/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from sentry_sdk.consts import (
DEFAULT_MAX_VALUE_LENGTH,
DEFAULT_OPTIONS,
INSTRUMENTER,
SPANDATA,
SPANSTATUS,
VERSION,
Expand Down Expand Up @@ -331,9 +330,6 @@ def _get_options(*args: "Optional[str]", **kwargs: "Any") -> "Dict[str, Any]":
if rv["server_name"] is None and hasattr(socket, "gethostname"):
rv["server_name"] = socket.gethostname()

if rv["instrumenter"] is None:
rv["instrumenter"] = INSTRUMENTER.SENTRY

if rv["project_root"] is None:
try:
project_root = os.getcwd()
Expand Down
7 changes: 0 additions & 7 deletions sentry_sdk/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@ def __str__(self) -> str:
return self.value


class INSTRUMENTER:
SENTRY = "sentry"
OTEL = "otel"


class SPANNAME:
DB_COMMIT = "COMMIT"
DB_ROLLBACK = "ROLLBACK"
Expand Down Expand Up @@ -1309,7 +1304,6 @@ def __init__(
send_client_reports: bool = True,
_experiments: "Experiments" = {}, # noqa: B006
proxy_headers: "Optional[Dict[str, str]]" = None,
instrumenter: "Optional[str]" = INSTRUMENTER.SENTRY,
before_send_transaction: "Optional[TransactionProcessor]" = None,
project_root: "Optional[str]" = None,
enable_tracing: "Optional[bool]" = None,
Expand Down Expand Up @@ -1716,7 +1710,6 @@ def __init__(

:param spotlight:

:param instrumenter:

:param enable_logs: Set `enable_logs` to True to enable the SDK to emit
Sentry logs. Defaults to False.
Expand Down
7 changes: 0 additions & 7 deletions sentry_sdk/integrations/opentelemetry/__init__.py

This file was deleted.

9 changes: 0 additions & 9 deletions sentry_sdk/integrations/opentelemetry/consts.py

This file was deleted.

128 changes: 0 additions & 128 deletions sentry_sdk/integrations/opentelemetry/propagator.py

This file was deleted.

Loading
Loading