Skip to content

Commit c48cb77

Browse files
tammy-baylis-switammy-baylis-swi
authored
Merge pull request #644 from solarwinds/NH-107537-otel-1_33_1
NH-107537 Upgrade to Otel Python 1.33.1/0.54b1
2 parents 059463f + 6e4966b commit c48cb77

7 files changed

Lines changed: 101 additions & 101 deletions

File tree

‎dev-requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
opentelemetry-test-utils==0.52b1
2-
opentelemetry-instrumentation-flask==0.52b1
3-
opentelemetry-instrumentation-requests==0.52b1
1+
opentelemetry-test-utils==0.54b1
2+
opentelemetry-instrumentation-flask==0.54b1
3+
opentelemetry-instrumentation-requests==0.54b1
44
pytest
55
pytest-cov
66
pytest-mock

‎image/requirements.txt‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
# Install most APM Python deps
2-
opentelemetry-api==1.31.1
3-
opentelemetry-sdk==1.31.1
4-
opentelemetry-instrumentation==0.52b1
2+
opentelemetry-api==1.33.1
3+
opentelemetry-sdk==1.33.1
4+
opentelemetry-instrumentation==0.54b1
55

66
# We add a cap to urllib3 version else Python 3.8 support is dropped.
77
# TODO: Update autoinstrumentation image builds to support all supported Python versions
88
# https://github.com/open-telemetry/opentelemetry-operator/issues/3712
99
urllib3 < 2.3.0
1010
# We don't use the otlp_proto_grpc option since gRPC is not appropriate for
1111
# injected auto-instrumentation, where it has a strict dependency on the OS / Python version the artifact is built for.
12-
opentelemetry-exporter-otlp-proto-http==1.31.1
13-
opentelemetry-exporter-prometheus==0.52b1
12+
opentelemetry-exporter-otlp-proto-http==1.33.1
13+
opentelemetry-exporter-prometheus==0.54b1
1414

15-
opentelemetry-propagator-b3==1.31.1
16-
opentelemetry-propagator-jaeger==1.31.1
15+
opentelemetry-propagator-b3==1.33.1
16+
opentelemetry-propagator-jaeger==1.33.1
1717
opentelemetry-propagator-aws-xray==1.0.2
1818

19-
opentelemetry-propagator-ot-trace==0.52b1
19+
opentelemetry-propagator-ot-trace==0.54b1
2020

2121
# Copied in from https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation
22-
opentelemetry-instrumentation-aio-pika==0.52b1
23-
opentelemetry-instrumentation-aiohttp-client==0.52b1
24-
opentelemetry-instrumentation-aiohttp-server==0.52b1
25-
opentelemetry-instrumentation-aiokafka==0.52b1
26-
opentelemetry-instrumentation-aiopg==0.52b1
27-
opentelemetry-instrumentation-asgi==0.52b1
28-
opentelemetry-instrumentation-asyncio==0.52b1
29-
opentelemetry-instrumentation-asyncpg==0.52b1
30-
opentelemetry-instrumentation-aws-lambda==0.52b1
31-
opentelemetry-instrumentation-boto==0.52b1
32-
opentelemetry-instrumentation-boto3sqs==0.52b1
33-
opentelemetry-instrumentation-botocore==0.52b1
34-
opentelemetry-instrumentation-cassandra==0.52b1
35-
opentelemetry-instrumentation-celery==0.52b1
36-
opentelemetry-instrumentation-click==0.52b1
37-
opentelemetry-instrumentation-confluent-kafka==0.52b1
38-
opentelemetry-instrumentation-dbapi==0.52b1
39-
opentelemetry-instrumentation-django==0.52b1
40-
opentelemetry-instrumentation-elasticsearch==0.52b1
41-
opentelemetry-instrumentation-falcon==0.52b1
42-
opentelemetry-instrumentation-fastapi==0.52b1
43-
opentelemetry-instrumentation-flask==0.52b1
44-
opentelemetry-instrumentation-grpc==0.52b1
45-
opentelemetry-instrumentation-httpx==0.52b1
46-
opentelemetry-instrumentation-jinja2==0.52b1
47-
opentelemetry-instrumentation-kafka-python==0.52b1
48-
opentelemetry-instrumentation-logging==0.52b1
49-
opentelemetry-instrumentation-mysql==0.52b1
50-
opentelemetry-instrumentation-mysqlclient==0.52b1
51-
opentelemetry-instrumentation-pika==0.52b1
52-
opentelemetry-instrumentation-psycopg==0.52b1
53-
opentelemetry-instrumentation-psycopg2==0.52b1
54-
opentelemetry-instrumentation-pymemcache==0.52b1
55-
opentelemetry-instrumentation-pymongo==0.52b1
56-
opentelemetry-instrumentation-pymysql==0.52b1
57-
opentelemetry-instrumentation-pyramid==0.52b1
58-
opentelemetry-instrumentation-redis==0.52b1
59-
opentelemetry-instrumentation-remoulade==0.52b1
60-
opentelemetry-instrumentation-requests==0.52b1
61-
opentelemetry-instrumentation-sqlalchemy==0.52b1
62-
opentelemetry-instrumentation-sqlite3==0.52b1
63-
opentelemetry-instrumentation-starlette==0.52b1
64-
opentelemetry-instrumentation-threading==0.52b1
65-
opentelemetry-instrumentation-tornado==0.52b1
66-
opentelemetry-instrumentation-tortoiseorm==0.52b1
67-
opentelemetry-instrumentation-urllib==0.52b1
68-
opentelemetry-instrumentation-urllib3==0.52b1
69-
opentelemetry-instrumentation-wsgi==0.52b1
22+
opentelemetry-instrumentation-aio-pika==0.54b1
23+
opentelemetry-instrumentation-aiohttp-client==0.54b1
24+
opentelemetry-instrumentation-aiohttp-server==0.54b1
25+
opentelemetry-instrumentation-aiokafka==0.54b1
26+
opentelemetry-instrumentation-aiopg==0.54b1
27+
opentelemetry-instrumentation-asgi==0.54b1
28+
opentelemetry-instrumentation-asyncio==0.54b1
29+
opentelemetry-instrumentation-asyncpg==0.54b1
30+
opentelemetry-instrumentation-aws-lambda==0.54b1
31+
opentelemetry-instrumentation-boto==0.54b1
32+
opentelemetry-instrumentation-boto3sqs==0.54b1
33+
opentelemetry-instrumentation-botocore==0.54b1
34+
opentelemetry-instrumentation-cassandra==0.54b1
35+
opentelemetry-instrumentation-celery==0.54b1
36+
opentelemetry-instrumentation-click==0.54b1
37+
opentelemetry-instrumentation-confluent-kafka==0.54b1
38+
opentelemetry-instrumentation-dbapi==0.54b1
39+
opentelemetry-instrumentation-django==0.54b1
40+
opentelemetry-instrumentation-elasticsearch==0.54b1
41+
opentelemetry-instrumentation-falcon==0.54b1
42+
opentelemetry-instrumentation-fastapi==0.54b1
43+
opentelemetry-instrumentation-flask==0.54b1
44+
opentelemetry-instrumentation-grpc==0.54b1
45+
opentelemetry-instrumentation-httpx==0.54b1
46+
opentelemetry-instrumentation-jinja2==0.54b1
47+
opentelemetry-instrumentation-kafka-python==0.54b1
48+
opentelemetry-instrumentation-logging==0.54b1
49+
opentelemetry-instrumentation-mysql==0.54b1
50+
opentelemetry-instrumentation-mysqlclient==0.54b1
51+
opentelemetry-instrumentation-pika==0.54b1
52+
opentelemetry-instrumentation-psycopg==0.54b1
53+
opentelemetry-instrumentation-psycopg2==0.54b1
54+
opentelemetry-instrumentation-pymemcache==0.54b1
55+
opentelemetry-instrumentation-pymongo==0.54b1
56+
opentelemetry-instrumentation-pymysql==0.54b1
57+
opentelemetry-instrumentation-pyramid==0.54b1
58+
opentelemetry-instrumentation-redis==0.54b1
59+
opentelemetry-instrumentation-remoulade==0.54b1
60+
opentelemetry-instrumentation-requests==0.54b1
61+
opentelemetry-instrumentation-sqlalchemy==0.54b1
62+
opentelemetry-instrumentation-sqlite3==0.54b1
63+
opentelemetry-instrumentation-starlette==0.54b1
64+
opentelemetry-instrumentation-threading==0.54b1
65+
opentelemetry-instrumentation-tornado==0.54b1
66+
opentelemetry-instrumentation-tortoiseorm==0.54b1
67+
opentelemetry-instrumentation-urllib==0.54b1
68+
opentelemetry-instrumentation-urllib3==0.54b1
69+
opentelemetry-instrumentation-wsgi==0.54b1

‎lambda/requirements-nodeps.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of
22
# opentelemetry-propagator-aws-xray
3-
opentelemetry-instrumentation-aws-lambda==0.52b1
4-
opentelemetry-instrumentation-botocore==0.52b1
3+
opentelemetry-instrumentation-aws-lambda==0.54b1
4+
opentelemetry-instrumentation-botocore==0.54b1

‎lambda/requirements.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
opentelemetry-sdk==1.31.1
2-
opentelemetry-exporter-otlp-proto-http==1.31.1
1+
opentelemetry-sdk==1.33.1
2+
opentelemetry-exporter-otlp-proto-http==1.33.1
33
# Exclude default opentelemetry-distro
4-
opentelemetry-instrumentation==0.52b1
5-
opentelemetry-semantic-conventions==0.52b1
4+
opentelemetry-instrumentation==0.54b1
5+
opentelemetry-semantic-conventions==0.54b1
66
opentelemetry-propagator-aws-xray==1.0.2
77

88
# Instrumentation dependencies
9-
opentelemetry-instrumentation-aiohttp-client==0.52b1
10-
opentelemetry-util-http==0.52b1
11-
opentelemetry-instrumentation-asgi==0.52b1
12-
opentelemetry-instrumentation-asyncpg==0.52b1
13-
opentelemetry-instrumentation-boto==0.52b1
14-
opentelemetry-instrumentation-boto3sqs==0.52b1
15-
opentelemetry-instrumentation-celery==0.52b1
16-
opentelemetry-instrumentation-dbapi==0.52b1
17-
opentelemetry-instrumentation-django==0.52b1
18-
opentelemetry-instrumentation-elasticsearch==0.52b1
19-
opentelemetry-instrumentation-fastapi==0.52b1
20-
opentelemetry-instrumentation-falcon==0.52b1
21-
opentelemetry-instrumentation-flask==0.52b1
22-
opentelemetry-instrumentation-jinja2==0.52b1
23-
opentelemetry-instrumentation-mysql==0.52b1
24-
opentelemetry-instrumentation-psycopg2==0.52b1
25-
opentelemetry-instrumentation-pymemcache==0.52b1
26-
opentelemetry-instrumentation-pymongo==0.52b1
27-
opentelemetry-instrumentation-pymysql==0.52b1
28-
opentelemetry-instrumentation-pyramid==0.52b1
29-
opentelemetry-instrumentation-redis==0.52b1
30-
opentelemetry-instrumentation-requests==0.52b1
31-
opentelemetry-instrumentation-sqlalchemy==0.52b1
32-
opentelemetry-instrumentation-sqlite3==0.52b1
33-
opentelemetry-instrumentation-starlette==0.52b1
34-
opentelemetry-instrumentation-tornado==0.52b1
35-
opentelemetry-instrumentation-wsgi==0.52b1
9+
opentelemetry-instrumentation-aiohttp-client==0.54b1
10+
opentelemetry-util-http==0.54b1
11+
opentelemetry-instrumentation-asgi==0.54b1
12+
opentelemetry-instrumentation-asyncpg==0.54b1
13+
opentelemetry-instrumentation-boto==0.54b1
14+
opentelemetry-instrumentation-boto3sqs==0.54b1
15+
opentelemetry-instrumentation-celery==0.54b1
16+
opentelemetry-instrumentation-dbapi==0.54b1
17+
opentelemetry-instrumentation-django==0.54b1
18+
opentelemetry-instrumentation-elasticsearch==0.54b1
19+
opentelemetry-instrumentation-fastapi==0.54b1
20+
opentelemetry-instrumentation-falcon==0.54b1
21+
opentelemetry-instrumentation-flask==0.54b1
22+
opentelemetry-instrumentation-jinja2==0.54b1
23+
opentelemetry-instrumentation-mysql==0.54b1
24+
opentelemetry-instrumentation-psycopg2==0.54b1
25+
opentelemetry-instrumentation-pymemcache==0.54b1
26+
opentelemetry-instrumentation-pymongo==0.54b1
27+
opentelemetry-instrumentation-pymysql==0.54b1
28+
opentelemetry-instrumentation-pyramid==0.54b1
29+
opentelemetry-instrumentation-redis==0.54b1
30+
opentelemetry-instrumentation-requests==0.54b1
31+
opentelemetry-instrumentation-sqlalchemy==0.54b1
32+
opentelemetry-instrumentation-sqlite3==0.54b1
33+
opentelemetry-instrumentation-starlette==0.54b1
34+
opentelemetry-instrumentation-tornado==0.54b1
35+
opentelemetry-instrumentation-wsgi==0.54b1
3636

3737
# Additional APM dependencies
38-
opentelemetry-instrumentation-botocore==0.52b1
39-
opentelemetry-instrumentation-logging==0.52b1
38+
opentelemetry-instrumentation-botocore==0.54b1
39+
opentelemetry-instrumentation-logging==0.54b1
4040
opentelemetry-sdk-extension-aws == 2.1.0

‎lambda/tests/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
opentelemetry-instrumentation-aws-lambda == 0.52b1
1+
opentelemetry-instrumentation-aws-lambda == 0.54b1
22
opentelemetry-propagator-aws-xray == 1.0.2

‎pyproject.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ classifiers = [
4141
]
4242
requires-python = ">=3.8"
4343
dependencies = [
44-
'opentelemetry-api == 1.31.1',
45-
'opentelemetry-sdk == 1.31.1',
46-
'opentelemetry-exporter-otlp == 1.31.1',
47-
'opentelemetry-instrumentation == 0.52b1',
48-
'opentelemetry-instrumentation-logging == 0.52b1',
44+
'opentelemetry-api == 1.33.1',
45+
'opentelemetry-sdk == 1.33.1',
46+
'opentelemetry-exporter-otlp == 1.33.1',
47+
'opentelemetry-instrumentation == 0.54b1',
48+
'opentelemetry-instrumentation-logging == 0.54b1',
4949
'opentelemetry-sdk-extension-aws == 2.1.0',
5050
'opentelemetry-resource-detector-azure == 0.1.5',
5151
]

‎solarwinds_apm/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "4.1.0.0"
1+
__version__ = "4.1.0.1"

0 commit comments

Comments
 (0)