Merge pull request #199 from jeremydvoss/instrumentations-minus-django

Adding instrumentations aside from django

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Adding requests, flask, and psycopg2 instrumentations
+    ([#199](https://github.com/microsoft/ApplicationInsights-Python/pull/199))
 - Added publishing action
     ([#193](https://github.com/microsoft/ApplicationInsights-Python/pull/193))
 

azure-monitor-opentelemetry-distro/setup.cfg

@@ -32,7 +32,10 @@ zip_safe = False
 include_package_data = True
 install_requires =
     azure-monitor-opentelemetry-exporter == 1.0.0b7
-    opentelemetry-instrumentation == 0.32b0
+    opentelemetry-instrumentation == 0.33b0
+    opentelemetry-instrumentation-requests == 0.33b0
+    opentelemetry-instrumentation-flask == 0.33b0
+    opentelemetry-instrumentation-psycopg2 == 0.33b0
 
 [options.packages.find]
 where = src

azure-monitor-opentelemetry-distro/tests/test_flask.py

@@ -0,0 +1,16 @@
+import unittest
+
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+
+
+class TestFlaskInstrumentation(unittest.TestCase):
+    def test_instrument(self):
+        excluded_urls = "client/.*/info,healthcheck"
+        try:
+            FlaskInstrumentor().instrument(excluded_urls=excluded_urls)
+        except Exception as ex:  # pylint: disable=broad-except
+            print(ex)
+            self.fail(
+                f"Unexpected exception raised when instrumenting {FlaskInstrumentor.__name__}"
+            )
+

azure-monitor-opentelemetry-distro/tests/test_psycopg2.py

@@ -0,0 +1,15 @@
+import unittest
+
+from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
+
+
+class TestPsycopg2Instrumentation(unittest.TestCase):
+    def test_instrument(self):
+        try:
+            Psycopg2Instrumentor().instrument()
+        except Exception as ex:  # pylint: disable=broad-except
+            print(ex)
+            self.fail(
+                f"Unexpected exception raised when instrumenting {Psycopg2Instrumentor.__name__}"
+            )
+

azure-monitor-opentelemetry-distro/tests/test_requests.py

@@ -0,0 +1,15 @@
+import unittest
+
+from opentelemetry.instrumentation.requests import RequestsInstrumentor
+
+
+class TestRequestsInstrumentation(unittest.TestCase):
+    def test_instrument(self):
+        try:
+            RequestsInstrumentor().instrument()
+        except Exception as ex:  # pylint: disable=broad-except
+            print(ex)
+            self.fail(
+                f"Unexpected exception raised when instrumenting {RequestsInstrumentor.__name__}"
+            )
+