demo 1.5 release

Signed-off-by: Pierre Tessier <[email protected]>
open-telemetry · Aug 22, 2023 · 6891294 · 6891294
1 parent 5700131
commit 6891294
Show file tree

Hide file tree

Showing 18 changed files with 804 additions and 323 deletions.
diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: opentelemetry-demo
-version: 0.23.0
+version: 0.24.0
 description: opentelemetry demo helm chart
 home: https://opentelemetry.io/
 sources:

diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml
@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-adservice
     app.kubernetes.io/instance: example
@@ -30,7 +30,7 @@ kind: Service
 metadata:
   name: example-cartservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-cartservice
     app.kubernetes.io/instance: example
@@ -55,7 +55,7 @@ kind: Service
 metadata:
   name: example-checkoutservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-checkoutservice
     app.kubernetes.io/instance: example
@@ -80,7 +80,7 @@ kind: Service
 metadata:
   name: example-currencyservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-currencyservice
     app.kubernetes.io/instance: example
@@ -105,7 +105,7 @@ kind: Service
 metadata:
   name: example-emailservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-emailservice
     app.kubernetes.io/instance: example
@@ -130,7 +130,7 @@ kind: Service
 metadata:
   name: example-featureflagservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-featureflagservice
     app.kubernetes.io/instance: example
@@ -158,7 +158,7 @@ kind: Service
 metadata:
   name: example-ffspostgres
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-ffspostgres
     app.kubernetes.io/instance: example
@@ -183,7 +183,7 @@ kind: Service
 metadata:
   name: example-frontend
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-frontend
     app.kubernetes.io/instance: example
@@ -208,7 +208,7 @@ kind: Service
 metadata:
   name: example-frontendproxy
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-frontendproxy
     app.kubernetes.io/instance: example
@@ -233,7 +233,7 @@ kind: Service
 metadata:
   name: example-kafka
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-kafka
     app.kubernetes.io/instance: example
@@ -261,7 +261,7 @@ kind: Service
 metadata:
   name: example-loadgenerator
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-loadgenerator
     app.kubernetes.io/instance: example
@@ -286,7 +286,7 @@ kind: Service
 metadata:
   name: example-paymentservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-paymentservice
     app.kubernetes.io/instance: example
@@ -311,7 +311,7 @@ kind: Service
 metadata:
   name: example-productcatalogservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-productcatalogservice
     app.kubernetes.io/instance: example
@@ -336,7 +336,7 @@ kind: Service
 metadata:
   name: example-quoteservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-quoteservice
     app.kubernetes.io/instance: example
@@ -361,7 +361,7 @@ kind: Service
 metadata:
   name: example-recommendationservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-recommendationservice
     app.kubernetes.io/instance: example
@@ -386,7 +386,7 @@ kind: Service
 metadata:
   name: example-redis
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-redis
     app.kubernetes.io/instance: example
@@ -411,7 +411,7 @@ kind: Service
 metadata:
   name: example-shippingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-shippingservice
     app.kubernetes.io/instance: example
@@ -436,7 +436,7 @@ kind: Deployment
 metadata:
   name: example-accountingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-accountingservice
     app.kubernetes.io/instance: example
@@ -518,7 +518,7 @@ kind: Deployment
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-adservice
     app.kubernetes.io/instance: example
@@ -600,7 +600,7 @@ kind: Deployment
 metadata:
   name: example-cartservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-cartservice
     app.kubernetes.io/instance: example
@@ -666,6 +666,8 @@ spec:
             value: "8080"
           - name: ASPNETCORE_URLS
             value: http://*:$(CART_SERVICE_PORT)
+          - name: FEATURE_FLAG_GRPC_SERVICE_ADDR
+            value: 'example-featureflagservice:50053'
           - name: REDIS_ADDR
             value: 'example-redis:6379'
           - name: OTEL_EXPORTER_OTLP_ENDPOINT
@@ -690,7 +692,7 @@ kind: Deployment
 metadata:
   name: example-checkoutservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-checkoutservice
     app.kubernetes.io/instance: example
@@ -790,7 +792,7 @@ kind: Deployment
 metadata:
   name: example-currencyservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-currencyservice
     app.kubernetes.io/instance: example
@@ -868,7 +870,7 @@ kind: Deployment
 metadata:
   name: example-emailservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-emailservice
     app.kubernetes.io/instance: example
@@ -948,7 +950,7 @@ kind: Deployment
 metadata:
   name: example-featureflagservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-featureflagservice
     app.kubernetes.io/instance: example
@@ -1048,7 +1050,7 @@ kind: Deployment
 metadata:
   name: example-ffspostgres
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-ffspostgres
     app.kubernetes.io/instance: example
@@ -1132,7 +1134,7 @@ kind: Deployment
 metadata:
   name: example-frauddetectionservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-frauddetectionservice
     app.kubernetes.io/instance: example
@@ -1214,7 +1216,7 @@ kind: Deployment
 metadata:
   name: example-frontend
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-frontend
     app.kubernetes.io/instance: example
@@ -1299,7 +1301,7 @@ spec:
           - name: WEB_OTEL_SERVICE_NAME
             value: frontend-web
           - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
-            value: http://localhost:4318/v1/traces
+            value: http://localhost:8080/otlp-http/v1/traces
           - name: OTEL_RESOURCE_ATTRIBUTES
             value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME)
           resources:
@@ -1316,7 +1318,7 @@ kind: Deployment
 metadata:
   name: example-frontendproxy
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-frontendproxy
     app.kubernetes.io/instance: example
@@ -1400,8 +1402,10 @@ spec:
             value: "16686"
           - name: JAEGER_SERVICE_HOST
             value: 'example-jaeger-query'
-          - name: OTEL_COLLECTOR_PORT
+          - name: OTEL_COLLECTOR_PORT_GRPC
             value: "4317"
+          - name: OTEL_COLLECTOR_PORT_HTTP
+            value: "4318"
           - name: OTEL_COLLECTOR_HOST
             value: $(OTEL_COLLECTOR_NAME)
           - name: OTEL_RESOURCE_ATTRIBUTES
@@ -1420,7 +1424,7 @@ kind: Deployment
 metadata:
   name: example-kafka
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-kafka
     app.kubernetes.io/instance: example
@@ -1506,7 +1510,7 @@ kind: Deployment
 metadata:
   name: example-loadgenerator
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-loadgenerator
     app.kubernetes.io/instance: example
@@ -1575,15 +1579,15 @@ spec:
           - name: LOCUST_SPAWN_RATE
             value: "1"
           - name: LOCUST_HOST
-            value: http://example-frontend:8080
+            value: http://example-frontendproxy:8080
           - name: LOCUST_HEADLESS
             value: "false"
           - name: LOCUST_AUTOSTART
             value: "true"
           - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION
             value: python
-          - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
-            value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces
+          - name: OTEL_EXPORTER_OTLP_ENDPOINT
+            value: http://$(OTEL_COLLECTOR_NAME):4317
           - name: OTEL_RESOURCE_ATTRIBUTES
             value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME)
           resources:
@@ -1596,7 +1600,7 @@ kind: Deployment
 metadata:
   name: example-paymentservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-paymentservice
     app.kubernetes.io/instance: example
@@ -1678,7 +1682,7 @@ kind: Deployment
 metadata:
   name: example-productcatalogservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-productcatalogservice
     app.kubernetes.io/instance: example
@@ -1758,7 +1762,7 @@ kind: Deployment
 metadata:
   name: example-quoteservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-quoteservice
     app.kubernetes.io/instance: example
@@ -1842,7 +1846,7 @@ kind: Deployment
 metadata:
   name: example-recommendationservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-recommendationservice
     app.kubernetes.io/instance: example
@@ -1928,7 +1932,7 @@ kind: Deployment
 metadata:
   name: example-redis
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-redis
     app.kubernetes.io/instance: example
@@ -2006,7 +2010,7 @@ kind: Deployment
 metadata:
   name: example-shippingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example-shippingservice
     app.kubernetes.io/instance: example

diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml
@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-demo-0.23.0
+    helm.sh/chart: opentelemetry-demo-0.24.0
 
     opentelemetry.io/name: example
     app.kubernetes.io/instance: example