From 7a29757ffe91a4b961afc26c9fcc1763fcdf43b3 Mon Sep 17 00:00:00 2001
From: Nathan LeClaire <nathan.leclaire@gmail.com>
Date: Wed, 19 Sep 2018 15:08:47 -0700
Subject: [PATCH] Use dict get instead of direct dict access in Flask init

---
 beeline/middleware/flask/__init__.py | 18 ++++++++++--------
 beeline/version.py                   |  2 +-
 setup.py                             |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/beeline/middleware/flask/__init__.py b/beeline/middleware/flask/__init__.py
index a2907fe..ab7ee1c 100644
--- a/beeline/middleware/flask/__init__.py
+++ b/beeline/middleware/flask/__init__.py
@@ -26,17 +26,19 @@ def __init__(self, app):
         self.app = app
 
     def __call__(self, environ, start_response):
-        trace_name = "flask_http_%s" % environ['REQUEST_METHOD'].lower()
+        trace_name = "flask_http_%s" % environ.get('REQUEST_METHOD', None)
+        if trace_name is not None:
+            trace_name = trace_name.lower()
         beeline._new_event(data={
             "type": "http_server",
-            "request.host": environ['HTTP_HOST'],
-            "request.method": environ['REQUEST_METHOD'],
-            "request.path": environ['PATH_INFO'],
-            "request.remote_addr": environ['REMOTE_ADDR'],
+            "request.host": environ.get('HTTP_HOST', None),
+            "request.method": environ.get('REQUEST_METHOD', None),
+            "request.path": environ.get('PATH_INFO', None),
+            "request.remote_addr": environ.get('REMOTE_ADDR', None),
             "request.content_length": environ.get('CONTENT_LENGTH', 0),
-            "request.user_agent": environ['HTTP_USER_AGENT'],
-            "request.scheme": environ['wsgi.url_scheme'],
-            "request.query": environ['QUERY_STRING']
+            "request.user_agent": environ.get('HTTP_USER_AGENT', None),
+            "request.scheme": environ.get('wsgi.url_scheme', None),
+            "request.query": environ.get('QUERY_STRING', None)
         }, trace_name=trace_name, top_level=True)
 
         def _start_response(status, headers, *args):
diff --git a/beeline/version.py b/beeline/version.py
index 9e23359..d0e714d 100644
--- a/beeline/version.py
+++ b/beeline/version.py
@@ -1 +1 @@
-VERSION = '1.3.0'
+VERSION = '1.3.1'
diff --git a/setup.py b/setup.py
index 4f29df2..733443e 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 setup(
     python_requires='>=2.7',
     name='honeycomb-beeline',
-    version='1.3.0',
+    version='1.3.1',
     description='Honeycomb library for easy instrumentation',
     url='https://github.com/honeycombio/beeline-python',
     author='Honeycomb.io',