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 fac4087a8d
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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()