Support kubectl apply steps

README_GCP.md

@@ -38,7 +38,7 @@ gcloud projects add-iam-policy-binding ${GCLOUD_PROJECT} \
     --role "roles/cloudtrace.agent"
 gcloud iam service-accounts add-iam-policy-binding opentelemetry-demo@${GCLOUD_PROJECT}.iam.gserviceaccount.com \
     --role roles/iam.workloadIdentityUser \
-    --member "serviceAccount:${GCLOUD_PROJECT}.svc.id.goog[default/opentelemetry-demo]"
+    --member "serviceAccount:${GCLOUD_PROJECT}.svc.id.goog[otel-demo/opentelemetry-demo-otelcol]"
 ```
 
 Update [`gcp-config-valus.yml`](gcp-config-values.yml) to annotate the
@@ -57,9 +57,31 @@ service account and annotate it to use Workload Identity.
 Follow the [OpenTelemetry docs to run the Helm chart](https://opentelemetry.io/docs/demo/kubernetes-deployment):
 
 ```console
+kubectl create namespace otel-demo
 helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
 helm repo update
-helm install my-otel-demo open-telemetry/opentelemetry-demo --values gcp-config-values.yml --version 0.29.1
+helm install my-otel-demo open-telemetry/opentelemetry-demo --namespace otel-demo --values gcp-config-values.yml --version 0.29.1
+```
+
+### (Alternative) Using `kubectl apply`
+
+Installing with the Helm chart is recommended, but you can also use `kubectl
+apply` to install the manifests directly.
+
+First, make sure you have followed the Workload Identity setup steps above.
+
+Update
+[`kubernetes/opentelemetry-demo.yaml`](kubernetes/opentelemetry-demo.yaml) to
+annotate the Kubernetes service account with your project:
+
+```console
+sed -i "s/%GCLOUD_PROJECT%/${GCLOUD_PROJECT}/g" ./kubernetes/opentelemetry-demo.yaml
+```
+
+Install the manifests:
+
+```console
+kubectl apply -n otel-demo -f ./kubernetes/opentelemetry-demo.yaml
 ```
 
 ## Running on GCE

gcp-config-values.yml

@@ -21,7 +21,7 @@
   serviceAccount:
     create: true
     annotations: {"iam.gke.io/gcp-service-account":"opentelemetry-demo@%GCLOUD_PROJECT%.iam.gserviceaccount.com"}
-    name: "opentelemetry-demo"
+    name: "opentelemetry-demo-otelcol"
 
   config:
     processors:
@@ -76,8 +76,8 @@
           exporters: [googlecloud]
         traces:
           processors: [memory_limiter, resourcedetection, resource, batch]
           exporters: [googlecloud] #spanmetrics disabled
         metrics:
           receivers: [otlp] #spanmetrics disabled
           processors: [filter/currency, memory_limiter, resourcedetection, transform/collision, resource, batch]
           exporters: [googlemanagedprometheus]

kubernetes/opentelemetry-demo.yaml

@@ -35,6 +35,8 @@ kind: ServiceAccount
 metadata:
   name: opentelemetry-demo-otelcol
   namespace: otel-demo
+  annotations:
+    iam.gke.io/gcp-service-account: "opentelemetry-demo@%GCLOUD_PROJECT%.iam.gserviceaccount.com"
   labels:
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: opentelemetry-demo
@@ -179,10 +181,21 @@ data:
         endpoint: http://opentelemetry-demo-prometheus-server:9090/api/v1/otlp
         tls:
           insecure: true
+
+      googlecloud:
+        log:
+          default_log_name: opentelemetry.io/opentelemetry-demo
+
+      googlemanagedprometheus:
+
     extensions:
       health_check: {}
     processors:
-      batch: {}
+      batch:
+        send_batch_max_size: 200
+        send_batch_size: 200
+        timeout: 5s
+
       filter/ottl:
         error_mode: ignore
         metrics:
@@ -212,21 +225,48 @@ data:
         - sources:
           - from: connection
       memory_limiter:
-        check_interval: 5s
-        limit_percentage: 80
-        spike_limit_percentage: 25
+        check_interval: 1s
+        limit_percentage: 65
+        spike_limit_percentage: 20
       resource:
         attributes:
         - action: insert
           from_attribute: k8s.pod.uid
           key: service.instance.id
+      resourcedetection:
+        detectors: [gcp]
+        timeout: 10s
+
       transform:
         metric_statements:
         - context: metric
           statements:
           - set(description, "") where name == "queueSize"
           - set(description, "") where name == "rpc.server.duration"
           - set(description, "") where name == "http.client.duration"
+      transform/collision:
+        metric_statements:
+        - context: datapoint
+          statements:
+          - set(attributes["exported_location"], attributes["location"])
+          - delete_key(attributes, "location")
+          - set(attributes["exported_cluster"], attributes["cluster"])
+          - delete_key(attributes, "cluster")
+          - set(attributes["exported_namespace"], attributes["namespace"])
+          - delete_key(attributes, "namespace")
+          - set(attributes["exported_job"], attributes["job"])
+          - delete_key(attributes, "job")
+          - set(attributes["exported_instance"], attributes["instance"])
+          - delete_key(attributes, "instance")
+          - set(attributes["exported_project_id"], attributes["project_id"])
+          - delete_key(attributes, "project_id")
+
+      # See https://github.com/open-telemetry/opentelemetry-demo/issues/1330
+      filter/currency:
+        metrics:
+          metric:
+          - 'IsMatch(name, "(.*)app_currency(.*)")'
+
     receivers:
       jaeger:
         protocols:
@@ -262,41 +302,43 @@ data:
       pipelines:
         logs:
           exporters:
-          - debug
+          - googlecloud
           processors:
           - k8sattributes
+          - resourcedetection
+          - resource
           - memory_limiter
           - batch
           receivers:
           - otlp
         metrics:
           exporters:
-          - otlphttp/prometheus
-          - debug
+          - googlemanagedprometheus
           processors:
           - k8sattributes
           - memory_limiter
           - filter/ottl
+          - filter/currency
+          - resourcedetection
           - transform
+          - transform/collision
           - resource
           - batch
           receivers:
           - otlp
-          - spanmetrics
+          #- spanmetrics
         traces:
           exporters:
-          - otlp
-          - debug
-          - spanmetrics
+          - googlecloud
+          #- spanmetrics
           processors:
           - k8sattributes
           - memory_limiter
+          - resourcedetection
           - resource
           - batch
           receivers:
           - otlp
-          - jaeger
-          - zipkin
       telemetry:
         metrics:
           address: ${env:MY_POD_IP}:8888