Skip to content

Commit 6bf2b22

Browse files
lzchenlzchen
authored
Merge branch 'main' into redis_additional_attributes
2 parents 23b2736 + afb7f54 commit 6bf2b22

File tree

87 files changed

+88
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+88
-102
lines changed

Diff for: ‎.github/component_owners.yml

-14
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,13 @@ components:
4545

4646
instrumentation/opentelemetry-instrumentation-urllib:
4747
- shalevr
48-
- ocelotl
4948

5049
instrumentation/opentelemetry-instrumentation-urllib3:
5150
- shalevr
52-
- ocelotl
5351

5452
instrumentation/opentelemetry-instrumentation-sqlalchemy:
5553
- shalevr
5654

57-
instrumentation/opentelemetry-instrumentation-flask:
58-
- ocelotl
59-
60-
instrumentation/opentelemetry-instrumentation-jinja2:
61-
- ocelotl
62-
63-
instrumentation/opentelemetry-instrumentation-logging:
64-
- ocelotl
65-
66-
instrumentation/opentelemetry-instrumentation-requests:
67-
- ocelotl
68-
6955
instrumentation/opentelemetry-instrumentation-cassandra:
7056
- mattcontinisio
7157

Diff for: ‎exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
44
# We can drop this after bumping baseline to pypy-39

Diff for: ‎exporter/opentelemetry-exporter-richconsole/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
flaky==3.7.0
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aio-pika==7.2.0
22
aiormq==6.2.3
3-
asgiref==3.7.2
3+
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
66
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aio-pika==8.3.0
22
aiormq==6.6.4
3-
asgiref==3.7.2
3+
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
66
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aio-pika==9.0.5
22
aiormq==6.7.1
3-
asgiref==3.7.2
3+
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
66
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aio-pika==9.4.1
22
aiormq==6.8.0
3-
asgiref==3.7.2
3+
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
66
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aiohttp==3.10.2
22
aiosignal==1.3.1
3-
asgiref==3.7.2
3+
asgiref==3.8.1
44
async-timeout==4.0.3
55
blinker==1.7.0
66
certifi==2024.7.4

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aiohttp==3.10.2
22
aiosignal==1.3.1
3-
asgiref==3.7.2
3+
asgiref==3.8.1
44
async-timeout==4.0.3
55
Deprecated==1.2.14
66
frozenlist==1.4.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
aiopg==1.4.0
2-
asgiref==3.7.2
2+
asgiref==3.8.1
33
async-timeout==4.0.3
44
Deprecated==1.2.14
55
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"""
1515
.. asyncio: https://github.com/python/asyncio
1616
17-
The opentelemetry-instrumentation-asycnio package allows tracing asyncio applications.
17+
The opentelemetry-instrumentation-asyncio package allows tracing asyncio applications.
1818
The metric for coroutine, future, is generated even if there is no setting to generate a span.
1919
2020
Run instrumented application

Diff for: ‎instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
async-timeout==4.0.3
33
asyncpg==0.29.0
44
Deprecated==1.2.14

Diff for: ‎instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
boto==2.49.0
33
boto3==1.34.44
44
botocore==1.34.44

Diff for: ‎instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
boto3==1.34.44
33
botocore==1.34.44
44
Deprecated==1.2.14

Diff for: ‎instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
aws-xray-sdk==2.12.1
33
boto3==1.28.80
44
botocore==1.31.80

Diff for: ‎instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
cassandra-driver==3.29.0
33
click==8.1.7
44
Deprecated==1.2.14

Diff for: ‎instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
amqp==5.2.0
2-
asgiref==3.7.2
2+
asgiref==3.8.1
33
backports.zoneinfo==0.2.1
44
billiard==4.2.0
55
celery==5.3.6

Diff for: ‎instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
amqp==5.2.0
2-
asgiref==3.7.2
2+
asgiref==3.8.1
33
billiard==4.2.0
44
celery==5.3.6
55
click==8.1.7

Diff for: ‎instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
confluent-kafka==2.4.0
33
Deprecated==1.2.14
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
Django==2.2.28
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
Django==3.2.25
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
backports.zoneinfo==0.2.1
33
Deprecated==1.2.14
44
Django==4.2.15

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
Django==4.2.15
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
elasticsearch==6.8.2
44
elasticsearch-dsl==6.4.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
elasticsearch==7.17.9
44
elasticsearch-dsl==7.4.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
elasticsearch==8.13.1
44
elasticsearch-dsl==8.13.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
falcon==1.4.1
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
falcon==2.0.0
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
falcon==3.1.1
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
annotated-types==0.6.0
22
anyio==4.3.0
3-
asgiref==3.7.2
3+
asgiref==3.8.1
44
certifi==2024.7.4
55
charset-normalizer==3.3.2
66
Deprecated==1.2.14

Diff for: ‎instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
click==8.1.7
33
Deprecated==1.2.14
44
Flask==2.1.3

Diff for: ‎instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
click==8.1.7
33
Deprecated==1.2.14
44
Flask==2.2.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
blinker==1.7.0
33
click==8.1.7
44
Deprecated==1.2.14

Diff for: ‎instrumentation/opentelemetry-instrumentation-grpc/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
grpcio==1.62.0
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-grpc/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
grpcio==1.63.0
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-httpx/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
anyio==3.7.1
2-
asgiref==3.7.2
2+
asgiref==3.8.1
33
certifi==2024.7.4
44
Deprecated==1.2.14
55
exceptiongroup==1.2.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
anyio==4.3.0
2-
asgiref==3.7.2
2+
asgiref==3.8.1
33
certifi==2024.7.4
44
Deprecated==1.2.14
55
exceptiongroup==1.2.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-jinja2/tests/test_jinja2.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def test_generate_inline_template(self):
143143
def test_file_template_with_root(self):
144144
with self.tracer.start_as_current_span("root"):
145145
loader = jinja2.loaders.FileSystemLoader(TMPL_DIR)
146-
env = jinja2.Environment(loader=loader)
146+
env = jinja2.Environment(loader=loader, autoescape=True)
147147
template = env.get_template("template.html")
148148
self.assertEqual(
149149
template.render(name="Jinja"), "Message: Hello Jinja!"
@@ -164,7 +164,7 @@ def test_file_template_with_root(self):
164164

165165
def test_file_template(self):
166166
loader = jinja2.loaders.FileSystemLoader(TMPL_DIR)
167-
env = jinja2.Environment(loader=loader)
167+
env = jinja2.Environment(loader=loader, autoescape=True)
168168
template = env.get_template("template.html")
169169
self.assertEqual(
170170
template.render(name="Jinja"), "Message: Hello Jinja!"

Diff for: ‎instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements-ng.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-mysql/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-mysql/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
backports.zoneinfo==0.2.1
33
Deprecated==1.2.14
44
importlib-metadata==6.11.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
importlib-metadata==6.11.0
44
iniconfig==2.0.0

0 commit comments

Comments
 (0)