Skip to content

Commit 1866da2

Browse files
Merge branch 'main' into google_genai_finish_reasons
2 parents eca1ec3 + 7562ff0 commit 1866da2

File tree

11 files changed

+13
-11
lines changed

11 files changed

+13
-11
lines changed

instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ http_server_mock==1.7
1313
idna==3.7
1414
iniconfig==2.0.0
1515
itsdangerous==2.1.2
16-
Jinja2==3.1.4
16+
Jinja2==3.1.6
1717
MarkupSafe==2.1.5
1818
multidict==6.0.5
1919
packaging==24.0

instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Deprecated==1.2.14
1010
docker==7.0.0
1111
idna==3.7
1212
iniconfig==2.0.0
13-
Jinja2==3.1.4
13+
Jinja2==3.1.6
1414
jmespath==1.0.1
1515
MarkupSafe==2.1.5
1616
moto==2.3.2

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Deprecated==1.2.14
1010
docker==7.0.0
1111
idna==3.7
1212
iniconfig==2.0.0
13-
Jinja2==3.1.4
13+
Jinja2==3.1.6
1414
jmespath==1.0.1
1515
MarkupSafe==2.1.5
1616
moto==5.0.9

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Deprecated==1.2.14
1010
docker==7.0.0
1111
idna==3.7
1212
iniconfig==2.0.0
13-
Jinja2==3.1.4
13+
Jinja2==3.1.6
1414
jmespath==1.0.1
1515
MarkupSafe==2.1.5
1616
moto==5.0.9

instrumentation/opentelemetry-instrumentation-click/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Deprecated==1.2.14
55
Flask==3.0.2
66
iniconfig==2.0.0
77
itsdangerous==2.1.2
8-
Jinja2==3.1.4
8+
Jinja2==3.1.6
99
MarkupSafe==2.1.2
1010
packaging==24.0
1111
pluggy==1.5.0

instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Deprecated==1.2.14
44
Flask==2.1.3
55
iniconfig==2.0.0
66
itsdangerous==2.1.2
7-
Jinja2==3.1.4
7+
Jinja2==3.1.6
88
MarkupSafe==2.1.2
99
packaging==24.0
1010
pluggy==1.5.0

instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Deprecated==1.2.14
44
Flask==2.2.0
55
iniconfig==2.0.0
66
itsdangerous==2.1.2
7-
Jinja2==3.1.4
7+
Jinja2==3.1.6
88
MarkupSafe==2.1.2
99
packaging==24.0
1010
pluggy==1.5.0

instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Deprecated==1.2.14
55
Flask==3.0.2
66
iniconfig==2.0.0
77
itsdangerous==2.1.2
8-
Jinja2==3.1.4
8+
Jinja2==3.1.6
99
MarkupSafe==2.1.2
1010
packaging==24.0
1111
pluggy==1.5.0

instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
iniconfig==2.0.0
4-
Jinja2==3.1.4
4+
Jinja2==3.1.6
55
MarkupSafe==2.0.1
66
packaging==24.0
77
pluggy==1.5.0

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ def get(self):
7272
7373
.. code-block:: python
7474
75+
from opentelemetry.instrumentation.tornado import TornadoInstrumentor
76+
7577
# will be called for each incoming request to Tornado
7678
# web server. `handler` is an instance of
7779
# `tornado.web.RequestHandler`.
@@ -94,7 +96,7 @@ def client_response_hook(span, future):
9496
TornadoInstrumentor().instrument(
9597
server_request_hook=server_request_hook,
9698
client_request_hook=client_request_hook,
97-
client_response_hook=client_response_hook
99+
client_response_hook=client_response_hook,
98100
)
99101
100102
Capture HTTP request and response headers

0 commit comments

Comments
 (0)