[11.10.20] Passing SynId through AMQ and logging, removed graphql query

This reverts commit aa8b22a8

Dockerfile

@@ -4,7 +4,7 @@ RUN apk update && \
     apk add py-pip libc-dev gcc
 RUN python -m pip install --upgrade pip
 RUN pip install utils pycryptodome && \
-    pip install python-dotenv coinbase flask schedule numpy stomp.py
+    pip install python-dotenv coinbase flask schedule numpy stomp.py python-json-logger
 COPY . /home/price-collector/.
 EXPOSE 9090
 CMD ["python", "/home/price-collector/src/main.py"]

configuration/kubernetes/deployment.yaml

@@ -60,11 +60,6 @@ spec:
               secretKeyRef:
                 name: amq
                 key: amq.password
-          - name: DATABASE_PORT
-            valueFrom:
-              secretKeyRef:
-                name: endpoints
-                key: dbGateway.port
           - name: COINBASE_KEY
             valueFrom:
               secretKeyRef:
@@ -77,7 +72,7 @@ spec:
                 key: coinbase.api.secret
           - name: DB_GATEWAY_URL
             valueFrom:
-              secretKeyRef:
+              configMapKeyRef:
                 name: endpoints
                 key: dbGateway.url
         ports:
@@ -104,10 +99,10 @@ spec:
         imagePullPolicy: Always
         resources:
           requests:
-            cpu: 32m
+            cpu: 25m
             memory: 32Mi
           limits:
-            cpu: 75m
+            cpu: 25m
             memory: 64Mi
         securityContext:
           capabilities:

configuration/pipelines/build.groovy

@@ -28,7 +28,7 @@ try {
     timestamps {
     node ("${env.SLAVE_LABEL}") {
         stage('Initialise') {
-            checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'Github', url: 'https://github.com/andyjk15/price-collector.git']]])
+            checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'Github', url: env.GIT_REPOSITORY_URL]]])
 
             env.APPLICATION_VERSION = get_application_version()
 
@@ -45,16 +45,7 @@ try {
             }
         }
 
-        stage('Test Artifact') {
-            try {
-//                mvn 'verify -DskipUTs -DskipTests'
-            } finally {
-//                mvn 'test'
-            }
-        }
-
         stage('Build Image') {
-//            mvn 'clean package -DskipTests'
 
             executeShellScript("configuration/scripts/mapVarsToConfigs.sh",
                     env.DIGITAL_OCEAN,
@@ -78,7 +69,6 @@ try {
 
         stage('Tag Repository') {
 
-
             withCredentials(
                     [usernamePassword(
                             credentialsId: env.GITHUB_CREDENTIALS_ID,

configuration/scripts/deployToKubernetes.sh

@@ -5,6 +5,4 @@ APPLICATION_NAME=$1
 kubectl apply -f configuration/kubernetes/deployment.yaml
 kubectl apply -f configuration/kubernetes/service.yaml
 
-kubectl get pods
-
 kubectl rollout status deployment/${APPLICATION_NAME} --namespace=production

src/main.py

@@ -6,6 +6,8 @@ sys.path.append('/home/price-collector/')
 from threading import Thread
 from pricing.collector import collectorMain
 
+from src.utils.jsonLogger import setup_logging
+
 from probes.probes import runFlaskProbes
 
 def callCollector(args):
@@ -15,6 +17,7 @@ def callProbes():
     runFlaskProbes()
 
 if __name__=='__main__':
+    setup_logging()
 
     Thread(target=callProbes).start()
 

src/pricing/collector.py

@@ -12,26 +12,19 @@ from pricing.exchanges.gemini import geminiPublicTicker, geminiVolAskBid, gemini
 from pricing.exchanges.bitstamp import bitstampVolAskBid, bitstampHighLow, bitstampOpenClose
 from pricing.exchanges.kraken import krakenVolAskBid, krakenHighLow, krakenOpenClose
 
-from src.utils.databaseConnect import send
+# from src.utils.databaseConnect import send
 from src.utils.activemqConnect import activeMQSender
 
-import logging as logger
+import json, uuid
 
-logger.basicConfig(
-    level=logger.INFO,
-    format="%(asctime)s: %(levelname)s -- %(message)s",
-    datefmt='%Y-%m-%d %H:%M:%S'
-)
-
-btc_usd="/home/price-collector/src/resources/queries/V1_INSERT_NEW_PRICE_RECORD_BTC.graphql"
-xmr_usd="/home/price-collector/src/resources/queries/V1_INSERT_NEW_PRICE_RECORD_XMR.graphql"
+from src.utils.jsonLogger import log
 
 def averager(type):
 
     timestamp = datetime.datetime.now() + datetime.timedelta(hours=1)
 
-    bitstampH, bitstampL = bitstampHighLow(type, logger)
-    krakenH, krakenL = krakenHighLow(type, logger)
+    bitstampH, bitstampL = bitstampHighLow(type, log)
+    krakenH, krakenL = krakenHighLow(type, log)
 
     bitstamp_P = (bitstampH + bitstampL)/2
     kraken_P = (krakenH + krakenL)/2
@@ -41,15 +34,15 @@ def averager(type):
 
     averagePrice = round(averagePrice, 2)
 
-    logger.info("Hourly Price for ({}) is {}".format(timestamp ,averagePrice))
+    log("Hourly Price for ({}) is {}".format(timestamp ,averagePrice), 'INFO')
 
     return averagePrice, timestamp
 
 def getVol(type):
-    bitV, bitA, bitB = bitstampVolAskBid(type, logger)
-    kV, kA, kB = krakenVolAskBid(type, logger)
-    bV, bA, bB = bitfinexVolAskBid(type, logger)
-    gV, gA, gB = geminiVolAskBid(type, logger)
+    bitV, bitA, bitB = bitstampVolAskBid(type, log)
+    kV, kA, kB = krakenVolAskBid(type, log)
+    bV, bA, bB = bitfinexVolAskBid(type, log)
+    gV, gA, gB = geminiVolAskBid(type, log)
 
     v_array = np.array([bitV, kV, bV, gV])
 
@@ -58,8 +51,8 @@ def getVol(type):
     return volume
 
 def getHighLow(type):
-    kH, kL = krakenHighLow(type, logger)
-    bH, bL = bitstampHighLow(type, logger)
+    kH, kL = krakenHighLow(type, log)
+    bH, bL = bitstampHighLow(type, log)
 
     h_array = np.array([kH, bH])
     l_array = np.array([kL, bL])
@@ -70,8 +63,8 @@ def getHighLow(type):
     return high, low
 
 def getOpenClose(type):
-    bO, bC = bitstampOpenClose(type, logger)
-    kO, kC = krakenOpenClose(type, logger)
+    bO, bC = bitstampOpenClose(type, log)
+    kO, kC = krakenOpenClose(type, log)
 
     o_array = np.array([bO, kO])
     c_array = np.array([bC, kC])
@@ -81,37 +74,37 @@ def getOpenClose(type):
 
     return open, close
 
-def sendToGateway(c_type, timestamp, av_price, high, low, vol, o_price, c_price):
+# def sendToGateway(c_type, timestamp, av_price, high, low, vol, o_price, c_price):
+#
+#     with open(btc_usd, 'r') as file:
+#         data = file.read()
+#
+#     strippedTimestamp = timestamp.replace(minute=0, second=0, microsecond=0)
+#     timestamp = '"'+strippedTimestamp.strftime('%Y-%m-%dT%H:%M:%S')+'"'
+#     type = '"'+c_type+'"'
+#
+#     query = data % (timestamp, type, round(av_price, 2),
+#                                     round(high, 2),
+#                                     round(low, 2),
+#                                     round(o_price, 2),
+#                                     round(c_price, 2),
+#                                     round(vol, 2))
+#
+#     log("Query sending down to db-gateway -- ({})".format(query), 'INFO')
 
-    with open(btc_usd, 'r') as file:
-        data = file.read()
+    # status, response = send(query, log)
 
-    strippedTimestamp = timestamp.replace(minute=0, second=0, microsecond=0)
-    timestamp = '"'+strippedTimestamp.strftime('%Y-%m-%dT%H:%M:%S')+'"'
-    type = '"'+c_type+'"'
-
-    query = data % (timestamp, type, round(av_price, 2),
-                                    round(high, 2),
-                                    round(low, 2),
-                                    round(o_price, 2),
-                                    round(c_price, 2),
-                                    round(vol, 2))
-
-    logger.info("Query sending down to db-gateway -- ({})".format(query))
-
-    status, response = send(query, logger)
-
-    if status != 200:
-        logger.critical("Query wasn't executed properly, view logs. Status = {}".format(status))
-        logger.error("With Response of : {}".format(response))
-    else:
-        logger.info("Query executed successfully with Status = {}".format(status))
-        logger.info("With Response of : {}".format(response))
+    # if status != 200:
+    #     log("Query wasn't executed properly, view logs. Status = {}".format(status), 'WARN')
+    #     log("With Response of : {}".format(response), 'ERR')
+    # else:
+    #     log("Query executed successfully with Status = {}".format(status), 'INFO')
+    #     log("With Response of : {}".format(response), 'INFO')
 
 def sentToArtemis(c_type, timestamp, av_price, high, low, vol, o_price, c_price):
 
     strippedTimestamp = timestamp.replace(minute=0, second=0, microsecond=0)
-    timestamp = '"'+strippedTimestamp.strftime('%Y-%m-%dT%H:%M:%S')+'"'
+    timestamp = strippedTimestamp.strftime('%Y-%m-%dT%H:%M:%S')
 
     message = {
         "timestamp" : timestamp,
@@ -124,10 +117,14 @@ def sentToArtemis(c_type, timestamp, av_price, high, low, vol, o_price, c_price)
         "volume" : vol
     }
 
-    logger.info("Sending message to PricingSave queue")
+    messageJson = json.dumps(message, indent = 4)
 
-    activeMQSender(message, logger)
+    syncId = uuid.uuid4()
 
+    log("Sending message to PricingSave queue", 'INFO', syncId)
+    log("Message: {}".format(message), 'INFO', syncId)
+
+    activeMQSender(messageJson, syncId)
 
 def timeFunction():
     global time
@@ -148,8 +145,6 @@ def collector(c_type):
     global time
     time = timeFunction()
 
-    print(time)
-
     av_price, timestamp = averager(c_type)
     vol = getVol(c_type)
     high, low = getHighLow(c_type)
@@ -160,9 +155,11 @@ def collector(c_type):
 
     schedule.every().hour.at(time).do(collector, c_type).tag("collector")
 
+    log("Collection will run again at {} every hour".format(time), 'INFO')
+
 # Dynamically Spin up Child process for each type wanting to track
 def collectorMain(c_type):
-    logger.info("== Historical Price Collector ==")
+    log("Starting Historical Price Collector", 'INFO')
 
     collector(c_type)
 

src/pricing/exchanges/bitfinex.py

@@ -2,7 +2,7 @@
 
 import requests, json, sys
 
-def bitfinexPublicTicker(type, logger):
+def bitfinexPublicTicker(type, log):
     try:
         uri = "https://api.bitfinex.com/v2/tickers?symbols=" + "t"+type.upper().replace('_', '')
 
@@ -13,11 +13,11 @@ def bitfinexPublicTicker(type, logger):
         price = round(price, 2)
         return price
     except KeyError as e:
-        logger.error("Bitfinex Spot Price Error: {}".format(e))
+        log("Bitfinex Spot Price Error: {}".format(e), 'ERR')
         price = 0
         return price
 
-def bitfinexVolAskBid(type, logger):
+def bitfinexVolAskBid(type, log):
 
     try:
         uri = "https://api.bitfinex.com/v2/tickers?symbols=" + "t"+type.upper().replace('_', '')
@@ -32,5 +32,5 @@ def bitfinexVolAskBid(type, logger):
 
         return vol, ask, bid
     except KeyError as e:
-        logger.error("Bitfinex High Low Volume Error: {}".format(e))
+        log("Bitfinex High Low Volume Error: {}".format(e), 'ERR')
         return 0, 0, 0

src/pricing/exchanges/bitstamp.py

@@ -2,7 +2,7 @@
 
 import requests, json, sys
 
-def bitstampVolAskBid(type, logger):
+def bitstampVolAskBid(type, log):
     try:
         uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/"
         response = requests.request("GET", uri)
@@ -14,10 +14,10 @@ def bitstampVolAskBid(type, logger):
 
         return vol, ask, bid
     except KeyError as e:
-        logger.error("Bitstamp Volume Ask Bid Error: {}".format(e))
+        log("Bitstamp Volume Ask Bid Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def bitstampOpenClose(type, logger):
+def bitstampOpenClose(type, log):
     try:
         uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/"
         response = requests.request("GET", uri)
@@ -28,10 +28,10 @@ def bitstampOpenClose(type, logger):
 
         return open, close
     except KeyError as e:
-        logger.error("Bitstamp Open Close Error: {}".format(e))
+        log("Bitstamp Open Close Error: {}".format(e), 'ERR')
         return 0, 0
 
-def bitstampHighLow(type, logger):
+def bitstampHighLow(type, log):
     try:
         uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/"
         response = requests.request("GET", uri)
@@ -42,5 +42,5 @@ def bitstampHighLow(type, logger):
 
         return high, low
     except KeyError as e:
-        logger.error("Bitstamp Open Close Error: {}".format(e))
+        log("Bitstamp Open Close Error: {}".format(e), 'ERR')
         return 0, 0

src/pricing/exchanges/coinbase.py

@@ -10,7 +10,7 @@ class keys():
         self.api_key = os.getenv('COINBASE_KEY')
         self.api_secret = os.getenv("COINBASE_SECRET")
 
-def coinbasePublicTicker(type, logger):
+def coinbasePublicTicker(type, log):
 
     api_key = keys().api_key
     api_secret = keys().api_secret
@@ -24,6 +24,6 @@ def coinbasePublicTicker(type, logger):
         price = round(price, 2)
         return price
     except KeyError as e:
-        logger.error("Coinbase Spot Price Error: {}".format(e))
+        log("Coinbase Spot Price Error: {}".format(e), 'ERR')
         price = 0
         return price

src/pricing/exchanges/gemini.py

@@ -2,7 +2,7 @@
 
 import requests, json, sys
 
-def geminiPublicTicker(type, logger):
+def geminiPublicTicker(type, log):
 
     try:
         uri = "https://api.gemini.com/v1/pubticker/" + type.lower().replace('_', '')
@@ -15,11 +15,11 @@ def geminiPublicTicker(type, logger):
 
         return price
     except KeyError as e:
-        logger.error("Gemini Spot Price Error: {}".format(e))
+        log("Gemini Spot Price Error: {}".format(e), 'ERR')
         price = 0
         return price
 
-def geminiVolAskBid(type, logger):
+def geminiVolAskBid(type, log):
     try:
         uri = "https://api.gemini.com/v2/ticker/" + type.lower().replace('_', '')
         response = requests.request("GET", uri)
@@ -36,20 +36,20 @@ def geminiVolAskBid(type, logger):
 
         return vol, ask, bid
     except KeyError as e:
-        logger.error("Gemini Volume Ask Bid Error: {}".format(e))
+        log("Gemini Volume Ask Bid Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def geminiDailyOpenClose(type, logger):
+def geminiDailyOpenClose(type, log):
     try:
         uri = "https://api.gemini.com/v2/ticker/" + type.lower().replace('_', '')
         response = requests.request("GET", uri)
         response = json.loads(response.text)
 
-        dailyOpen = round(float(response['open']), 2)
-        dailyClose = round(float(response['close']), 2)
+        open = round(float(response['open']), 2)
+        close = round(float(response['close']), 2)
 
         return open, close
     except KeyError as e:
-        logger.error("Gemini Open Close Error: {}".format(e))
+        log("Gemini Open Close Error: {}".format(e), 'ERR')
         sys.stdout.flush()
         return 0, 0

src/pricing/exchanges/kraken.py

@@ -21,7 +21,7 @@ def krakenCalculateOHLC(response):
 
     return fopen, fhigh, flow, fclose
 
-def krakenVolAskBid(type, logger):
+def krakenVolAskBid(type, log):
     try:
         uri = "https://api.kraken.com/0/public/Ticker?pair=" + type.upper().replace('_', '').replace('BTC', 'XBT')
         response = requests.request("GET", uri)
@@ -37,10 +37,10 @@ def krakenVolAskBid(type, logger):
 
         return vol, ask, bid
     except KeyError as e:
-        logger.error("Kraken Volume Ask Bid Error: {}".format(e))
+        log("Kraken Volume Ask Bid Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def krakenOpenClose(type, logger):
+def krakenOpenClose(type, log):
     try:
         uri = "https://api.kraken.com/0/public/OHLC?pair=" + type.upper().replace('_', '').replace('BTC', 'XBT') + "&?interval\=60"
         response = requests.request("GET", uri)
@@ -53,10 +53,10 @@ def krakenOpenClose(type, logger):
 
         return fopen, fclose
     except KeyError as e:
-        logger.error("Kraken Open Close Error: {}".format(e))
+        log("Kraken Open Close Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def krakenHighLow(type, logger):
+def krakenHighLow(type, log):
     try:
         uri = "https://api.kraken.com/0/public/OHLC?pair=" + type.upper().replace('_', '').replace('BTC', 'XBT') + "&?interval\=60"
         response = requests.request("GET", uri)
@@ -69,5 +69,5 @@ def krakenHighLow(type, logger):
 
         return fhigh, flow
     except KeyError as e:
-        logger.error("Kraken Open Close Error: {}".format(e))
+        log("Kraken Open Close Error: {}".format(e), 'ERR')
         return 0, 0

src/probes/probes.py

@@ -6,13 +6,6 @@ import json
 
 from pricing.exchanges.coinbase import coinbasePublicTicker
 
-import logging as logger
-logger.basicConfig(
-    level=logger.INFO,
-    format="%(asctime)s: %(levelname)s -- %(message)s",
-    datefmt='%Y-%m-%d %H:%M:%S'
-)
-
 app = Flask(__name__)
 
 @app.route('/health')
@@ -22,7 +15,7 @@ def health():
 @app.route('/readiness')
 def readiness():
     #   Can it make a call to an exchange?
-    price = coinbasePublicTicker('btc_usd', logger)
+    price = coinbasePublicTicker('btc_usd')
 
     if price != 0 :
         return json.dumps({

src/resources/queries/V1_INSERT_NEW_PRICE_RECORD_BTC.graphql

@@ -1 +0,0 @@
-mutation { createBtc(createdDate: %s, type: %s, average_price: %f, high_price: %f, low_price: %f, open_price: %f, close_price: %f, volume: %f){ id } }

src/utils/activemqConnect.py

@@ -3,6 +3,8 @@
 import stomp
 import os
 
+from src.utils.jsonLogger import log
+
 class keys():
 
     def __init__(self):
@@ -15,12 +17,20 @@ class keys():
     def returnKeys(self):
         return self.addr, self.port, self.amqU, self.amqP
 
-class activeMQSender(message, logger):
+def activeMQSender(message, syncId):
     addr, port, mqUser, mqPass = keys().returnKeys()
 
-    logger.info("Attempting Connection to Artemis...")
-    con = stomp.Connection([(addr, port)])
+    log("Attempting Connection to Artemis...", 'INFO', syncId)
+    con = stomp.Connection([(addr, port)], auto_content_length=False)
     con.connect( mqUser, mqPass, wait=True)
 
-    con.send('/queue/PricingSave', message)
+    con.send("PricingSave",
+             message,
+             content_type="application/json",
+             headers={
+                 "Content-Type":"application/json",
+                 "X-CRYPTO-Sync-ID":syncId
+             })
+
+    con.disconnect()
 

src/utils/databaseConnect.py

@@ -2,13 +2,14 @@
 
 import requests, os, json, sys
 
+from src.utils.jsonLogger import log
+
 class keys():
 
     def __init__(self):
         self.uri = os.getenv("DATABASE_URL")
-        self.port = os.getenv("DATABASE_PORT")
 
-def send(query, logger):
+def send(query):
     try:
         uri = keys().uri + "/graphql"
         headers = {'Content-type': 'application/json'}
@@ -20,8 +21,8 @@ def send(query, logger):
 
         return statusCode, response
     except requests.exceptions.HTTPError as e:
-        logger.critical("Unable to send data down to db-gateway: {}".format(e))
+        log("Unable to send data down to db-gateway: {}".format(e), 'ERR')
         sys.exit(1)
     except requests.exceptions.RequestException as e:
-        logger.critical("Unable to send data down to db-gateway: {}".format(e))
+        log("Unable to send data down to db-gateway: {}".format(e), 'ERR')
         sys.exit(1)

src/utils/jsonLogger.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+
+import logging
+from pythonjsonlogger import jsonlogger
+
+import datetime
+
+class CustomJsonFormatter(jsonlogger.JsonFormatter):
+    def add_fields(self, log_record, record, message_dict):
+        super(CustomJsonFormatter, self).add_fields(log_record, record, message_dict)
+        if not log_record.get('@timestamp'):
+            # this doesn't use record.created, so it is slightly off
+            now = datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%fZ')
+            log_record['@timestamp'] = now
+        if log_record.get('level'):
+            log_record['level'] = log_record['level'].upper()
+        else:
+            log_record['level'] = record.levelname
+
+def setup_logging(log_level='INFO'):
+    logger = logging.getLogger(__name__)
+    logger.propagate = 0
+    logger.setLevel(log_level)
+    logHandler = logging.StreamHandler()
+
+    formatter = CustomJsonFormatter('%(@timestamp)s %(level)s %(name)s %(message)s')
+
+    logHandler.setFormatter(formatter)
+    logger.addHandler(logHandler)
+
+def log(message, level, syncId=""):
+    logger = logging.getLogger(__name__)
+    if level == 'INFO':
+        logger.info(message, extra={"X-CRYPTO-Sync-ID" : syncId})
+    elif level == 'WARN':
+        logger.warn(message, extra={"X-CRYPTO-Sync-ID" : syncId})
+    elif level == 'ERR':
+        logger.error(message, extra={"X-CRYPTO-Sync-ID" : syncId})
+    elif level == 'DEBUG':
+        logger.debug(message, extra={"X-CRYPTO-Sync-ID" : syncId})