Merge branch 'main' into Fix-bug-when-labels-are-ordered-differently

open-telemetry · Apr 17, 2024 · 2c526cd · 2c526cd
2 parents 19916f6 + 642f8dd
commit 2c526cd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/docs/examples/fork-process-model/flask-gunicorn/requirements.txt b/docs/examples/fork-process-model/flask-gunicorn/requirements.txt
@@ -4,7 +4,7 @@ googleapis-common-protos==1.52.0
 grpcio==1.56.0
 gunicorn==20.0.4
 itsdangerous==2.1.2
-Jinja2==3.1.2
+Jinja2==3.1.3
 MarkupSafe==2.1.3
 opentelemetry-api==1.20.0
 opentelemetry-exporter-otlp==1.20.0

diff --git a/docs/examples/fork-process-model/flask-uwsgi/requirements.txt b/docs/examples/fork-process-model/flask-uwsgi/requirements.txt
@@ -4,7 +4,7 @@ googleapis-common-protos==1.52.0
 grpcio==1.56.0
 gunicorn==20.0.4
 itsdangerous==2.1.2
-Jinja2==3.1.2
+Jinja2==3.1.3
 MarkupSafe==2.1.3
 opentelemetry-api==1.20.0
 opentelemetry-exporter-otlp==1.20.0

diff --git a/docs/getting_started/tests/requirements.txt b/docs/getting_started/tests/requirements.txt
@@ -6,7 +6,7 @@ click==8.1.7
 Deprecated==1.2.14
 flaky==3.7.0
 Flask==2.3.3
-idna==3.4
+idna==3.7
 importlib-metadata==6.8.0
 iniconfig==2.0.0
 itsdangerous==2.1.2

diff --git a/opentelemetry-api/src/opentelemetry/propagate/__init__.py b/opentelemetry-api/src/opentelemetry/propagate/__init__.py
@@ -109,8 +109,9 @@ def inject(
     """Uses the configured propagator to inject a Context into the carrier.
 
     Args:
-        carrier: An object that contains a representation of HTTP
-            headers. Should be paired with setter, which
+        carrier: the medium used by Propagators to read
+            values from and write values to.
+            Should be paired with setter, which
             should know how to set header values on the carrier.
         context: An optional Context to use. Defaults to current
             context if not set.