From 68912948f8d137c19ec13ca878f2e6e4a12e3fa9 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Mon, 21 Aug 2023 22:05:59 -0400 Subject: [PATCH] demo 1.5 release Signed-off-by: Pierre Tessier --- charts/opentelemetry-demo/Chart.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../rendered/serviceaccount.yaml | 2 +- .../examples/default/rendered/component.yaml | 86 +++++------ .../default/rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../default/rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../rendered/serviceaccount.yaml | 2 +- .../grafana-dashboards/demo-dashboard.json | 132 ++++++++++++++--- charts/opentelemetry-demo/templates/NOTES.txt | 11 -- charts/opentelemetry-demo/values.yaml | 6 +- 18 files changed, 804 insertions(+), 323 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index ec859120e..724a9ba48 100644 --- 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 index 57f6575f0..779fdb06e 100644 --- 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 index 386fdd068..c4a407c01 100644 --- 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 diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml index bee0c9cf8..8e9fe11a9 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/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/collector-as-daemonset/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards 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 @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/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 diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml index f36cbc8f8..b1543f9f6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/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 @@ -520,7 +520,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 @@ -604,7 +604,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 @@ -670,6 +670,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 @@ -696,7 +698,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 @@ -798,7 +800,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 @@ -878,7 +880,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 @@ -960,7 +962,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 @@ -1062,7 +1064,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 @@ -1146,7 +1148,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 @@ -1230,7 +1232,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 @@ -1315,7 +1317,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: TEAM_NAME value: ring - name: OTEL_RESOURCE_ATTRIBUTES @@ -1334,7 +1336,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 @@ -1418,8 +1420,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 @@ -1438,7 +1442,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 @@ -1524,7 +1528,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 @@ -1593,15 +1597,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: TEAM_NAME value: ring - name: OTEL_RESOURCE_ATTRIBUTES @@ -1616,7 +1620,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 @@ -1700,7 +1704,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 @@ -1782,7 +1786,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 @@ -1868,7 +1872,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 @@ -1956,7 +1960,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 @@ -2034,7 +2038,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/custom-environment-variables/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards 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 @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/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 diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 15b691cb0..7f11d7585 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/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/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards 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 @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/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 diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml index 2611a3fbf..e61ae2c2c 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/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 @@ -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 @@ -2086,7 +2090,7 @@ kind: Ingress 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 diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards 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 @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/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 diff --git a/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json b/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json index 37061e1bd..ace199bc8 100644 --- a/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json +++ b/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json @@ -413,13 +413,13 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -507,8 +507,8 @@ }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -519,9 +519,9 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -532,9 +532,9 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -545,14 +545,14 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -639,17 +639,111 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -665,14 +759,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -691,6 +785,6 @@ "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" -} +} \ No newline at end of file diff --git a/charts/opentelemetry-demo/templates/NOTES.txt b/charts/opentelemetry-demo/templates/NOTES.txt index 085111dbc..8a384c93d 100644 --- a/charts/opentelemetry-demo/templates/NOTES.txt +++ b/charts/opentelemetry-demo/templates/NOTES.txt @@ -19,14 +19,3 @@ Feature Flags UI http://localhost:8080/feature/ Load Generator UI http://localhost:8080/loadgen/ Jaeger UI http://localhost:8080/jaeger/ui/ - -- OpenTelemetry Collector OTLP/HTTP receiver (required for browser spans to be emitted): - by running these commands: - kubectl port-forward svc/{{ include "otel-demo.name" . }}-otelcol 4318:4318 - -{{- if eq (index .Values "opentelemetry-collector" "config" "receivers" "otlp" "protocols" "http" "endpoint") "0.0.0.0:4318" }} - -The OpenTelemetry Collector OTLP/HTTP receiver is bound to 0.0.0.0 in order to allow the "kubectl port-forward" command. -This may be susceptible to denial of service attacks. -See: CWE-1327 https://cwe.mitre.org/data/definitions/1327.html -{{- end }} diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index ef294bac3..639b86475 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -193,6 +193,8 @@ components: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) + - name: FEATURE_FLAG_GRPC_SERVICE_ADDR + value: '{{ include "otel-demo.name" . }}-featureflagservice:50053' - name: REDIS_ADDR value: '{{ include "otel-demo.name" . }}-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -424,8 +426,8 @@ components: 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 resources: limits: memory: 120Mi