Merge branch 'develop'

.coveragerc

@@ -1,5 +1,6 @@
 [run]
 include=
     *project/*
+    *pyms/*
 omit =
     venv/*

Dockerfile

@@ -1,17 +1,19 @@
 FROM python:3.6.4-alpine3.7
 
-RUN apk add --update curl gcc g++ libffi-dev openssl-dev python3-dev \
+RUN apk add --update curl gcc g++ git libffi-dev openssl-dev python3-dev \
     && rm -rf /var/cache/apk/*
 RUN ln -s /usr/include/locale.h /usr/include/xlocale.h
 
 ENV PYTHONUNBUFFERED=1 ENVIRONMENT=pre APP_HOME=/microservice/
+RUN mkdir $APP_HOME && adduser -S -D -H python
 
-RUN mkdir $APP_HOME
+RUN chown -R python $APP_HOME
 WORKDIR $APP_HOME
 ADD requirement*.txt $APP_HOME
 RUN pip install -r requirements-docker.txt
 ADD . $APP_HOME
 
 EXPOSE 5000
+USER python
 
 CMD ["gunicorn", "--worker-class", "eventlet", "--workers", "8", "--log-level", "INFO", "--bind", "0.0.0.0:5000", "manage:app"]

project/__init__.py

@@ -4,10 +4,13 @@
 
 from flasgger import Swagger
 from flask import Flask
-from flask_opentracing import FlaskTracer
-from jaeger_client import Config
+from flask_injector import FlaskInjector
+from injector import Injector
 
 from project.config import CONFIG
+from pyms.healthcheck import healthcheck_blueprint
+from pyms.models import db
+from pyms.tracer.main import TracerModule
 
 __author__ = "Alberto Vara"
 __email__ = "a.vara.1986@gmail.com"
@@ -47,24 +50,13 @@
 }
 
 
-def init_jaeger_tracer(service_name='your-app-name'):
-    """This scaffold is configured whith `Jeager <https://github.com/jaegertracing/jaeger>`_ but you can use
-    one of the `opentracing tracers <http://opentracing.io/documentation/pages/supported-tracers.html>`_
-    :param service_name: the name of your application to register in the tracer
-    :return: opentracing.Tracer
-    """
-    config = Config(config={
-        'sampler': {'type': 'const', 'param': 1}
-    }, service_name=service_name)
-    return config.initialize_tracer()
-
-
 class PrefixMiddleware(object):
     """Set a prefix path to all routes. This action is needed if you have a stack of microservices and each of them
     exist in the same domain but different path. Por example:
     * mydomain.com/ms1/
     * mydomain.com/ms2/
     """
+
     def __init__(self, app, prefix=''):
         self.app = app
         self.prefix = prefix
@@ -86,20 +78,14 @@ def create_app():
     return the app and the database objects.
     :return:
     """
-    from project.models import db
+
     from project.views import views_bp as views_blueprint
-    from project.views import views_hc as views_hc_blueprint
     environment = os.environ.get("ENVIRONMENT", "default")
 
     app = Flask(__name__)
     app.config.from_object(CONFIG[environment])
     app.wsgi_app = PrefixMiddleware(app.wsgi_app, prefix=app.config["APPLICATION_ROOT"])
 
-
-    if not app.config["TESTING"] and not app.config["DEBUG"]:
-        j_tracer = init_jaeger_tracer(app.config["APP_NAME"])
-        FlaskTracer(j_tracer, True, app)
-
     db.init_app(app)
 
     # Initialize Swagger
@@ -119,7 +105,13 @@ def create_app():
 
     # Initialize Blueprints
     app.register_blueprint(views_blueprint)
-    app.register_blueprint(views_hc_blueprint)
+    app.register_blueprint(healthcheck_blueprint)
+
+    # Inject Modules
+    if not app.config["TESTING"] and not app.config["DEBUG"]:
+        injector = Injector([TracerModule(app)])
+        FlaskInjector(app=app, injector=injector)
+
     with app.test_request_context():
         db.create_all()
     return app, db

project/config.py

@@ -28,7 +28,6 @@ class DevConfig(Config):
     """Configuration to run in local environments"""
 
     DEBUG = True
-    TESTING = True
     SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(BASE_DIR, "db.sqlite3")
 
 

project/models/__init__.py

@@ -1,6 +0,0 @@
-# encoding: utf-8
-from __future__ import absolute_import, print_function, unicode_literals
-
-from flask_sqlalchemy import SQLAlchemy
-
-db = SQLAlchemy()

project/models/models.py

@@ -5,7 +5,7 @@
 
 from sqlalchemy import Column, Integer, String, DateTime
 
-from project.models import db
+from pyms.models import db
 
 
 def dump_datetime(value: datetime) -> list:

project/views/__init__.py

@@ -4,6 +4,5 @@
 from flask import Blueprint
 
 views_bp = Blueprint('views', __name__, static_url_path='/static')
-views_hc = Blueprint('healthcheck', __name__, static_url_path='/static')
 
-from project.views import views, healthcheck
+from project.views import views

project/views/views.py

@@ -3,7 +3,8 @@
 
 from flask import request, jsonify
 
-from project.models.models import db, Colors
+from pyms.models import db
+from project.models.models import Colors
 from project.views import views_bp
 
 

pyms/healthcheck/__init__.py

@@ -0,0 +1,8 @@
+# coding=utf-8
+from __future__ import unicode_literals, print_function, absolute_import, division
+
+from flask import Blueprint
+
+healthcheck_blueprint = Blueprint('healthcheck', __name__, static_url_path='/static')
+
+from pyms.healthcheck import healthcheck

pyms/healthcheck/healthcheck.py

@@ -0,0 +1,17 @@
+import opentracing
+import requests
+from flask_opentracing import FlaskTracer
+
+from pyms.healthcheck import healthcheck_blueprint
+
+
+@healthcheck_blueprint.route('/healthcheck', methods=['GET'])
+def healthcheck(tracer: FlaskTracer):
+    span = tracer.get_span()
+    headers = {}
+    tracer._tracer.inject(span, opentracing.Format.HTTP_HEADERS, headers)
+    result = requests.post(url="http://localhost:8081/oauth/login", data={
+        "username": "test",
+        "password": "1234"
+    }, headers=headers)
+    return result.content

pyms/models/__init__.py

@@ -0,0 +1,6 @@
+# encoding: utf-8
+from __future__ import absolute_import, print_function, unicode_literals
+
+from flask_sqlalchemy import SQLAlchemy
+
+db = SQLAlchemy()

pyms/tracer/main.py

@@ -0,0 +1,24 @@
+from flask_opentracing import FlaskTracer
+from injector import Module
+from jaeger_client import Config
+
+
+def init_jaeger_tracer(service_name='your-app-name'):
+    """This scaffold is configured whith `Jeager <https://github.com/jaegertracing/jaeger>`_ but you can use
+    one of the `opentracing tracers <http://opentracing.io/documentation/pages/supported-tracers.html>`_
+    :param service_name: the name of your application to register in the tracer
+    :return: opentracing.Tracer
+    """
+    config = Config(config={
+        'sampler': {'type': 'const', 'param': 1}, 'logging': True,
+    }, service_name=service_name)
+    return config.initialize_tracer()
+
+
+class TracerModule(Module):
+    def __init__(self, app):
+        self.app = app
+
+    def configure(self, binder):
+        tracer = init_jaeger_tracer(self.app.config["APP_NAME"])
+        binder.bind(FlaskTracer, to=FlaskTracer(tracer, True, self.app))

requirements.txt

@@ -1,9 +1,10 @@
+-e git+https://github.com/jaegertracing/jaeger-client-python.git#egg=jaeger_client
 flasgger==0.8.1
 Flask==0.12.2
+Flask-Injector==0.10.1
 Flask-OpenTracing==0.1.8
 Flask-Script==2.0.6
 Flask-SQLAlchemy==2.3.2
 Flask-Testing==0.7.1
 SQLAlchemy==1.2.5
 requests==2.18.4
-jaeger-client==3.7.1