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

This reverts commit aa8b22a8

configuration/kubernetes/deployment.yaml

@@ -99,10 +99,10 @@ spec:
         imagePullPolicy: Always
         resources:
           requests:
-            cpu: 32m
+            cpu: 25m
             memory: 32Mi
           limits:
-            cpu: 75m
+            cpu: 25m
             memory: 64Mi
         securityContext:
           capabilities:

src/pricing/collector.py

@@ -12,22 +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 json
+import json, uuid
 
 from src.utils.jsonLogger import log
 
-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"
-
 def averager(type):
 
     timestamp = datetime.datetime.now() + datetime.timedelta(hours=1)
 
-    bitstampH, bitstampL = bitstampHighLow(type)
+    bitstampH, bitstampL = bitstampHighLow(type, log)
-    krakenH, krakenL = krakenHighLow(type)
+    krakenH, krakenL = krakenHighLow(type, log)
 
     bitstamp_P = (bitstampH + bitstampL)/2
     kraken_P = (krakenH + krakenL)/2
@@ -42,10 +39,10 @@ def averager(type):
     return averagePrice, timestamp
 
 def getVol(type):
-    bitV, bitA, bitB = bitstampVolAskBid(type)
+    bitV, bitA, bitB = bitstampVolAskBid(type, log)
-    kV, kA, kB = krakenVolAskBid(type)
+    kV, kA, kB = krakenVolAskBid(type, log)
-    bV, bA, bB = bitfinexVolAskBid(type)
+    bV, bA, bB = bitfinexVolAskBid(type, log)
-    gV, gA, gB = geminiVolAskBid(type)
+    gV, gA, gB = geminiVolAskBid(type, log)
 
     v_array = np.array([bitV, kV, bV, gV])
 
@@ -54,8 +51,8 @@ def getVol(type):
     return volume
 
 def getHighLow(type):
-    kH, kL = krakenHighLow(type)
+    kH, kL = krakenHighLow(type, log)
-    bH, bL = bitstampHighLow(type)
+    bH, bL = bitstampHighLow(type, log)
 
     h_array = np.array([kH, bH])
     l_array = np.array([kL, bL])
@@ -66,8 +63,8 @@ def getHighLow(type):
     return high, low
 
 def getOpenClose(type):
-    bO, bC = bitstampOpenClose(type)
+    bO, bC = bitstampOpenClose(type, log)
-    kO, kC = krakenOpenClose(type)
+    kO, kC = krakenOpenClose(type, log)
 
     o_array = np.array([bO, kO])
     c_array = np.array([bC, kC])
@@ -77,32 +74,32 @@ 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:
+    # status, response = send(query, log)
-        data = file.read()
 
-    strippedTimestamp = timestamp.replace(minute=0, second=0, microsecond=0)
+    # if status != 200:
-    timestamp = '"'+strippedTimestamp.strftime('%Y-%m-%dT%H:%M:%S')+'"'
+    #     log("Query wasn't executed properly, view logs. Status = {}".format(status), 'WARN')
-    type = '"'+c_type+'"'
+    #     log("With Response of : {}".format(response), 'ERR')
-
+    # else:
-    query = data % (timestamp, type, round(av_price, 2),
+    #     log("Query executed successfully with Status = {}".format(status), 'INFO')
-                                    round(high, 2),
+    #     log("With Response of : {}".format(response), 'INFO')
-                                    round(low, 2),
-                                    round(o_price, 2),
-                                    round(c_price, 2),
-                                    round(vol, 2))
-
-    log("Query sending down to db-gateway -- ({})".format(query), 'INFO')
-
-    status, response = send(query, log)
-
-    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):
 
@@ -122,10 +119,12 @@ def sentToArtemis(c_type, timestamp, av_price, high, low, vol, o_price, c_price)
 
     messageJson = json.dumps(message, indent = 4)
 
-    log("Sending message to PricingSave queue", 'INFO')
+    syncId = uuid.uuid4()
 
-    activeMQSender(messageJson)
+    log("Sending message to PricingSave queue", 'INFO', syncId)
+    log("Message: {}".format(message), 'INFO', syncId)
 
+    activeMQSender(messageJson, syncId)
 
 def timeFunction():
     global time
@@ -146,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)
@@ -158,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):
-    log("== Historical Price Collector ==", 'INFO')
+    log("Starting Historical Price Collector", 'INFO')
 
     collector(c_type)
 

src/pricing/exchanges/bitfinex.py

@@ -2,9 +2,7 @@
 
 import requests, json, sys
 
-from src.utils.jsonLogger import log
+def bitfinexPublicTicker(type, log):
-
-def bitfinexPublicTicker(type):
     try:
         uri = "https://api.bitfinex.com/v2/tickers?symbols=" + "t"+type.upper().replace('_', '')
 
@@ -19,7 +17,7 @@ def bitfinexPublicTicker(type):
         price = 0
         return price
 
-def bitfinexVolAskBid(type):
+def bitfinexVolAskBid(type, log):
 
     try:
         uri = "https://api.bitfinex.com/v2/tickers?symbols=" + "t"+type.upper().replace('_', '')

src/pricing/exchanges/bitstamp.py

@@ -2,9 +2,7 @@
 
 import requests, json, sys
 
-from src.utils.jsonLogger import log
+def bitstampVolAskBid(type, log):
-
-def bitstampVolAskBid(type):
     try:
         uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/"
         response = requests.request("GET", uri)
@@ -19,7 +17,7 @@ def bitstampVolAskBid(type):
         log("Bitstamp Volume Ask Bid Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def bitstampOpenClose(type):
+def bitstampOpenClose(type, log):
     try:
         uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/"
         response = requests.request("GET", uri)
@@ -33,7 +31,7 @@ def bitstampOpenClose(type):
         log("Bitstamp Open Close Error: {}".format(e), 'ERR')
         return 0, 0
 
-def bitstampHighLow(type):
+def bitstampHighLow(type, log):
     try:
         uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/"
         response = requests.request("GET", uri)

src/pricing/exchanges/coinbase.py

@@ -4,15 +4,13 @@ import sys, os
 
 from coinbase.wallet.client import Client
 
-from src.utils.jsonLogger import log
-
 class keys():
 
     def __init__(self):
         self.api_key = os.getenv('COINBASE_KEY')
         self.api_secret = os.getenv("COINBASE_SECRET")
 
-def coinbasePublicTicker(type):
+def coinbasePublicTicker(type, log):
 
     api_key = keys().api_key
     api_secret = keys().api_secret

src/pricing/exchanges/gemini.py

@@ -2,9 +2,7 @@
 
 import requests, json, sys
 
-from src.utils.jsonLogger import log
+def geminiPublicTicker(type, log):
-
-def geminiPublicTicker(type):
 
     try:
         uri = "https://api.gemini.com/v1/pubticker/" + type.lower().replace('_', '')
@@ -21,7 +19,7 @@ def geminiPublicTicker(type):
         price = 0
         return price
 
-def geminiVolAskBid(type):
+def geminiVolAskBid(type, log):
     try:
         uri = "https://api.gemini.com/v2/ticker/" + type.lower().replace('_', '')
         response = requests.request("GET", uri)
@@ -41,7 +39,7 @@ def geminiVolAskBid(type):
         log("Gemini Volume Ask Bid Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def geminiDailyOpenClose(type):
+def geminiDailyOpenClose(type, log):
     try:
         uri = "https://api.gemini.com/v2/ticker/" + type.lower().replace('_', '')
         response = requests.request("GET", uri)

src/pricing/exchanges/kraken.py

@@ -2,8 +2,6 @@
 
 import requests, json, sys
 
-from src.utils.jsonLogger import log
-
 def krakenCalculateOHLC(response):
     open, high, low, close = 0, 0, 0, 0
 
@@ -23,7 +21,7 @@ def krakenCalculateOHLC(response):
 
     return fopen, fhigh, flow, fclose
 
-def krakenVolAskBid(type):
+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)
@@ -42,7 +40,7 @@ def krakenVolAskBid(type):
         log("Kraken Volume Ask Bid Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def krakenOpenClose(type):
+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)
@@ -58,7 +56,7 @@ def krakenOpenClose(type):
         log("Kraken Open Close Error: {}".format(e), 'ERR')
         return 0, 0, 0
 
-def krakenHighLow(type):
+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)

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

@@ -17,14 +17,20 @@ class keys():
     def returnKeys(self):
         return self.addr, self.port, self.amqU, self.amqP
 
-def activeMQSender(message):
+def activeMQSender(message, syncId):
     addr, port, mqUser, mqPass = keys().returnKeys()
 
-    log("Attempting Connection to Artemis...", 'INFO')
+    log("Attempting Connection to Artemis...", 'INFO', syncId)
     con = stomp.Connection([(addr, port)], auto_content_length=False)
     con.connect( mqUser, mqPass, wait=True)
 
-    con.send("PricingSave", message, content_type="application/json", headers={"Content-Type":"application/json"})
+    con.send("PricingSave",
+             message,
+             content_type="application/json",
+             headers={
+                 "Content-Type":"application/json",
+                 "X-CRYPTO-Sync-ID":syncId
+             })
 
     con.disconnect()
 

src/utils/jsonLogger.py

@@ -8,10 +8,10 @@ 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'):
+        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
+            log_record['@timestamp'] = now
         if log_record.get('level'):
             log_record['level'] = log_record['level'].upper()
         else:
@@ -23,18 +23,18 @@ def setup_logging(log_level='INFO'):
     logger.setLevel(log_level)
     logHandler = logging.StreamHandler()
 
-    formatter = CustomJsonFormatter('%(timestamp)s %(level)s %(name)s %(message)s')
+    formatter = CustomJsonFormatter('%(@timestamp)s %(level)s %(name)s %(message)s')
 
     logHandler.setFormatter(formatter)
     logger.addHandler(logHandler)
 
-def log(message, level):
+def log(message, level, syncId=""):
     logger = logging.getLogger(__name__)
     if level == 'INFO':
-        logger.info(message)
+        logger.info(message, extra={"X-CRYPTO-Sync-ID" : syncId})
     elif level == 'WARN':
-        logger.warn(message)
+        logger.warn(message, extra={"X-CRYPTO-Sync-ID" : syncId})
     elif level == 'ERR':
-        logger.error(message)
+        logger.error(message, extra={"X-CRYPTO-Sync-ID" : syncId})
     elif level == 'DEBUG':
-        logger.debug(message)
+        logger.debug(message, extra={"X-CRYPTO-Sync-ID" : syncId})