From 57bc18157a69712fcac77faecedd4c8473cb70c9 Mon Sep 17 00:00:00 2001 From: Sergio Revilla Date: Wed, 16 Feb 2022 14:06:09 +0100 Subject: [PATCH 1/7] Sentry integration --- src/app.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/app.py b/src/app.py index daf39e9..12469fb 100755 --- a/src/app.py +++ b/src/app.py @@ -33,6 +33,20 @@ pass + +try: + sentry_sdk.init( + "https://31f2bc6fdc8a4f36bb4e464ec1237765@o1134623.ingest.sentry.io/6212895", + traces_sample_rate=0.1, +) + app.add_middleware(SentryAsgiMiddleware) +except Exception: + pass + +@app.get('/sentry') +async def sentry(): + raise Exception('Test sentry integration') + @app.get("/info") async def info(): logger.info("Ocr PDF info endpoint") From c943e30e836e087bbc97fa6a2d5612fcf2da3ada Mon Sep 17 00:00:00 2001 From: Sergio Revilla Date: Wed, 16 Feb 2022 15:30:44 +0100 Subject: [PATCH 2/7] Configure Sentry with env variables --- src/QueueProcessor.py | 6 ++++++ src/app.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/QueueProcessor.py b/src/QueueProcessor.py index 4fa4a2c..f955583 100644 --- a/src/QueueProcessor.py +++ b/src/QueueProcessor.py @@ -108,7 +108,13 @@ def subscribe_to_extractions_tasks_queue(self): if __name__ == "__main__": try: sentry_sdk.init( +<<<<<<< HEAD os.environ.get("SENTRY_OCR_DSN"), +||||||| parent of 475a5e3 (Configure Sentry with env variables) + "https://31f2bc6fdc8a4f36bb4e464ec1237765@o1134623.ingest.sentry.io/6212895", +======= + os.environ.get('SENTRY_OCR_DSN'), +>>>>>>> 475a5e3 (Configure Sentry with env variables) traces_sample_rate=0.1, environment=os.environ.get("ENVIRONMENT", "development"), integrations=[RedisIntegration()], diff --git a/src/app.py b/src/app.py index 12469fb..db86fb6 100755 --- a/src/app.py +++ b/src/app.py @@ -36,7 +36,7 @@ try: sentry_sdk.init( - "https://31f2bc6fdc8a4f36bb4e464ec1237765@o1134623.ingest.sentry.io/6212895", + os.environ.get('SENTRY_OCR_DSN'), traces_sample_rate=0.1, ) app.add_middleware(SentryAsgiMiddleware) From 1f50be98eec0a02e8b3270b883e42ceb176a9d55 Mon Sep 17 00:00:00 2001 From: Sergio Revilla Date: Wed, 16 Feb 2022 17:21:33 +0100 Subject: [PATCH 3/7] Remove test endpoint --- src/QueueProcessor.py | 6 ------ src/app.py | 4 ---- 2 files changed, 10 deletions(-) diff --git a/src/QueueProcessor.py b/src/QueueProcessor.py index f955583..4fa4a2c 100644 --- a/src/QueueProcessor.py +++ b/src/QueueProcessor.py @@ -108,13 +108,7 @@ def subscribe_to_extractions_tasks_queue(self): if __name__ == "__main__": try: sentry_sdk.init( -<<<<<<< HEAD os.environ.get("SENTRY_OCR_DSN"), -||||||| parent of 475a5e3 (Configure Sentry with env variables) - "https://31f2bc6fdc8a4f36bb4e464ec1237765@o1134623.ingest.sentry.io/6212895", -======= - os.environ.get('SENTRY_OCR_DSN'), ->>>>>>> 475a5e3 (Configure Sentry with env variables) traces_sample_rate=0.1, environment=os.environ.get("ENVIRONMENT", "development"), integrations=[RedisIntegration()], diff --git a/src/app.py b/src/app.py index db86fb6..368b7a9 100755 --- a/src/app.py +++ b/src/app.py @@ -43,10 +43,6 @@ except Exception: pass -@app.get('/sentry') -async def sentry(): - raise Exception('Test sentry integration') - @app.get("/info") async def info(): logger.info("Ocr PDF info endpoint") From f339779a30f79a17bba59cbdf362c87508dceed4 Mon Sep 17 00:00:00 2001 From: Sergio Revilla Date: Fri, 8 Jul 2022 12:04:27 +0200 Subject: [PATCH 4/7] Add Sentry integration --- src/app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app.py b/src/app.py index 368b7a9..27fa179 100755 --- a/src/app.py +++ b/src/app.py @@ -38,6 +38,7 @@ sentry_sdk.init( os.environ.get('SENTRY_OCR_DSN'), traces_sample_rate=0.1, + environment=os.environ.get('ENVIRONMENT', 'development') ) app.add_middleware(SentryAsgiMiddleware) except Exception: From 98eb3b85045918f175144e7c4262e4574d371b56 Mon Sep 17 00:00:00 2001 From: Sergio Revilla Date: Fri, 8 Jul 2022 12:07:13 +0200 Subject: [PATCH 5/7] Linting --- src/app.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app.py b/src/app.py index 27fa179..12bcfed 100755 --- a/src/app.py +++ b/src/app.py @@ -38,12 +38,13 @@ sentry_sdk.init( os.environ.get('SENTRY_OCR_DSN'), traces_sample_rate=0.1, - environment=os.environ.get('ENVIRONMENT', 'development') -) + environment=os.environ.get("ENVIRONMENT", "development"), + ) app.add_middleware(SentryAsgiMiddleware) except Exception: pass + @app.get("/info") async def info(): logger.info("Ocr PDF info endpoint") From a7159970dffb952520af0c41e6296fe012d86f6f Mon Sep 17 00:00:00 2001 From: Sergio Revilla Date: Fri, 8 Jul 2022 12:25:59 +0200 Subject: [PATCH 6/7] Add env variables for Sentry integration --- docker-compose.yml | 6 ++++++ src/app.py | 12 ------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e411f08..107bf96 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,9 @@ services: target: api volumes: - ./data:/app/data + environment: + - ENVIRONMENT=${ENVIRONMENT:-development} + - SENTRY_OCR_DSN=${SENTRY_OCR_DSN:-} ocr: init: true network_mode: host @@ -22,6 +25,9 @@ services: target: ocr volumes: - ./data:/app/data + environment: + - ENVIRONMENT=${ENVIRONMENT:-development} + - SENTRY_OCR_DSN=${SENTRY_OCR_DSN:-} redis: image: "redis:5.0.14" diff --git a/src/app.py b/src/app.py index 12bcfed..38f14d9 100755 --- a/src/app.py +++ b/src/app.py @@ -22,18 +22,6 @@ logger.info("Ocr PDF service has started") -try: - sentry_sdk.init( - os.environ.get("SENTRY_OCR_DSN"), - traces_sample_rate=0.1, - environment=os.environ.get("ENVIRONMENT", "development"), - ) - app.add_middleware(SentryAsgiMiddleware) -except Exception: - pass - - - try: sentry_sdk.init( os.environ.get('SENTRY_OCR_DSN'), From 3b0d1d1e8d73bc9b0264c12e115e341a7d5b3f18 Mon Sep 17 00:00:00 2001 From: Sergio Revilla Date: Fri, 8 Jul 2022 12:33:09 +0200 Subject: [PATCH 7/7] Linting --- src/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.py b/src/app.py index 38f14d9..daf39e9 100755 --- a/src/app.py +++ b/src/app.py @@ -24,7 +24,7 @@ try: sentry_sdk.init( - os.environ.get('SENTRY_OCR_DSN'), + os.environ.get("SENTRY_OCR_DSN"), traces_sample_rate=0.1, environment=os.environ.get("ENVIRONMENT", "development"), )