Skip to content

Commit ffed161

Browse files
harrryrharrryr
authored
Merge branch 'main' into update-dockerfile-with-scratch
2 parents e3892f7 + e36d32e commit ffed161

File tree

12 files changed

+74
-74
lines changed

12 files changed

+74
-74
lines changed

‎.github/dependency-check-suppressions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
33
<!--False positive: opentelemetry-exporter-otlp-proto-grpc incorrectly maps to grpc-->
44
<suppress>
5-
<notes><![CDATA[file name: opentelemetry-exporter-otlp-proto-grpc:1.22.0]]></notes>
5+
<notes><![CDATA[file name: opentelemetry-exporter-otlp-proto-grpc:1.25.0]]></notes>
66
<packageUrl regex="true">^pkg:pypi/opentelemetry\-exporter\-otlp\-proto\-grpc@.*$</packageUrl>
77
<cpe>cpe:/a:grpc:grpc</cpe>
88
</suppress>

‎THIRD-PARTY-LICENSES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
** opentelemetry-python; version 0.43b0 -- https://github.com/open-telemetry/opentelemetry-python
3+
** opentelemetry-python; version 1.22.0 -- https://github.com/open-telemetry/opentelemetry-python
44
** opentelemetry-python-contrib; version 0.43b0 -- https://github.com/open-telemetry/opentelemetry-python-contrib
55

66
Apache License

‎aws-opentelemetry-distro/pyproject.toml

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -25,62 +25,62 @@ classifiers = [
2525
]
2626

2727
dependencies = [
28-
"opentelemetry-api == 1.22.0",
29-
"opentelemetry-instrumentation == 0.43b0",
30-
"opentelemetry-sdk == 1.22.0",
31-
"opentelemetry-distro == 0.43b0",
28+
"opentelemetry-api == 1.25.0",
29+
"opentelemetry-sdk == 1.25.0",
30+
"opentelemetry-exporter-otlp-proto-grpc == 1.25.0",
31+
"opentelemetry-exporter-otlp-proto-http == 1.25.0",
32+
"opentelemetry-propagator-b3 == 1.25.0",
33+
"opentelemetry-propagator-jaeger == 1.25.0",
34+
"opentelemetry-exporter-otlp-proto-common == 1.25.0",
3235
"opentelemetry-sdk-extension-aws == 2.0.1",
33-
"opentelemetry-exporter-otlp-proto-grpc == 1.22.0",
34-
"opentelemetry-exporter-otlp-proto-http == 1.22.0",
35-
"opentelemetry-propagator-b3 == 1.22.0",
36-
"opentelemetry-propagator-jaeger == 1.22.0",
37-
"opentelemetry-instrumentation-aws-lambda == 0.43b0",
3836
"opentelemetry-propagator-aws-xray == 1.0.1",
39-
"opentelemetry-propagator-ot-trace == 0.43b0",
40-
"opentelemetry-exporter-otlp-proto-common == 1.22.0",
41-
"opentelemetry-instrumentation-aio-pika == 0.43b0",
42-
"opentelemetry-instrumentation-aiohttp-client == 0.43b0",
43-
"opentelemetry-instrumentation-aiopg == 0.43b0",
44-
"opentelemetry-instrumentation-asgi == 0.43b0",
45-
"opentelemetry-instrumentation-asyncpg == 0.43b0",
46-
"opentelemetry-instrumentation-boto == 0.43b0",
47-
"opentelemetry-instrumentation-boto3sqs == 0.43b0",
48-
"opentelemetry-instrumentation-botocore == 0.43b0",
49-
"opentelemetry-instrumentation-celery == 0.43b0",
50-
"opentelemetry-instrumentation-confluent-kafka == 0.43b0",
51-
"opentelemetry-instrumentation-dbapi == 0.43b0",
52-
"opentelemetry-instrumentation-django == 0.43b0",
53-
"opentelemetry-instrumentation-elasticsearch == 0.43b0",
54-
"opentelemetry-instrumentation-falcon == 0.43b0",
55-
"opentelemetry-instrumentation-fastapi == 0.43b0",
56-
"opentelemetry-instrumentation-flask == 0.43b0",
57-
"opentelemetry-instrumentation-grpc == 0.43b0",
58-
"opentelemetry-instrumentation-httpx == 0.43b0",
59-
"opentelemetry-instrumentation-jinja2 == 0.43b0",
60-
"opentelemetry-instrumentation-kafka-python == 0.43b0",
61-
"opentelemetry-instrumentation-logging == 0.43b0",
62-
"opentelemetry-instrumentation-mysql == 0.43b0",
63-
"opentelemetry-instrumentation-mysqlclient == 0.43b0",
64-
"opentelemetry-instrumentation-pika == 0.43b0",
65-
"opentelemetry-instrumentation-psycopg2 == 0.43b0",
66-
"opentelemetry-instrumentation-pymemcache == 0.43b0",
67-
"opentelemetry-instrumentation-pymongo == 0.43b0",
68-
"opentelemetry-instrumentation-pymysql == 0.43b0",
69-
"opentelemetry-instrumentation-pyramid == 0.43b0",
70-
"opentelemetry-instrumentation-redis == 0.43b0",
71-
"opentelemetry-instrumentation-remoulade == 0.43b0",
72-
"opentelemetry-instrumentation-requests == 0.43b0",
73-
"opentelemetry-instrumentation-sklearn == 0.43b0",
74-
"opentelemetry-instrumentation-sqlalchemy == 0.43b0",
75-
"opentelemetry-instrumentation-sqlite3 == 0.43b0",
76-
"opentelemetry-instrumentation-starlette == 0.43b0",
77-
"opentelemetry-instrumentation-system-metrics == 0.43b0",
78-
"opentelemetry-instrumentation-tornado == 0.43b0",
79-
"opentelemetry-instrumentation-tortoiseorm == 0.43b0",
80-
"opentelemetry-instrumentation-urllib == 0.43b0",
81-
"opentelemetry-instrumentation-urllib3 == 0.43b0",
82-
"opentelemetry-instrumentation-wsgi == 0.43b0",
83-
"opentelemetry-instrumentation-cassandra == 0.43b0",
37+
"opentelemetry-distro == 0.46b0",
38+
"opentelemetry-propagator-ot-trace == 0.46b0",
39+
"opentelemetry-instrumentation == 0.46b0",
40+
"opentelemetry-instrumentation-aws-lambda == 0.46b0",
41+
"opentelemetry-instrumentation-aio-pika == 0.46b0",
42+
"opentelemetry-instrumentation-aiohttp-client == 0.46b0",
43+
"opentelemetry-instrumentation-aiopg == 0.46b0",
44+
"opentelemetry-instrumentation-asgi == 0.46b0",
45+
"opentelemetry-instrumentation-asyncpg == 0.46b0",
46+
"opentelemetry-instrumentation-boto == 0.46b0",
47+
"opentelemetry-instrumentation-boto3sqs == 0.46b0",
48+
"opentelemetry-instrumentation-botocore == 0.46b0",
49+
"opentelemetry-instrumentation-celery == 0.46b0",
50+
"opentelemetry-instrumentation-confluent-kafka == 0.46b0",
51+
"opentelemetry-instrumentation-dbapi == 0.46b0",
52+
"opentelemetry-instrumentation-django == 0.46b0",
53+
"opentelemetry-instrumentation-elasticsearch == 0.46b0",
54+
"opentelemetry-instrumentation-falcon == 0.46b0",
55+
"opentelemetry-instrumentation-fastapi == 0.46b0",
56+
"opentelemetry-instrumentation-flask == 0.46b0",
57+
"opentelemetry-instrumentation-grpc == 0.46b0",
58+
"opentelemetry-instrumentation-httpx == 0.46b0",
59+
"opentelemetry-instrumentation-jinja2 == 0.46b0",
60+
"opentelemetry-instrumentation-kafka-python == 0.46b0",
61+
"opentelemetry-instrumentation-logging == 0.46b0",
62+
"opentelemetry-instrumentation-mysql == 0.46b0",
63+
"opentelemetry-instrumentation-mysqlclient == 0.46b0",
64+
"opentelemetry-instrumentation-pika == 0.46b0",
65+
"opentelemetry-instrumentation-psycopg2 == 0.46b0",
66+
"opentelemetry-instrumentation-pymemcache == 0.46b0",
67+
"opentelemetry-instrumentation-pymongo == 0.46b0",
68+
"opentelemetry-instrumentation-pymysql == 0.46b0",
69+
"opentelemetry-instrumentation-pyramid == 0.46b0",
70+
"opentelemetry-instrumentation-redis == 0.46b0",
71+
"opentelemetry-instrumentation-remoulade == 0.46b0",
72+
"opentelemetry-instrumentation-requests == 0.46b0",
73+
"opentelemetry-instrumentation-sklearn == 0.46b0",
74+
"opentelemetry-instrumentation-sqlalchemy == 0.46b0",
75+
"opentelemetry-instrumentation-sqlite3 == 0.46b0",
76+
"opentelemetry-instrumentation-starlette == 0.46b0",
77+
"opentelemetry-instrumentation-system-metrics == 0.46b0",
78+
"opentelemetry-instrumentation-tornado == 0.46b0",
79+
"opentelemetry-instrumentation-tortoiseorm == 0.46b0",
80+
"opentelemetry-instrumentation-urllib == 0.46b0",
81+
"opentelemetry-instrumentation-urllib3 == 0.46b0",
82+
"opentelemetry-instrumentation-wsgi == 0.46b0",
83+
"opentelemetry-instrumentation-cassandra == 0.46b0",
8484
]
8585

8686
[project.optional-dependencies]

‎contract-tests/images/applications/botocore/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
opentelemetry-distro==0.43b0
2-
opentelemetry-exporter-otlp-proto-grpc==1.22.0
1+
opentelemetry-distro==0.46b0
2+
opentelemetry-exporter-otlp-proto-grpc==1.25.0
33
typing-extensions==4.9.0
44
botocore==1.34.26
55
boto3==1.34.26

‎contract-tests/images/applications/django/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opentelemetry-distro==0.43b0
2-
opentelemetry-exporter-otlp-proto-grpc==1.22.0
1+
opentelemetry-distro==0.46b0
2+
opentelemetry-exporter-otlp-proto-grpc==1.25.0
33
typing-extensions==4.9.0
44
django==5.0.3

‎contract-tests/images/applications/psycopg2/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opentelemetry-distro==0.43b0
2-
opentelemetry-exporter-otlp-proto-grpc==1.22.0
1+
opentelemetry-distro==0.46b0
2+
opentelemetry-exporter-otlp-proto-grpc==1.25.0
33
typing-extensions==4.9.0
44
psycopg2==2.9.9

‎contract-tests/images/applications/pymysql/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opentelemetry-distro==0.43b0
2-
opentelemetry-exporter-otlp-proto-grpc==1.22.0
1+
opentelemetry-distro==0.46b0
2+
opentelemetry-exporter-otlp-proto-grpc==1.25.0
33
typing-extensions==4.9.0
44
pymysql==1.1.1

‎contract-tests/images/applications/requests/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opentelemetry-distro==0.43b0
2-
opentelemetry-exporter-otlp-proto-grpc==1.22.0
1+
opentelemetry-distro==0.46b0
2+
opentelemetry-exporter-otlp-proto-grpc==1.25.0
33
typing-extensions==4.9.0
44
requests~=2.0

‎contract-tests/images/mock-collector/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ requires-python = ">=3.8"
1111

1212
dependencies = [
1313
"grpcio ~= 1.60.0",
14-
"opentelemetry-proto==1.22.0",
15-
"opentelemetry-sdk==1.22.0",
14+
"opentelemetry-proto==1.25.0",
15+
"opentelemetry-sdk==1.25.0",
1616
"protobuf==4.25.2",
1717
"typing-extensions==4.9.0"
1818
]

‎contract-tests/images/mock-collector/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
grpcio==1.60.1
2-
opentelemetry-proto==1.22.0
3-
opentelemetry-sdk==1.22.0
2+
opentelemetry-proto==1.25.0
3+
opentelemetry-sdk==1.25.0
44
protobuf==4.25.2
55
typing-extensions==4.9.0

0 commit comments

Comments
 (0)