diff --git a/README.md b/README.md index 3de5ad19..6396135d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ With EDOT Python you have access to all the features of the OpenTelemetry Python ## Configuration -The distribution supports all the configuration variables from OpenTelemetry Python project version 1.43.0. +The distribution supports all the configuration variables from OpenTelemetry Python project version 1.44.0. See [Configuration](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/python/configuration.html) for more details. diff --git a/dev-requirements.txt b/dev-requirements.txt index a940a80d..09783c7d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -8,7 +8,7 @@ build==1.5.0 # via pip-tools certifi==2026.7.22 # via requests -charset-normalizer==3.5.0 +charset-normalizer==3.5.1 # via requests click==8.4.2 # via pip-tools @@ -28,7 +28,7 @@ iniconfig==2.3.0 # via pytest leb128==1.0.9 # via elastic-opentelemetry (pyproject.toml) -opentelemetry-api==1.43.0 +opentelemetry-api==1.44.0 # via # elastic-opentelemetry (pyproject.toml) # opentelemetry-exporter-otlp-proto-grpc @@ -41,28 +41,28 @@ opentelemetry-api==1.43.0 # opentelemetry-sdk # opentelemetry-semantic-conventions # oteltest -opentelemetry-exporter-otlp==1.43.0 +opentelemetry-exporter-otlp==1.44.0 # via elastic-opentelemetry (pyproject.toml) -opentelemetry-exporter-otlp-proto-common==1.43.0 +opentelemetry-exporter-otlp-proto-common==1.44.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-grpc==1.43.0 +opentelemetry-exporter-otlp-proto-grpc==1.44.0 # via opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-http==1.43.0 +opentelemetry-exporter-otlp-proto-http==1.44.0 # via opentelemetry-exporter-otlp -opentelemetry-instrumentation==0.64b0 +opentelemetry-instrumentation==0.65b0 # via # elastic-opentelemetry (pyproject.toml) # opentelemetry-instrumentation-logging # opentelemetry-instrumentation-system-metrics -opentelemetry-instrumentation-logging==0.64b0 +opentelemetry-instrumentation-logging==0.65b0 # via elastic-opentelemetry (pyproject.toml) -opentelemetry-instrumentation-system-metrics==0.64b0 +opentelemetry-instrumentation-system-metrics==0.65b0 # via elastic-opentelemetry (pyproject.toml) opentelemetry-opamp-client==0.3b0 # via elastic-opentelemetry (pyproject.toml) -opentelemetry-proto==1.43.0 +opentelemetry-proto==1.44.0 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc @@ -70,11 +70,11 @@ opentelemetry-proto==1.43.0 # oteltest opentelemetry-resource-detector-azure==0.1.5 # via elastic-opentelemetry (pyproject.toml) -opentelemetry-resource-detector-containerid==0.64b0 +opentelemetry-resource-detector-containerid==0.65b0 # via elastic-opentelemetry (pyproject.toml) opentelemetry-resourcedetector-gcp==1.14.0 # via elastic-opentelemetry (pyproject.toml) -opentelemetry-sdk==1.43.0 +opentelemetry-sdk==1.44.0 # via # elastic-opentelemetry (pyproject.toml) # opentelemetry-exporter-otlp-proto-grpc @@ -85,7 +85,7 @@ opentelemetry-sdk==1.43.0 # opentelemetry-sdk-extension-aws opentelemetry-sdk-extension-aws==2.1.0 # via elastic-opentelemetry (pyproject.toml) -opentelemetry-semantic-conventions==0.64b0 +opentelemetry-semantic-conventions==0.65b0 # via # elastic-opentelemetry (pyproject.toml) # opentelemetry-instrumentation @@ -113,7 +113,7 @@ protobuf==6.33.6 # oteltest psutil==7.2.2 # via opentelemetry-instrumentation-system-metrics -pygments==2.20.0 +pygments==2.21.0 # via pytest pyproject-hooks==1.2.0 # via diff --git a/docs/reference/edot-python/supported-technologies.md b/docs/reference/edot-python/supported-technologies.md index e1d4b8a7..d4cf141e 100644 --- a/docs/reference/edot-python/supported-technologies.md +++ b/docs/reference/edot-python/supported-technologies.md @@ -65,26 +65,26 @@ Instrumentations are not installed by default. Use the [edot-bootstrap](/referen | [opentelemetry-instrumentation-aiohttp-client](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiohttp-client) | `aiohttp ~= 3.0` | migration | `opentelemetry.instrumentation.aiohttp_client` | | [opentelemetry-instrumentation-aiohttp-server](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiohttp-server) | `aiohttp ~= 3.0` | migration | `opentelemetry.instrumentation.aiohttp_server` | | [opentelemetry-instrumentation-aiokafka](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiokafka) | `aiokafka >= 0.8, < 1.0` | development | `opentelemetry.instrumentation.aiokafka` | -| [opentelemetry-instrumentation-aiopg](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiopg) | `aiopg >= 0.13.0, < 2.0.0` | development | `opentelemetry.instrumentation.aiopg` | +| [opentelemetry-instrumentation-aiopg](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiopg) | `aiopg >= 0.13.0, < 2.0.0` | migration | `opentelemetry.instrumentation.aiopg` | | [opentelemetry-instrumentation-asgi](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-asgi) | `asgiref ~= 3.0` | migration | `opentelemetry.instrumentation.asgi` | | [opentelemetry-instrumentation-asyncclick](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-asyncclick) | `asyncclick ~= 8.0` | development | `opentelemetry.instrumentation.asyncclick` | | [opentelemetry-instrumentation-asyncio](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-asyncio) | `asyncio` | development | `opentelemetry.instrumentation.asyncio` | -| [opentelemetry-instrumentation-asyncpg](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-asyncpg) | `asyncpg >= 0.12.0` | development | `opentelemetry.instrumentation.asyncpg` | +| [opentelemetry-instrumentation-asyncpg](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-asyncpg) | `asyncpg >= 0.12.0` | migration | `opentelemetry.instrumentation.asyncpg` | | [opentelemetry-instrumentation-aws-lambda](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aws-lambda) | | development | `opentelemetry.instrumentation.aws_lambda` | | [opentelemetry-instrumentation-boto3sqs](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-boto3sqs) | `boto3 ~= 1.0` | development | `opentelemetry.instrumentation.boto3sqs` | -| [opentelemetry-instrumentation-botocore](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-botocore) | `botocore ~= 1.0, aiobotocore ~=2.0` | development | `opentelemetry.instrumentation.botocore`, `opentelemetry.instrumentation.botocore.bedrock-runtime`, `opentelemetry.instrumentation.botocore.dynamodb`, `opentelemetry.instrumentation.botocore.lambda`, `opentelemetry.instrumentation.botocore.secreatsmanager`, `opentelemetry.instrumentation.botocore.stepfunctions`, `opentelemetry.instrumentation.botocore.sns`, `opentelemetry.instrumentation.botocore.sqs` | -| [opentelemetry-instrumentation-cassandra](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-cassandra) | `cassandra-driver ~= 3.25`,`scylla-driver ~= 3.25` | development | `opentelemetry.instrumentation.cassandra` | +| [opentelemetry-instrumentation-botocore](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-botocore) | `botocore ~= 1.0, aiobotocore >=2.0,<4.0` | development | `opentelemetry.instrumentation.botocore`, `opentelemetry.instrumentation.botocore.bedrock-runtime`, `opentelemetry.instrumentation.botocore.dynamodb`, `opentelemetry.instrumentation.botocore.lambda`, `opentelemetry.instrumentation.botocore.secreatsmanager`, `opentelemetry.instrumentation.botocore.stepfunctions`, `opentelemetry.instrumentation.botocore.sns`, `opentelemetry.instrumentation.botocore.sqs` | +| [opentelemetry-instrumentation-cassandra](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-cassandra) | `cassandra-driver ~= 3.25`,`scylla-driver ~= 3.25` | migration | `opentelemetry.instrumentation.cassandra` | | [opentelemetry-instrumentation-celery](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-celery) | `celery >= 4.0, < 6.0` | development | `opentelemetry.instrumentation.celery` | | [opentelemetry-instrumentation-click](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-click) | `click >= 8.1.3, < 9.0.0` | development | `opentelemetry.instrumentation.click` | | [opentelemetry-instrumentation-confluent-kafka](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-confluent-kafka) | `confluent-kafka >= 1.8.2, < 3.0.0` | development | `opentelemetry.instrumentation.confluent_kafka` | | [opentelemetry-instrumentation-dbapi](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-dbapi) | `dbapi` | migration | | | [opentelemetry-instrumentation-django](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-django) | `django >= 2.0` | development | `opentelemetry.instrumentation.django` | -| [opentelemetry-instrumentation-elasticsearch](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-elasticsearch) | `elasticsearch >= 6.0, < 8.13` | development | `opentelemetry.instrumentation.elasticsearch` | +| [opentelemetry-instrumentation-exceptions](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-exceptions) | `exceptions` | development | | | [opentelemetry-instrumentation-falcon](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-falcon) | `falcon >= 1.4.1, < 5.0.0` | migration | `opentelemetry.instrumentation.falcon` | | [opentelemetry-instrumentation-fastapi](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-fastapi) | `fastapi ~= 0.92` | migration | `opentelemetry.instrumentation.fastapi` | | [opentelemetry-instrumentation-flask](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-flask) | `flask >= 1.0` | migration | `opentelemetry.instrumentation.flask` | | [opentelemetry-instrumentation-grpc](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc) | `grpcio >= 1.42.0` | development | `opentelemetry.instrumentation.grpc` | -| [opentelemetry-instrumentation-httpx](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-httpx) | `httpx >= 0.18.0` | migration | `opentelemetry.instrumentation.httpx` | +| [opentelemetry-instrumentation-httpx](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-httpx) | `httpx >= 0.18.0,httpx2 >= 2.0.0` | migration | `opentelemetry.instrumentation.httpx` | | [opentelemetry-instrumentation-jinja2](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-jinja2) | `jinja2 >= 2.7, < 4.0` | development | `opentelemetry.instrumentation.jinja2` | | [opentelemetry-instrumentation-kafka-python](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-kafka-python) | `kafka-python >= 2.0, < 3.0`,`kafka-python-ng >= 2.0, < 3.0` | development | `opentelemetry.instrumentation.kafka` | | [opentelemetry-instrumentation-logging](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-logging) | `logging` | development | | @@ -93,8 +93,8 @@ Instrumentations are not installed by default. Use the [edot-bootstrap](/referen | [opentelemetry-instrumentation-pika](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pika) | `pika >= 0.12.0` | development | `opentelemetry.instrumentation.pika.pika_instrumentor` | | [opentelemetry-instrumentation-psycopg](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-psycopg) | `psycopg >= 3.1.0` | migration | `opentelemetry.instrumentation.psycopg` | | [opentelemetry-instrumentation-psycopg2](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-psycopg2) | `psycopg2 >= 2.7.3.1`,`psycopg2-binary >= 2.7.3.1` | migration | `opentelemetry.instrumentation.psycopg2` | -| [opentelemetry-instrumentation-pymemcache](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pymemcache) | `pymemcache >= 1.3.5, < 5` | development | `opentelemetry.instrumentation.pymemcache` | -| [opentelemetry-instrumentation-pymongo](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pymongo) | `pymongo >= 3.1, < 5.0` | development | `opentelemetry.instrumentation.pymongo` | +| [opentelemetry-instrumentation-pymemcache](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pymemcache) | `pymemcache >= 1.3.5, < 5` | migration | `opentelemetry.instrumentation.pymemcache` | +| [opentelemetry-instrumentation-pymongo](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pymongo) | `pymongo >= 3.1, < 5.0` | migration | `opentelemetry.instrumentation.pymongo` | | [opentelemetry-instrumentation-pymssql](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pymssql) | `pymssql >= 2.1.5, < 3` | migration | `opentelemetry.instrumentation.pymssql` | | [opentelemetry-instrumentation-pymysql](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pymysql) | `PyMySQL < 2` | migration | `opentelemetry.instrumentation.pymsql` | | [opentelemetry-instrumentation-pyramid](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pyramid) | `pyramid >= 1.7` | migration | `opentelemetry.instrumentation.pyramid.callbacks` | @@ -104,10 +104,11 @@ Instrumentations are not installed by default. Use the [edot-bootstrap](/referen | [opentelemetry-instrumentation-sqlalchemy](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-sqlalchemy) | `sqlalchemy >= 1.0.0, < 2.1.0` | migration | `opentelemetry.instrumentation.sqlalchemy` | | [opentelemetry-instrumentation-sqlite3](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-sqlite3) | `sqlite3` | migration | `opentelemetry.instrumentation.sqlite3` | | [opentelemetry-instrumentation-starlette](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-starlette) | `starlette >= 0.13` | development | `opentelemetry.instrumentation.starlette` | +| [opentelemetry-instrumentation-structlog](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-structlog) | `structlog >= 21.1` | development | | | [opentelemetry-instrumentation-system-metrics](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-system-metrics) | `psutil >= 5` | development | | | [opentelemetry-instrumentation-threading](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-threading) | `threading` | development | | | [opentelemetry-instrumentation-tornado](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-tornado) | `tornado >= 5.1.1` | migration | `opentelemetry.instrumentation.tornado` | -| [opentelemetry-instrumentation-tortoiseorm](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-tortoiseorm) | `tortoise-orm >= 0.17.0` | development | `opentelemetry.instrumentation.tortoiseorm` | +| [opentelemetry-instrumentation-tortoiseorm](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-tortoiseorm) | `tortoise-orm >= 0.17.0` | migration | `opentelemetry.instrumentation.tortoiseorm` | | [opentelemetry-instrumentation-urllib](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-urllib) | `urllib` | migration | `opentelemetry.instrumentation.urllib` | | [opentelemetry-instrumentation-urllib3](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-urllib3) | `urllib3 >= 1.0.0, < 3.0.0` | migration | `opentelemetry.instrumentation.urllib3` | | [opentelemetry-instrumentation-vertexai](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation-genai/opentelemetry-instrumentation-vertexai) | `google-cloud-aiplatform >= 1.64` | development | `opentelemetry.instrumentation.vertexai` | diff --git a/operator/requirements.txt b/operator/requirements.txt index ce28b89b..c046972d 100644 --- a/operator/requirements.txt +++ b/operator/requirements.txt @@ -1,59 +1,59 @@ -opentelemetry-exporter-prometheus==0.64b0 +opentelemetry-exporter-prometheus==0.65b0 opentelemetry-propagator-aws-xray==1.0.2 -opentelemetry-propagator-b3==1.43.0 -opentelemetry-propagator-jaeger==1.43.0 -opentelemetry-propagator-ot-trace==0.64b0 +opentelemetry-propagator-b3==1.44.0 +opentelemetry-propagator-jaeger==1.44.0 +opentelemetry-propagator-ot-trace==0.65b0 -opentelemetry-instrumentation-aio-pika==0.64b0 -opentelemetry-instrumentation-aiohttp-client==0.64b0 -opentelemetry-instrumentation-aiohttp-server==0.64b0 -opentelemetry-instrumentation-aiokafka==0.64b0 -opentelemetry-instrumentation-aiopg==0.64b0 -opentelemetry-instrumentation-asgi==0.64b0 -opentelemetry-instrumentation-asyncclick==0.64b0 -opentelemetry-instrumentation-asyncio==0.64b0 -opentelemetry-instrumentation-asyncpg==0.64b0 -opentelemetry-instrumentation-boto3sqs==0.64b0 -opentelemetry-instrumentation-botocore==0.64b0 -opentelemetry-instrumentation-cassandra==0.64b0 -opentelemetry-instrumentation-celery==0.64b0 -opentelemetry-instrumentation-click==0.64b0 -opentelemetry-instrumentation-confluent-kafka==0.64b0 -opentelemetry-instrumentation-dbapi==0.64b0 -opentelemetry-instrumentation-django==0.64b0 -opentelemetry-instrumentation-elasticsearch==0.64b0 -opentelemetry-instrumentation-exceptions==0.64b0 -opentelemetry-instrumentation-falcon==0.64b0 -opentelemetry-instrumentation-fastapi==0.64b0 -opentelemetry-instrumentation-flask==0.64b0 -opentelemetry-instrumentation-grpc==0.64b0 -opentelemetry-instrumentation-httpx==0.64b0 -opentelemetry-instrumentation-jinja2==0.64b0 -opentelemetry-instrumentation-kafka-python==0.64b0 -opentelemetry-instrumentation-logging==0.64b0 -opentelemetry-instrumentation-mysql==0.64b0 -opentelemetry-instrumentation-mysqlclient==0.64b0 -opentelemetry-instrumentation-pika==0.64b0 -opentelemetry-instrumentation-psycopg==0.64b0 -opentelemetry-instrumentation-psycopg2==0.64b0 -opentelemetry-instrumentation-pymemcache==0.64b0 -opentelemetry-instrumentation-pymongo==0.64b0 -opentelemetry-instrumentation-pymssql==0.64b0 -opentelemetry-instrumentation-pymysql==0.64b0 -opentelemetry-instrumentation-pyramid==0.64b0 -opentelemetry-instrumentation-redis==0.64b0 -opentelemetry-instrumentation-remoulade==0.64b0 -opentelemetry-instrumentation-requests==0.64b0 -opentelemetry-instrumentation-sqlalchemy==0.64b0 -opentelemetry-instrumentation-sqlite3==0.64b0 -opentelemetry-instrumentation-starlette==0.64b0 -opentelemetry-instrumentation-system-metrics==0.64b0 -opentelemetry-instrumentation-threading==0.64b0 -opentelemetry-instrumentation-tornado==0.64b0 -opentelemetry-instrumentation-tortoiseorm==0.64b0 -opentelemetry-instrumentation-urllib==0.64b0 -opentelemetry-instrumentation-urllib3==0.64b0 -opentelemetry-instrumentation-wsgi==0.64b0 +opentelemetry-instrumentation-aio-pika==0.65b0 +opentelemetry-instrumentation-aiohttp-client==0.65b0 +opentelemetry-instrumentation-aiohttp-server==0.65b0 +opentelemetry-instrumentation-aiokafka==0.65b0 +opentelemetry-instrumentation-aiopg==0.65b0 +opentelemetry-instrumentation-asgi==0.65b0 +opentelemetry-instrumentation-asyncclick==0.65b0 +opentelemetry-instrumentation-asyncio==0.65b0 +opentelemetry-instrumentation-asyncpg==0.65b0 +opentelemetry-instrumentation-boto3sqs==0.65b0 +opentelemetry-instrumentation-botocore==0.65b0 +opentelemetry-instrumentation-cassandra==0.65b0 +opentelemetry-instrumentation-celery==0.65b0 +opentelemetry-instrumentation-click==0.65b0 +opentelemetry-instrumentation-confluent-kafka==0.65b0 +opentelemetry-instrumentation-dbapi==0.65b0 +opentelemetry-instrumentation-django==0.65b0 +opentelemetry-instrumentation-exceptions==0.65b0 +opentelemetry-instrumentation-falcon==0.65b0 +opentelemetry-instrumentation-fastapi==0.65b0 +opentelemetry-instrumentation-flask==0.65b0 +opentelemetry-instrumentation-grpc==0.65b0 +opentelemetry-instrumentation-httpx==0.65b0 +opentelemetry-instrumentation-jinja2==0.65b0 +opentelemetry-instrumentation-kafka-python==0.65b0 +opentelemetry-instrumentation-logging==0.65b0 +opentelemetry-instrumentation-mysql==0.65b0 +opentelemetry-instrumentation-mysqlclient==0.65b0 +opentelemetry-instrumentation-pika==0.65b0 +opentelemetry-instrumentation-psycopg==0.65b0 +opentelemetry-instrumentation-psycopg2==0.65b0 +opentelemetry-instrumentation-pymemcache==0.65b0 +opentelemetry-instrumentation-pymongo==0.65b0 +opentelemetry-instrumentation-pymssql==0.65b0 +opentelemetry-instrumentation-pymysql==0.65b0 +opentelemetry-instrumentation-pyramid==0.65b0 +opentelemetry-instrumentation-redis==0.65b0 +opentelemetry-instrumentation-remoulade==0.65b0 +opentelemetry-instrumentation-requests==0.65b0 +opentelemetry-instrumentation-sqlalchemy==0.65b0 +opentelemetry-instrumentation-sqlite3==0.65b0 +opentelemetry-instrumentation-starlette==0.65b0 +opentelemetry-instrumentation-structlog==0.65b0 +opentelemetry-instrumentation-system-metrics==0.65b0 +opentelemetry-instrumentation-threading==0.65b0 +opentelemetry-instrumentation-tornado==0.65b0 +opentelemetry-instrumentation-tortoiseorm==0.65b0 +opentelemetry-instrumentation-urllib==0.65b0 +opentelemetry-instrumentation-urllib3==0.65b0 +opentelemetry-instrumentation-wsgi==0.65b0 elastic-opentelemetry-instrumentation-openai==1.2.0 diff --git a/pyproject.toml b/pyproject.toml index 1f5b47c2..771d8182 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,16 +26,16 @@ classifiers = [ ] dependencies = [ - "opentelemetry-api == 1.43.0", - "opentelemetry-exporter-otlp == 1.43.0", - "opentelemetry-instrumentation == 0.64b0", - "opentelemetry-instrumentation-system-metrics == 0.64b0", + "opentelemetry-api == 1.44.0", + "opentelemetry-exporter-otlp == 1.44.0", + "opentelemetry-instrumentation == 0.65b0", + "opentelemetry-instrumentation-system-metrics == 0.65b0", "opentelemetry-resourcedetector-gcp ~= 1.14.0a0", "opentelemetry-resource-detector-azure ~= 0.1.5", - "opentelemetry-resource-detector-containerid == 0.64b0", - "opentelemetry-sdk == 1.43.0", + "opentelemetry-resource-detector-containerid == 0.65b0", + "opentelemetry-sdk == 1.44.0", "opentelemetry-sdk-extension-aws ~= 2.1.0", - "opentelemetry-semantic-conventions == 0.64b0", + "opentelemetry-semantic-conventions == 0.65b0", "opentelemetry-opamp-client == 0.3b0", "packaging", "uuid-utils", diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 7db49c6a..4730d5ac 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -197,34 +197,19 @@ def test_metrics_with_sdk_metrics(self): ], ) - def test_log_events_are_sent(self): - def send_event(): - from opentelemetry._events import Event, get_event_logger - - event = Event(name="test.event", attributes={}, body={"key": "value", "dict": {"nestedkey": "nestedvalue"}}) - event_logger = get_event_logger(__name__) - event_logger.emit(event) - - stdout, stderr, returncode = self.run_script(send_event, wrapper_script="opentelemetry-instrument") - - telemetry = self.get_telemetry() - (log,) = telemetry["logs"] - self.assertEqual(log["attributes"]["event.name"], "test.event") - self.assertEqual(log["body"], {"key": "value", "dict": {"nestedkey": "nestedvalue"}}) - def test_edot_user_agent_is_used_in_otlp_grpc_exporter(self): def test_script(): import sqlite3 - from opentelemetry._events import Event, get_event_logger + from opentelemetry._logs import LogRecord, get_logger connection = sqlite3.connect(":memory:") cursor = connection.cursor() cursor.execute("CREATE TABLE movie(title, year, score)") - event = Event(name="test.event", attributes={}, body={"key": "value"}) - event_logger = get_event_logger(__name__) - event_logger.emit(event) + log_record = LogRecord(body={"key": "value"}) + logger = get_logger(__name__) + logger.emit(log_record) stdout, stderr, returncode = self.run_script(test_script, wrapper_script="opentelemetry-instrument") @@ -246,11 +231,11 @@ def test_script(): def test_opamp_client_requests_are_not_instrumented(self): def test_script(): - from opentelemetry._events import Event, get_event_logger + from opentelemetry._logs import LogRecord, get_logger - event = Event(name="test.event", attributes={}, body={"key": "value"}) - event_logger = get_event_logger(__name__) - event_logger.emit(event) + log_record = LogRecord(body={"key": "value"}) + logger = get_logger(__name__) + logger.emit(log_record) env = {"ELASTIC_OTEL_OPAMP_ENDPOINT": "https://httpbin.org/"} stdout, stderr, returncode = self.run_script( @@ -286,15 +271,15 @@ def test_edot_user_agent_is_used_in_otlp_http_exporter(self): def test_script(): import sqlite3 - from opentelemetry._events import Event, get_event_logger + from opentelemetry._logs import LogRecord, get_logger connection = sqlite3.connect(":memory:") cursor = connection.cursor() cursor.execute("CREATE TABLE movie(title, year, score)") - event = Event(name="test.event", attributes={}, body={"key": "value"}) - event_logger = get_event_logger(__name__) - event_logger.emit(event) + log_record = LogRecord(body={"key": "value"}) + logger = get_logger(__name__) + logger.emit(log_record) stdout, stderr, returncode = self.run_script(test_script, wrapper_script="opentelemetry-instrument") diff --git a/tests/integration/utils.py b/tests/integration/utils.py index 98d4512e..f54687a6 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -204,7 +204,8 @@ def normalize_kvlist(body) -> dict: for proto_scope_logs in resource_log["scopeLogs"]: for proto_log in proto_scope_logs["logRecords"]: log = proto_log.copy() - log["attributes"] = normalize_attributes(log["attributes"]) + if "attributes" in log: + log["attributes"] = normalize_attributes(log["attributes"]) log["body"] = normalize_kvlist(log["body"]) log["resource"] = resource_attributes logs.append(log)