vbatts/microservices-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Resolve merge conflicts

Browse source
This commit is contained in:
Kalyana Chadalavada 2019-04-11 19:48:49 -07:00
commit ee5b7c1495
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/emailservice/key.json Normal file
View file

@ -0,0 +1,12 @@
{
"type": "service_account",
"project_id": "kchadalavada-misc",
"private_key_id": "b88d9758992b7b61fba5e40d2f7829a5df40baf9",
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDoIvAOhNZt7ZRj\nLM8/vdXBU55bvPv04JKtfT70GjBiRCjWjuBeotfEFWwW5OM3uTgtwvfABb90p/lt\n3hbvBS2Fo3h2jTkriHa4ED6pysqg/X3wGAhIc6O53MqUOrnNSy0S6Mwm4L+eMSEx\nw0PSv7qDqPfI0fTDEasaKpjhRjL8rB2a56YC25Gx1sj10OdFpYkZF4+qctLCyMqb\n5yTMuSyA7T+9+eCtwfUKz3RyJMxwH+MCqjVKJG7xXM9hJyUWRCjReyjiPXxcHCbs\nAOzfsdLUpdmeN+c+Hi31KEhjrY1MKXPEqZOpmkCy0cy/JiWv+EQlkLtDquNJafrX\nDvrwX7ZTAgMBAAECggEAXyICU1DpN7/HsiUpAixgL4x/N4VplF98fRD4/bzF21+n\nhNak6OO/nSJSW8eNvsZvWYGvWsiAP+Se+gGsUGRE1aG6uosBxO92B9TQeXEcPYHl\nXMHckyShEoiDlN/ESXfnjvpMwBoXLVNhES2+292rKE3Uzj4NGuxgvKZ8ZMYKGzX+\nOQtPKUfVy712uB/aF8yk3uVhlGJBuCVoDDiCThoAWAwxrDZFa4D4b7Kd7haYSoAw\n+RZzxB25ViFxektOheDZ4RRkRpUZf3IuBIGYToSTZUb9kgqRjSfIpbJ8g7x4l2dM\nYu2z0j+735AWA0RA3U5P+dF7MGn501ms5It0PQVAIQKBgQD78rqJhOVo6uIx73w7\nqyAxmVv0XF+Q+NtZHgRuVKC1/wY9ksGkptpm3M6I7lZsFxccKsAkzX8JVMKCbAbh\nRanGm5TUOuljM9qQN8tMc6AM99wOj/XU6afc/ijSTcV8eNnwGfBFuU+eSgFB6kl1\ncFB0ZvlfahknTsVPz+KtE/CjewKBgQDr3qTw1OZAE5Pb2M1lSF7T5A9nb6qKrsVQ\nOt+BUKac9R2ILe1bj0dxp53tn8k05GuCmpzLA93KiKe5kC3F3zYh6TSvyR1PT4eO\nSl/JaDDxLO0lusdnVeESewTaqTe6UVavIP3A2inTUDRSwPA+/43CSNypvkJ3li9Q\nBKJksby1CQKBgQDC76xaiKPDiLDYuBYkSKRRG/pk2C/tCE8W5b3B6+Kozhfy/iCr\nl5m2KrP2iIn/eeIcngsqroDTJGyW4qR0GiVhELGXf7liUxWRrkmy7mdwgToXXlVz\nlhGWUGQfS6M4Sn09Y6RfHiE3NMVCTdbmca8eUSozI/EwU6cguJUHGz1+DwKBgBcB\nSCUVHr/xKOKwapgOTvFrtPTpt0B/e08v7sy2CQoV/iNiF1xuxREYwBaFFyLJhJLg\ncZp7bg5q9bDrlwtNkgIMtM7QVsN9hkMijeUe/GcJcrfTV8+EWMdsqDSLfJv3gvTh\nyt4caSfrEq9fkg8S7cidQqhrnh/7zfGIAi7ABx/BAoGBALlliOD25QyWATB/gb/r\nNNinDeIb389NLkY1sgL7DqP5z5rIX2hj52HxaoIb5pLkH9MC051rRZWd1BlIRW2i\nIympGlanI8Dst7wwyO93m/fSavECfS4tEABeqvVB06AsLN61WDD/4A+xfwl61D42\nVTarsbI3OVEUUUTeeNN53jeO\n-----END PRIVATE KEY-----\n",
"client_email": "profsvcaccnt@kchadalavada-misc.iam.gserviceaccount.com",
"client_id": "104915287304547845415",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/profsvcaccnt%40kchadalavada-misc.iam.gserviceaccount.com"
}

12
src/recommendationservice/key.json Normal file
View file

@ -0,0 +1,12 @@
{
"type": "service_account",
"project_id": "kchadalavada-misc",
"private_key_id": "b88d9758992b7b61fba5e40d2f7829a5df40baf9",
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDoIvAOhNZt7ZRj\nLM8/vdXBU55bvPv04JKtfT70GjBiRCjWjuBeotfEFWwW5OM3uTgtwvfABb90p/lt\n3hbvBS2Fo3h2jTkriHa4ED6pysqg/X3wGAhIc6O53MqUOrnNSy0S6Mwm4L+eMSEx\nw0PSv7qDqPfI0fTDEasaKpjhRjL8rB2a56YC25Gx1sj10OdFpYkZF4+qctLCyMqb\n5yTMuSyA7T+9+eCtwfUKz3RyJMxwH+MCqjVKJG7xXM9hJyUWRCjReyjiPXxcHCbs\nAOzfsdLUpdmeN+c+Hi31KEhjrY1MKXPEqZOpmkCy0cy/JiWv+EQlkLtDquNJafrX\nDvrwX7ZTAgMBAAECggEAXyICU1DpN7/HsiUpAixgL4x/N4VplF98fRD4/bzF21+n\nhNak6OO/nSJSW8eNvsZvWYGvWsiAP+Se+gGsUGRE1aG6uosBxO92B9TQeXEcPYHl\nXMHckyShEoiDlN/ESXfnjvpMwBoXLVNhES2+292rKE3Uzj4NGuxgvKZ8ZMYKGzX+\nOQtPKUfVy712uB/aF8yk3uVhlGJBuCVoDDiCThoAWAwxrDZFa4D4b7Kd7haYSoAw\n+RZzxB25ViFxektOheDZ4RRkRpUZf3IuBIGYToSTZUb9kgqRjSfIpbJ8g7x4l2dM\nYu2z0j+735AWA0RA3U5P+dF7MGn501ms5It0PQVAIQKBgQD78rqJhOVo6uIx73w7\nqyAxmVv0XF+Q+NtZHgRuVKC1/wY9ksGkptpm3M6I7lZsFxccKsAkzX8JVMKCbAbh\nRanGm5TUOuljM9qQN8tMc6AM99wOj/XU6afc/ijSTcV8eNnwGfBFuU+eSgFB6kl1\ncFB0ZvlfahknTsVPz+KtE/CjewKBgQDr3qTw1OZAE5Pb2M1lSF7T5A9nb6qKrsVQ\nOt+BUKac9R2ILe1bj0dxp53tn8k05GuCmpzLA93KiKe5kC3F3zYh6TSvyR1PT4eO\nSl/JaDDxLO0lusdnVeESewTaqTe6UVavIP3A2inTUDRSwPA+/43CSNypvkJ3li9Q\nBKJksby1CQKBgQDC76xaiKPDiLDYuBYkSKRRG/pk2C/tCE8W5b3B6+Kozhfy/iCr\nl5m2KrP2iIn/eeIcngsqroDTJGyW4qR0GiVhELGXf7liUxWRrkmy7mdwgToXXlVz\nlhGWUGQfS6M4Sn09Y6RfHiE3NMVCTdbmca8eUSozI/EwU6cguJUHGz1+DwKBgBcB\nSCUVHr/xKOKwapgOTvFrtPTpt0B/e08v7sy2CQoV/iNiF1xuxREYwBaFFyLJhJLg\ncZp7bg5q9bDrlwtNkgIMtM7QVsN9hkMijeUe/GcJcrfTV8+EWMdsqDSLfJv3gvTh\nyt4caSfrEq9fkg8S7cidQqhrnh/7zfGIAi7ABx/BAoGBALlliOD25QyWATB/gb/r\nNNinDeIb389NLkY1sgL7DqP5z5rIX2hj52HxaoIb5pLkH9MC051rRZWd1BlIRW2i\nIympGlanI8Dst7wwyO93m/fSavECfS4tEABeqvVB06AsLN61WDD/4A+xfwl61D42\nVTarsbI3OVEUUUTeeNN53jeO\n-----END PRIVATE KEY-----\n",
"client_email": "profsvcaccnt@kchadalavada-misc.iam.gserviceaccount.com",
"client_id": "104915287304547845415",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/profsvcaccnt%40kchadalavada-misc.iam.gserviceaccount.com"
}

2
src/recommendationservice/recommendation_server.py
View file

@ -36,7 +36,6 @@ from grpc_health.v1 import health_pb2_grpc
from logger import getJSONLogger from logger import getJSONLogger
logger = getJSONLogger('recommendationservice-server') logger = getJSONLogger('recommendationservice-server')
def initStackdriverProfiling(): def initStackdriverProfiling():
enable_profiler = None enable_profiler = None
project_id = None project_id = None
@ -95,7 +94,6 @@ if __name__ == "__main__":
logger.info("initializing recommendationservice") logger.info("initializing recommendationservice")
initStackdriverProfiling() initStackdriverProfiling()
try: try:
sampler = always_on.AlwaysOnSampler() sampler = always_on.AlwaysOnSampler()
exporter = stackdriver_exporter.StackdriverExporter() exporter = stackdriver_exporter.StackdriverExporter()