From ecd4e1c4a90ae7521172021f2ad229c4be48ee34 Mon Sep 17 00:00:00 2001 From: ElDuderinos Date: Sun, 10 Sep 2023 11:32:43 +0300 Subject: [PATCH 1/5] remove sentry --- app.py | 7 ------- requirements.txt | 1 - 2 files changed, 8 deletions(-) diff --git a/app.py b/app.py index 8116eb9..3ab9f82 100644 --- a/app.py +++ b/app.py @@ -6,19 +6,12 @@ from datetime import datetime from random import randint from todos_store import Store -import sentry_sdk -from sentry_sdk.integrations.flask import FlaskIntegration from jaeger_client import Config from flask_opentracing import FlaskTracer from utils.logging import on_add_todo_logging, on_get_todos_logging import os from flask import send_from_directory -sentry_sdk.init( - dsn="https://2acefaf842814814848afd40457bc55d@sentry.io/1381062", - integrations=[FlaskIntegration()] -) - app = flask.Flask(__name__, static_url_path='/static') diff --git a/requirements.txt b/requirements.txt index 587a7ae..65f4a9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ rook>=0.1.209 flask>=1.0,<=2.0 -sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing jaeger-client protobuf>=3.18.3 # not directly required, pinned by Snyk to avoid a vulnerability From 544c5b7afb4f4e47bb3aa97916cd3b6aa893e8f0 Mon Sep 17 00:00:00 2001 From: ElDuderinos Date: Sun, 10 Sep 2023 13:26:35 +0300 Subject: [PATCH 2/5] update test file --- .jenkins/Jenkinsfile.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jenkins/Jenkinsfile.test b/.jenkins/Jenkinsfile.test index c90b17c..c6faa8e 100644 --- a/.jenkins/Jenkinsfile.test +++ b/.jenkins/Jenkinsfile.test @@ -1,7 +1,7 @@ regressionTest { FILE_PATH = "app.py" - LINE_NUM = "114" - SHA = "27b674504743b0c2472db804da5e6e7234d8bbd4b274f3c8db2903de1e9e3bd2" + LINE_NUM = "107" + SHA = "f99c3428d6fa01c7adfd68dfb47587c2792f6b65065b838372398f85f527a4d4" LANG = "Python" BACKGROUND_IMAGE_CMD = "python /app/app.py &" URL_FOR_TRIGGER = "http://localhost:5000/todos" From b88b1d82600f3f810fb58a89054efd39651fc145 Mon Sep 17 00:00:00 2001 From: ElDuderinos Date: Wed, 27 Sep 2023 11:20:13 +0300 Subject: [PATCH 3/5] keep line numbers --- .jenkins/Jenkinsfile.test | 4 ++-- app.py | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.jenkins/Jenkinsfile.test b/.jenkins/Jenkinsfile.test index c6faa8e..79de061 100644 --- a/.jenkins/Jenkinsfile.test +++ b/.jenkins/Jenkinsfile.test @@ -1,7 +1,7 @@ regressionTest { FILE_PATH = "app.py" - LINE_NUM = "107" - SHA = "f99c3428d6fa01c7adfd68dfb47587c2792f6b65065b838372398f85f527a4d4" + LINE_NUM = "114" + SHA = "6a0216b2ff0d49088339c6dc9578564ffc5c664c63a52ab47e4d285dc064ef0a" LANG = "Python" BACKGROUND_IMAGE_CMD = "python /app/app.py &" URL_FOR_TRIGGER = "http://localhost:5000/todos" diff --git a/app.py b/app.py index 3ab9f82..e0ee2bf 100644 --- a/app.py +++ b/app.py @@ -6,12 +6,19 @@ from datetime import datetime from random import randint from todos_store import Store +import sentry_sdk + from jaeger_client import Config from flask_opentracing import FlaskTracer from utils.logging import on_add_todo_logging, on_get_todos_logging import os from flask import send_from_directory + + + + + app = flask.Flask(__name__, static_url_path='/static') From 88919ba4f8bc7a9d10134e6c156cfb3bd52f5e87 Mon Sep 17 00:00:00 2001 From: ElDuderinos Date: Wed, 27 Sep 2023 11:58:11 +0300 Subject: [PATCH 4/5] more cleanup --- app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.py b/app.py index e0ee2bf..498207f 100644 --- a/app.py +++ b/app.py @@ -6,7 +6,7 @@ from datetime import datetime from random import randint from todos_store import Store -import sentry_sdk + from jaeger_client import Config from flask_opentracing import FlaskTracer From 8fb85fb727f55e8f670560d5149a61ce90df0305 Mon Sep 17 00:00:00 2001 From: ElDuderinos Date: Wed, 27 Sep 2023 11:58:47 +0300 Subject: [PATCH 5/5] update sha --- .jenkins/Jenkinsfile.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins/Jenkinsfile.test b/.jenkins/Jenkinsfile.test index 79de061..f7d992a 100644 --- a/.jenkins/Jenkinsfile.test +++ b/.jenkins/Jenkinsfile.test @@ -1,7 +1,7 @@ regressionTest { FILE_PATH = "app.py" LINE_NUM = "114" - SHA = "6a0216b2ff0d49088339c6dc9578564ffc5c664c63a52ab47e4d285dc064ef0a" + SHA = "3658556546f8bb925e5be01da38432f0a924d48f9c05bfbe0c40981dbf34ca66" LANG = "Python" BACKGROUND_IMAGE_CMD = "python /app/app.py &" URL_FOR_TRIGGER = "http://localhost:5000/todos"