Resolve merge conflicts
This commit is contained in:
commit
fac4087a8d
1 changed files with 0 additions and 2 deletions
|
@ -36,7 +36,6 @@ from grpc_health.v1 import health_pb2_grpc
|
|||
from logger import getJSONLogger
|
||||
logger = getJSONLogger('recommendationservice-server')
|
||||
|
||||
|
||||
def initStackdriverProfiling():
|
||||
enable_profiler = None
|
||||
project_id = None
|
||||
|
@ -95,7 +94,6 @@ if __name__ == "__main__":
|
|||
logger.info("initializing recommendationservice")
|
||||
|
||||
initStackdriverProfiling()
|
||||
|
||||
try:
|
||||
sampler = always_on.AlwaysOnSampler()
|
||||
exporter = stackdriver_exporter.StackdriverExporter()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue