From 04b2084779f8d53bea0e036ed7aefef252c6eddb Mon Sep 17 00:00:00 2001
From: Megan O'Keefe <3137106+askmeegs@users.noreply.github.com>
Date: Tue, 17 Dec 2019 13:41:59 -0500
Subject: [PATCH] [WIP] Fixes emailservice CrashLoop when Workload Identity is
 enabled (#280)

* Adds explicit PROJECT_ID for stackdriver exporter

* save work

* cleanup
---
 kubernetes-manifests/emailservice.yaml             | 5 ++---
 src/emailservice/email_server.py                   | 4 +++-
 src/recommendationservice/recommendation_server.py | 7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml
index 2ae3823..14d293b 100644
--- a/kubernetes-manifests/emailservice.yaml
+++ b/kubernetes-manifests/emailservice.yaml
@@ -34,6 +34,8 @@ spec:
         env:
         - name: PORT
           value: "8080"
+        - name: ENABLE_PROFILER
+          value: "0"
         readinessProbe:
           periodSeconds: 5
           exec:
@@ -42,9 +44,6 @@ spec:
           periodSeconds: 5
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:8080"]
-        env:
-        - name: ENABLE_PROFILER
-          value: "0"
         resources:
           requests:
             cpu: 100m
diff --git a/src/emailservice/email_server.py b/src/emailservice/email_server.py
index 5af5ff9..9563b7a 100644
--- a/src/emailservice/email_server.py
+++ b/src/emailservice/email_server.py
@@ -37,7 +37,9 @@ import googlecloudprofiler
 
 try:
     sampler = always_on.AlwaysOnSampler()
-    exporter = stackdriver_exporter.StackdriverExporter()
+    exporter = stackdriver_exporter.StackdriverExporter(
+        project_id=os.environ.get('GCP_PROJECT_ID'),
+        transport=AsyncTransport)
     tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter)
 except:
     tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
diff --git a/src/recommendationservice/recommendation_server.py b/src/recommendationservice/recommendation_server.py
index 357f25f..c4e8fe6 100644
--- a/src/recommendationservice/recommendation_server.py
+++ b/src/recommendationservice/recommendation_server.py
@@ -99,7 +99,9 @@ if __name__ == "__main__":
 
     try:
         sampler = always_on.AlwaysOnSampler()
-        exporter = stackdriver_exporter.StackdriverExporter()
+        exporter = stackdriver_exporter.StackdriverExporter(
+            project_id=os.environ.get('GCP_PROJECT_ID'),
+            transport=AsyncTransport)
         tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter)
     except:
         tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
@@ -123,7 +125,8 @@ if __name__ == "__main__":
     product_catalog_stub = demo_pb2_grpc.ProductCatalogServiceStub(channel)
 
     # create gRPC server
-    server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) # ,interceptors=(tracer_interceptor,))
+    server = grpc.server(futures.ThreadPoolExecutor(max_workers=10),
+                      interceptors=(tracer_interceptor,))
 
     # add class to gRPC server
     service = RecommendationService()