diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 724a9ba48..d8047bb51 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.24.0 +version: 0.25.0 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: @@ -11,7 +11,7 @@ maintainers: - name: puckpuck - name: tylerhelmuth icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png -appVersion: "1.4.0" +appVersion: "1.5.0" dependencies: - name: opentelemetry-collector version: 0.65.1 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 eb8118da6..4880e78bf 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,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -498,13 +498,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -560,13 +560,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -606,6 +606,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 @@ -630,13 +632,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -656,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -710,13 +712,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -736,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,13 +770,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -794,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -828,13 +830,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -854,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -908,13 +910,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -972,13 +974,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -998,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1034,13 +1036,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1060,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1099,7 +1101,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.namespace=opentelemetry-demo resources: @@ -1116,13 +1118,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1142,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1180,8 +1182,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 @@ -1200,13 +1204,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1226,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1266,13 +1270,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1292,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1315,15 +1319,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.namespace=opentelemetry-demo resources: @@ -1336,13 +1340,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1362,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1398,13 +1402,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1424,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1458,13 +1462,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1484,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1522,13 +1526,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1548,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1588,13 +1592,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1646,13 +1650,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1672,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: 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 c4a407c01..b4c0d733b 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,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm 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 703e491e0..a647cab06 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -498,13 +498,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -560,13 +560,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -606,6 +606,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 @@ -630,13 +632,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -656,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -710,13 +712,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -736,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,13 +770,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -794,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -828,13 +830,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -854,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -908,13 +910,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -972,13 +974,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -998,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1034,13 +1036,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1060,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1099,7 +1101,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.namespace=opentelemetry-demo resources: @@ -1116,13 +1118,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1142,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1180,8 +1182,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 @@ -1200,13 +1204,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1226,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1266,13 +1270,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1292,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1315,15 +1319,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.namespace=opentelemetry-demo resources: @@ -1336,13 +1340,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1362,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1398,13 +1402,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1424,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1458,13 +1462,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1484,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1522,13 +1526,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1548,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1588,13 +1592,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1646,13 +1650,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1672,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: 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 f5ab8f335..d3bffd7d9 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,17 +5,17 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo 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/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml index af93ac078..336586f5a 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -35,7 +35,7 @@ data: error_mode: ignore metrics: metric: - - name == "queueSize" + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -74,8 +74,9 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -94,7 +95,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -127,8 +128,8 @@ data: - k8sattributes - memory_limiter - filter/ottl - - resource - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index 4e350006d..0a6d084d7 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: a716efb929ffbb7d38b2d583356cb2ea14e792f032e01900ab87a97d7f87d62c + checksum/config: 078e8c22fbb93a32d12180256c540e5112524117b2cb0bddfadc9f4741a40b93 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -95,7 +95,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap 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 c4a407c01..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm 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 0bef4f0ee..395d2296d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -500,13 +500,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -526,7 +526,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -564,13 +564,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -590,7 +590,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -610,6 +610,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 @@ -636,13 +638,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -662,7 +664,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -718,13 +720,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -744,7 +746,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -778,13 +780,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -804,7 +806,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -840,13 +842,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -866,7 +868,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -922,13 +924,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -986,13 +988,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1012,7 +1014,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1050,13 +1052,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1076,7 +1078,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1115,7 +1117,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 @@ -1134,13 +1136,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1160,7 +1162,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1198,8 +1200,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 @@ -1218,13 +1222,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1244,7 +1248,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1284,13 +1288,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1310,7 +1314,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1333,15 +1337,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 @@ -1356,13 +1360,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1382,7 +1386,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1420,13 +1424,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1446,7 +1450,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1482,13 +1486,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1508,7 +1512,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1548,13 +1552,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1574,7 +1578,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1616,13 +1620,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1674,13 +1678,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1700,7 +1704,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: 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 f5ab8f335..d3bffd7d9 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,17 +5,17 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo 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/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml index 33b315aa0..770827469 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -44,7 +44,7 @@ data: error_mode: ignore metrics: metric: - - name == "queueSize" + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -81,8 +81,9 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -101,7 +102,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -134,8 +135,8 @@ data: - k8sattributes - memory_limiter - filter/ottl - - resource - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index a7c681abc..df7e90eec 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 3c216c417adc791c2672be40eb909b51af9b68fa4bb7ee37252805d6e505fa55 + checksum/config: 087d42dff41bace242e1acef4881a69f566f04a40267d5ec1c6e84d53c3e071e opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap 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 c4a407c01..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index c612dae50..e4ad26757 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -498,13 +498,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -560,13 +560,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -606,6 +606,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 @@ -630,13 +632,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -656,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -710,13 +712,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -736,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,13 +770,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -794,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -828,13 +830,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -854,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -908,13 +910,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -972,13 +974,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -998,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1034,13 +1036,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1060,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1099,7 +1101,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.namespace=opentelemetry-demo resources: @@ -1116,13 +1118,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1142,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1180,8 +1182,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 @@ -1200,13 +1204,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1226,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1266,13 +1270,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1292,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1315,15 +1319,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.namespace=opentelemetry-demo resources: @@ -1336,13 +1340,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1362,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1398,13 +1402,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1424,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1458,13 +1462,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1484,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1522,13 +1526,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1548,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1588,13 +1592,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1646,13 +1650,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1672,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index f5ab8f335..d3bffd7d9 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -5,17 +5,17 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo 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/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml index d1917aa88..c89e89560 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -35,7 +35,7 @@ data: error_mode: ignore metrics: metric: - - name == "queueSize" + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -72,8 +72,9 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -92,7 +93,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -125,8 +126,8 @@ data: - k8sattributes - memory_limiter - filter/ottl - - resource - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index 0e06023e5..99a53e2a0 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 6e5b460ee9269c91ee62f02efbf165e52ae1a4ef9932acb726dff5fa8fa6c0b5 + checksum/config: 65697fdda2bc5b2836ec1e38cbdf3148c0d242f8ff77a457a5967dec922788bd opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index c4a407c01..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm 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 eb1bdcfc0..f15a82913 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -498,13 +498,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -560,13 +560,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -606,6 +606,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 @@ -630,13 +632,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -656,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -710,13 +712,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -736,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,13 +770,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -794,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -828,13 +830,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -854,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -908,13 +910,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -972,13 +974,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -998,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1034,13 +1036,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1060,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1116,13 +1118,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1142,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1180,8 +1182,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 @@ -1200,13 +1204,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1226,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1266,13 +1270,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1292,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1315,15 +1319,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.namespace=opentelemetry-demo resources: @@ -1336,13 +1340,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1362,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1398,13 +1402,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1424,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1458,13 +1462,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1484,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1522,13 +1526,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1548,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1588,13 +1592,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1646,13 +1650,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1672,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1706,13 +1710,13 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: 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 f5ab8f335..d3bffd7d9 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,17 +5,17 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo 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/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml index d1917aa88..c89e89560 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -35,7 +35,7 @@ data: error_mode: ignore metrics: metric: - - name == "queueSize" + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -72,8 +72,9 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -92,7 +93,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -125,8 +126,8 @@ data: - k8sattributes - memory_limiter - filter/ottl - - resource - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index 0e06023e5..99a53e2a0 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 6e5b460ee9269c91ee62f02efbf165e52ae1a4ef9932acb726dff5fa8fa6c0b5 + checksum/config: 65697fdda2bc5b2836ec1e38cbdf3148c0d242f8ff77a457a5967dec922788bd opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap 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 c4a407c01..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm 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 fe5a6c400..0aedc878f 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -173,6 +173,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 @@ -331,7 +333,7 @@ components: - name: WEB_OTEL_SERVICE_NAME value: frontend-web - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:4318/v1/traces # This expects users to use `kubectl port-forward ...` + value: http://localhost:8080/otlp-http/v1/traces # This expects users to use `kubectl port-forward ...` resources: limits: memory: 200Mi @@ -369,8 +371,10 @@ components: value: "16686" - name: JAEGER_SERVICE_HOST value: '{{ include "otel-demo.name" . }}-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) resources: @@ -395,15 +399,15 @@ components: - name: LOCUST_SPAWN_RATE value: "1" - name: LOCUST_HOST - value: 'http://{{ include "otel-demo.name" . }}-frontend:8080' + value: 'http://{{ include "otel-demo.name" . }}-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 resources: limits: memory: 120Mi @@ -581,7 +585,7 @@ opentelemetry-collector: enabled: true resources: limits: - memory: 125Mi + memory: 200Mi service: type: ClusterIP ports: @@ -601,9 +605,6 @@ opentelemetry-collector: otlp: protocols: http: - # Bind to 0.0.0.0 to allow for `kubectl port-forward` to work - # This may be susceptible to denial of service attacks - CWE-1327 https://cwe.mitre.org/data/definitions/1327.html - endpoint: 0.0.0.0:4318 # Since this collector needs to receive data from the web, enable cors for all origins # `allowed_origins` can be refined for your deployment domain cors: @@ -619,7 +620,7 @@ opentelemetry-collector: insecure: true # Create an exporter to Prometheus (metrics) prometheus: - endpoint: '0.0.0.0:9464' + endpoint: "${env.MY_POD_IP}:9464" resource_to_telemetry_conversion: enabled: true enable_open_metrics: true @@ -630,18 +631,25 @@ opentelemetry-collector: - key: service.instance.id from_attribute: k8s.pod.uid action: insert - # we can remove when this is fixed: https://github.com/open-telemetry/opentelemetry-demo/issues/737 - transform: - metric_statements: - - context: metric - statements: - - set(description, "Measures the duration of inbound HTTP requests") where name == "http.server.duration" - # we can remove when this is fixed: https://github.com/open-telemetry/opentelemetry-demo/issues/826 filter/ottl: error_mode: ignore metrics: metric: - - 'name == "queueSize"' + # FIXME: remove when a Metrics View is implemented in the checkout and productcatalog components + # or when this issue is resolved: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/3071 + - 'name == "rpc.server.duration"' + transform: + metric_statements: + - context: metric + statements: + # FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-java/issues/4834 + - set(description, "") where name == "queueSize" + # FIXME: remove when these 2 issues are resolved: + # Java: https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/9478 + # Go: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/4301 + - set(description, "") where name == "rpc.server.duration" + # FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1958 + - set(description, "") where name == "http.client.duration" connectors: spanmetrics: @@ -653,7 +661,7 @@ opentelemetry-collector: exporters: [otlp, logging, spanmetrics] metrics: receivers: [otlp, spanmetrics] - processors: [memory_limiter, filter/ottl, resource, transform, batch] + processors: [memory_limiter, filter/ottl, transform, resource, batch] exporters: [prometheus, logging] jaeger: @@ -664,7 +672,7 @@ jaeger: enabled: true args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" @@ -781,4 +789,4 @@ grafana: default: '{{ include "otel-demo.name" . }}-grafana-dashboards' resources: limits: - memory: 100Mi + memory: 150Mi