Merge branch 'main' into httpx-sync-async-client-auto-instr-fix

# Conflicts: # CHANGELOG.md
open-telemetry · Oct 7, 2023 · 7b3a1fe · 7b3a1fe
2 parents 46a9dc6 + 7ac6744
commit 7b3a1fe
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix version of Flask dependency `werkzeug`
+  ([#1980](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1980))
 - `opentelemetry-instrumentation-httpx` Fix mixing async and non async hooks
   ([#1920](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1920))
 
@@ -357,7 +359,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation-sqlalchemy` Added span for the connection phase ([#1133](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1133))
 - Add metric instrumentation in asgi
   ([#1197](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1197))
-- Add metric instumentation for flask
+- Add metric instrumentation for flask
   ([#1186](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1186))
 - Add a test for asgi using NoOpTracerProvider
   ([#1367](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1367))

diff --git a/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml b/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml
@@ -36,6 +36,7 @@ dependencies = [
 [project.optional-dependencies]
 instruments = [
   "flask >= 1.0, < 3.0",
+  "werkzeug < 3.0.0"
 ]
 test = [
   "opentelemetry-instrumentation-flask[instruments]",

diff --git a/...entelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/__init__.py b/...entelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/__init__.py
@@ -35,7 +35,7 @@
     ).instrument()
 
 
-Model intrumentation example:
+Model instrumentation example:
 
 .. code-block:: python
 
@@ -291,7 +291,7 @@ class descendent) is being instrumented with opentelemetry. Within a
         SklearnInstrumentor(packages=packages).instrument()
 
 
-    Model intrumentation example:
+    Model instrumentation example:
 
     .. code-block:: python
 

diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -84,6 +84,10 @@
         "library": "flask >= 1.0, < 3.0",
         "instrumentation": "opentelemetry-instrumentation-flask==0.42b0.dev",
     },
+    "werkzeug": {
+        "library": "werkzeug < 3.0.0",
+        "instrumentation": "opentelemetry-instrumentation-flask==0.42b0.dev",
+    },
     "grpcio": {
         "library": "grpcio ~= 1.27",
         "instrumentation": "opentelemetry-instrumentation-grpc==0.42b0.dev",

diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/propagators.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/propagators.py
@@ -59,12 +59,13 @@ def set(self, carrier, key, value):  # pylint: disable=no-self-use
 
 
 class FuncSetter(Setter):
-    """FuncSetter coverts a function into a valid Setter. Any function that can
-    set values in a carrier can be converted into a Setter by using FuncSetter.
-    This is useful when injecting trace context into non-dict objects such
-    HTTP Response objects for different framework.
+    """FuncSetter converts a function into a valid Setter. Any function that
+    can set values in a carrier can be converted into a Setter by using
+    FuncSetter. This is useful when injecting trace context into non-dict
+    objects such HTTP Response objects for different framework.
 
-    For example, it can be used to create a setter for Falcon response object as:
+    For example, it can be used to create a setter for Falcon response object
+    as:
 
         setter = FuncSetter(falcon.api.Response.append_header)