Merge remote-tracking branch 'upstream/main' into pymongo-capture-statement-more-commands, fix CHANGELOG conflict

Author: shkupferxom

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation-pymongo` Add full command statement capturing for additional command types
   ([#1955](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1955))
 
+### Fixed
+
+- Fix version of Flask dependency `werkzeug`
+  ([#1980](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1980))
+
 ## Version 1.20.0/0.41b0 (2023-09-01)
 
 ### Fixed
@@ -356,7 +361,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))

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]",

instrumentation/opentelemetry-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
 

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",

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)