From 55d8f1ae440d01da3a2c91e5a170e260e42fc749 Mon Sep 17 00:00:00 2001
From: freez91 <useyes91@gmail.com>
Date: Tue, 22 Dec 2020 11:05:08 +0800
Subject: [PATCH 1/3] add sentry config

---
 .gitignore  |  3 ++-
 bin/bbox.py | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b255ecb..d4daf62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+*.swp
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -104,4 +105,4 @@ certs/
 .DS_Store
 tmp/
 # redis
-dump.rdb
\ No newline at end of file
+dump.rdb
diff --git a/bin/bbox.py b/bin/bbox.py
index c6152a4..46e9be0 100755
--- a/bin/bbox.py
+++ b/bin/bbox.py
@@ -47,6 +47,12 @@ def main():
         handler = mod.Handler()
         help_msg = getattr(handler, 'help', '')
         parser = sub_parsers.add_parser(sub_cmd, help=help_msg)
+        # add sentry config
+        parser.add_argument(
+            '--sentry_config',
+            type=str,
+            default='',
+            help='sentry config')
         handler.add_arguments(parser)
         parser.set_defaults(handler=handler)
 
@@ -56,6 +62,13 @@ def run(top_parser:ArgumentParser, input_args:Optional[List[str]]=None) -> None:
     args = top_parser.parse_args(input_args)
     loop = asyncio.get_event_loop()
 
+    sentry_config = args.sentry_config
+    if sentry_config:
+        sentry_sdk.init(
+              dsn=sentry_config,
+              integrations=[AioHttpIntegration()]
+        )
+
     handler = getattr(args, 'handler', None)
     if handler is None:
         top_parser.print_help()

From bfa023fea7666d3013223d2fefbd80c972ceb03c Mon Sep 17 00:00:00 2001
From: freez91 <useyes91@gmail.com>
Date: Tue, 5 Jan 2021 17:17:54 +0800
Subject: [PATCH 2/3] sentry for env

---
 bin/bbox.py | 13 ++++---------
 setup.py    |  2 ++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/bin/bbox.py b/bin/bbox.py
index 46e9be0..de67406 100755
--- a/bin/bbox.py
+++ b/bin/bbox.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 from typing import Optional, List
 import sys
+import os
 import logging
 import signal
 import signal
@@ -47,12 +48,6 @@ def main():
         handler = mod.Handler()
         help_msg = getattr(handler, 'help', '')
         parser = sub_parsers.add_parser(sub_cmd, help=help_msg)
-        # add sentry config
-        parser.add_argument(
-            '--sentry_config',
-            type=str,
-            default='',
-            help='sentry config')
         handler.add_arguments(parser)
         parser.set_defaults(handler=handler)
 
@@ -62,10 +57,10 @@ def run(top_parser:ArgumentParser, input_args:Optional[List[str]]=None) -> None:
     args = top_parser.parse_args(input_args)
     loop = asyncio.get_event_loop()
 
-    sentry_config = args.sentry_config
-    if sentry_config:
+    sentry_url = os.environ.get('SENTRY_URL')
+    if sentry_url:
         sentry_sdk.init(
-              dsn=sentry_config,
+              dsn=sentry_url,
               integrations=[AioHttpIntegration()]
         )
 
diff --git a/setup.py b/setup.py
index 8783157..276cb3f 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,8 @@
           'netifaces',
           'aioredis',
           'etcd3-py',
+          'aiocontextvars',
+          'sentry-sdk',
       ],
       python_requires='>=3.6',
 )

From d7aa4dc15cf570c944d1b3802a0b3055c9c832b9 Mon Sep 17 00:00:00 2001
From: freez91 <useyes91@gmail.com>
Date: Thu, 14 Jan 2021 17:50:42 +0800
Subject: [PATCH 3/3] update version

---
 bin/bbox.py | 2 ++
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/bbox.py b/bin/bbox.py
index de67406..860960f 100755
--- a/bin/bbox.py
+++ b/bin/bbox.py
@@ -10,6 +10,8 @@
 from aiobbox.log import config_log
 from aiobbox.handler import BaseHandler
 from aiobbox.utils import import_module
+import sentry_sdk
+from sentry_sdk.integrations.aiohttp import AioHttpIntegration
 
 sys.path.append('.')
 
diff --git a/setup.py b/setup.py
index 78ab5ac..f2438da 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import find_packages
 
 setup(name='aiobbox',
-      version='0.5.5',
+      version='0.5.6',
       description='multi-lang, highly available rpc framework',
       author='Zeng Ke',
       author_email='zk@bixin.com',