Skip to content
This repository was archived by the owner on Aug 13, 2025. It is now read-only.

Commit dc0e83f

Browse files
Merge pull request #23 from honeycombio/nathanleclaire.use_dict_get
Use dict get instead of direct dict access in Flask init
2 parents 043d138 + 7a29757 commit dc0e83f

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

beeline/middleware/flask/__init__.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,19 @@ def __init__(self, app):
2626
self.app = app
2727

2828
def __call__(self, environ, start_response):
29-
trace_name = "flask_http_%s" % environ['REQUEST_METHOD'].lower()
29+
trace_name = "flask_http_%s" % environ.get('REQUEST_METHOD', None)
30+
if trace_name is not None:
31+
trace_name = trace_name.lower()
3032
beeline._new_event(data={
3133
"type": "http_server",
32-
"request.host": environ['HTTP_HOST'],
33-
"request.method": environ['REQUEST_METHOD'],
34-
"request.path": environ['PATH_INFO'],
35-
"request.remote_addr": environ['REMOTE_ADDR'],
34+
"request.host": environ.get('HTTP_HOST', None),
35+
"request.method": environ.get('REQUEST_METHOD', None),
36+
"request.path": environ.get('PATH_INFO', None),
37+
"request.remote_addr": environ.get('REMOTE_ADDR', None),
3638
"request.content_length": environ.get('CONTENT_LENGTH', 0),
37-
"request.user_agent": environ['HTTP_USER_AGENT'],
38-
"request.scheme": environ['wsgi.url_scheme'],
39-
"request.query": environ['QUERY_STRING']
39+
"request.user_agent": environ.get('HTTP_USER_AGENT', None),
40+
"request.scheme": environ.get('wsgi.url_scheme', None),
41+
"request.query": environ.get('QUERY_STRING', None)
4042
}, trace_name=trace_name, top_level=True)
4143

4244
def _start_response(status, headers, *args):

beeline/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = '1.3.0'
1+
VERSION = '1.3.1'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
setup(
55
python_requires='>=2.7',
66
name='honeycomb-beeline',
7-
version='1.3.0',
7+
version='1.3.1',
88
description='Honeycomb library for easy instrumentation',
99
url='https://github.com/honeycombio/beeline-python',
1010
author='Honeycomb.io',

0 commit comments

Comments
 (0)