Add bottle support

Fix #55

Author: dlopes7

README.md

@@ -26,14 +26,15 @@ For most technologies, just import it in your code.
 ### Technologies supported:
 
 - **aiohttp** (client)
+- **bottle**
 - **celery**
 - **concurrent.futures**
 - **confluent_kafka**
 - **cx_Oracle**
 - **django**
 - **fastapi**
 - **flask**
-- **grpc**
+- **grpc** (client)
 - **paramiko**
 - **pika** (RabbitMQ)
 - **psycopg2**

autodynatrace/__init__.py

@@ -53,6 +53,7 @@
     "fastapi": True,
     "starlette": True,
     "aiohttp": True,
+    "bottle": True,
 }
 
 

autodynatrace/wrappers/bottle/__init__.py

@@ -0,0 +1 @@
+from .wrapper import instrument

autodynatrace/wrappers/bottle/wrapper.py

@@ -0,0 +1,46 @@
+from ...log import logger
+from ...sdk import sdk
+
+import os
+
+
+from bottle import hook, request, response
+
+
+def instrument():
+    @hook("before_request")
+    def instrument_before_request():
+        try:
+            # extract host and port from the request
+            host = request.environ.get("HTTP_HOST", "unknown")
+            app_name = "{}".format(host)
+
+            virtual_host = os.environ.get("AUTODYNATRACE_VIRTUAL_HOST", "{}".format(host))
+            app_name = os.environ.get("AUTODYNATRACE_APPLICATION_ID", "Bottle ({})".format(app_name))
+            context_root = os.environ.get("AUTODYNATRACE_CONTEXT_ROOT", "/")
+
+            # Create the oneagent web app
+            web_app_info = sdk.create_web_application_info(virtual_host, app_name, context_root)
+
+            with web_app_info:
+                # Attempt to extract the x-dynatrace header from the request
+                dynatrace_header = request.headers.get("x-dynatrace")
+                logger.debug("Bottle - tracing incoming request ({}) with header: {}".format(request.url, dynatrace_header))
+                tracer = sdk.trace_incoming_web_request(web_app_info, request.url, request.method, headers=request.headers, str_tag=dynatrace_header)
+                tracer.start()
+                setattr(request, "__dynatrace_tracer", tracer)
+        except Exception as e:
+            logger.warning("Bottle - failed to instrument request: {}".format(e))
+
+    @hook("after_request")
+    def instrument_after_request():
+        try:
+            # check if the request was instrumented
+            tracer = getattr(request, "__dynatrace_tracer", None)
+            if tracer:
+                tracer.set_status_code(response.status_code)
+                tracer.add_response_headers(response.headers)
+                logger.debug("Bottle - ending incoming request ({}) with status: {}".format(request.url, response.status_code))
+                tracer.end()
+        except Exception as e:
+            logger.warning("Bottle - failed to instrument response: {}".format(e))

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="autodynatrace",
-    version="1.0.83",
+    version="1.0.84",
     packages=find_packages(),
     package_data={"autodynatrace": ["wrappers/*"]},
     install_requires=["wrapt>=1.11.2", "oneagent-sdk>=1.3.0", "six>=1.10.0", "autowrapt>=1.0"],