Merge branch 'main' into fix-flask-multithread-context-bug

Author: srikanthccv

instrumentation/README.md

@@ -16,7 +16,7 @@
 | [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes
 | [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 2.0 | No
 | [opentelemetry-instrumentation-falcon](./opentelemetry-instrumentation-falcon) | falcon >= 1.4.1, < 4.0.0 | Yes
-| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.58 | Yes
+| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi <= 0.90.1 | Yes
 | [opentelemetry-instrumentation-flask](./opentelemetry-instrumentation-flask) | flask >= 1.0, < 3.0 | Yes
 | [opentelemetry-instrumentation-grpc](./opentelemetry-instrumentation-grpc) | grpcio ~= 1.27 | No
 | [opentelemetry-instrumentation-httpx](./opentelemetry-instrumentation-httpx) | httpx >= 0.18.0 | No

instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "fastapi ~= 0.58",
+  "fastapi <= 0.90.1",
 ]
 test = [
   "opentelemetry-instrumentation-fastapi[instruments]",

instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/package.py

@@ -13,6 +13,6 @@
 # limitations under the License.
 
 
-_instruments = ("fastapi ~= 0.58",)
+_instruments = ("fastapi <= 0.90.1",)
 
 _supports_metrics = True

instrumentation/opentelemetry-instrumentation-pymemcache/tests/test_pymemcache.py

@@ -509,6 +509,19 @@ def test_uninstrumented(self):
 
         PymemcacheInstrumentor().instrument()
 
+    def test_no_op_tracer_provider(self):
+        PymemcacheInstrumentor().uninstrument()
+        tracer_provider = trace_api.NoOpTracerProvider()
+        PymemcacheInstrumentor().instrument(tracer_provider=tracer_provider)
+
+        client = self.make_client([b"STORED\r\n"])
+        result = client.set(b"key", b"value", noreply=False)
+        self.assertTrue(result)
+
+        spans = self.memory_exporter.get_finished_spans()
+        assert spans is not None
+        self.assertEqual(len(spans), 0)
+
 
 class PymemcacheHashClientTestCase(TestBase):
     """Tests for a patched pymemcache.client.hash.HashClient."""

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -69,7 +69,7 @@
         "instrumentation": "opentelemetry-instrumentation-falcon==0.37b0.dev",
     },
     "fastapi": {
-        "library": "fastapi ~= 0.58",
+        "library": "fastapi <= 0.90.1",
         "instrumentation": "opentelemetry-instrumentation-fastapi==0.37b0.dev",
     },
     "flask": {