diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 9b57bc926a..d16b56faef 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.40.3 +version: 0.40.4 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: diff --git a/charts/opentelemetry-demo/UPGRADING.md b/charts/opentelemetry-demo/UPGRADING.md index e6be6047ce..75fbbadaed 100644 --- a/charts/opentelemetry-demo/UPGRADING.md +++ b/charts/opentelemetry-demo/UPGRADING.md @@ -5,6 +5,15 @@ > another. If you need to upgrade the chart, you must first delete the existing > release and then install the new version. + +## To 0.40.4 + +The `transform` processor now uses the `set_semconv_span_name()` function to +reduce span metrics cardinality explosion caused by high-cardinality span names. +See the [processor documentation](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/transformprocessor#set_semconv_span_name) +and [troubleshooting guide](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/connector/spanmetricsconnector/README.md#troubleshooting-span-metrics-high-cardinality) +for details. + ## To 0.40 The product catalog has been moved to use a Postgres database. Custom products 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 1b4c1e66cc..3ce90df5df 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -289,7 +289,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -314,7 +314,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -339,7 +339,7 @@ kind: Service metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -364,7 +364,7 @@ kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -389,7 +389,7 @@ kind: Service metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -414,7 +414,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -439,7 +439,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -464,7 +464,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -489,7 +489,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart @@ -514,7 +514,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: accounting @@ -584,7 +584,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -653,7 +653,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -732,7 +732,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -822,7 +822,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -889,7 +889,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -958,7 +958,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -1086,7 +1086,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: fraud-detection @@ -1160,7 +1160,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -1259,7 +1259,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -1367,7 +1367,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -1438,7 +1438,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -1515,7 +1515,7 @@ kind: Deployment metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -1577,7 +1577,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -1662,7 +1662,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -1735,7 +1735,7 @@ kind: Deployment metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -1820,7 +1820,7 @@ kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -1893,7 +1893,7 @@ kind: Deployment metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -1980,7 +1980,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -2053,7 +2053,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -2126,7 +2126,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -2193,7 +2193,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml index 8a18eae0c4..bd7ca8b50c 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/configmap-agent.yaml index 05188230a2..d86ceb6ef9 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/configmap-agent.yaml @@ -109,10 +109,24 @@ data: transform: error_mode: ignore trace_statements: + - conditions: + - span.kind == SPAN_KIND_SERVER and resource.attributes["service.name"] == "frontend" + and span.attributes["http.route"] == nil + context: span + statements: + - set(span.attributes["http.route"], "/api/cart") where IsMatch(span.attributes["http.target"], + "\\/api\\/cart") + - set(span.attributes["http.route"], "/api/checkout") where IsMatch(span.attributes["http.target"], + "\\/api\\/checkout") + - set(span.attributes["http.route"], "/api/products/{productId}") where IsMatch(span.attributes["http.target"], + "\\/api\\/products\\/.*") + - set(span.attributes["http.route"], "/api/recommendations") where IsMatch(span.attributes["http.target"], + "\\/api\\/recommendations") + - set(span.attributes["http.route"], "/api/data") where IsMatch(span.attributes["http.target"], + "\\/api\\/data.*") - context: span statements: - - replace_pattern(name, "\\?.*", "") - - replace_match(name, "GET /api/products/*", "GET /api/products/{productId}") + - set_semconv_span_name("1.37.0", "unsanitized_span_name") receivers: hostmetrics: collection_interval: 10s diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/daemonset.yaml index 63d731a5f8..dc4eae3691 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/daemonset.yaml @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: b56e3632a0745750abb4c1902586b710285f2512f4ed51266f9ec5054054b474 + checksum/config: 67ece42de3c1e0117130ccdeb021472bc66c0261cd90e563e56e3d94f7ace7b0 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/posgresql-init-config.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/posgresql-init-config.yaml index 1c95cdf154..ca099974a2 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/posgresql-init-config.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/posgresql-init-config.yaml @@ -6,7 +6,7 @@ metadata: name: postgresql-init namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" 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 7496c4be85..65535eb103 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" 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 79add38c03..1157939231 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -289,7 +289,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -314,7 +314,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -339,7 +339,7 @@ kind: Service metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -364,7 +364,7 @@ kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -389,7 +389,7 @@ kind: Service metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -414,7 +414,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -439,7 +439,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -464,7 +464,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -489,7 +489,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart @@ -514,7 +514,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: accounting @@ -588,7 +588,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -661,7 +661,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -744,7 +744,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -838,7 +838,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -909,7 +909,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -982,7 +982,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -1114,7 +1114,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: fraud-detection @@ -1192,7 +1192,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -1295,7 +1295,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -1405,7 +1405,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -1478,7 +1478,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -1557,7 +1557,7 @@ kind: Deployment metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -1621,7 +1621,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -1710,7 +1710,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -1787,7 +1787,7 @@ kind: Deployment metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -1872,7 +1872,7 @@ kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -1949,7 +1949,7 @@ kind: Deployment metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -2038,7 +2038,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -2115,7 +2115,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -2192,7 +2192,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -2263,7 +2263,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml index 8a18eae0c4..bd7ca8b50c 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-config.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-config.yaml index e78717b0c1..8cc687ea27 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-config.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-config.yaml @@ -6,7 +6,7 @@ metadata: name: grafana-alerting namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -24,7 +24,7 @@ metadata: name: grafana-dashboard-nginx-metrics namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -382,7 +382,7 @@ metadata: name: grafana-dashboard-apm-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -2666,7 +2666,7 @@ metadata: name: grafana-dashboard-demo-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -3870,7 +3870,7 @@ metadata: name: grafana-dashboard-exemplars-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -4346,7 +4346,7 @@ metadata: name: grafana-dashboard-linux-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -7203,7 +7203,7 @@ metadata: name: grafana-dashboard-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -12987,7 +12987,7 @@ metadata: name: grafana-dashboard-postgresql-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -14478,7 +14478,7 @@ metadata: name: grafana-dashboard-spanmetrics-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -15529,7 +15529,7 @@ metadata: name: grafana-datasources namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap-agent.yaml index 50171872e6..6b47c7766e 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap-agent.yaml @@ -114,10 +114,24 @@ data: transform: error_mode: ignore trace_statements: + - conditions: + - span.kind == SPAN_KIND_SERVER and resource.attributes["service.name"] == "frontend" + and span.attributes["http.route"] == nil + context: span + statements: + - set(span.attributes["http.route"], "/api/cart") where IsMatch(span.attributes["http.target"], + "\\/api\\/cart") + - set(span.attributes["http.route"], "/api/checkout") where IsMatch(span.attributes["http.target"], + "\\/api\\/checkout") + - set(span.attributes["http.route"], "/api/products/{productId}") where IsMatch(span.attributes["http.target"], + "\\/api\\/products\\/.*") + - set(span.attributes["http.route"], "/api/recommendations") where IsMatch(span.attributes["http.target"], + "\\/api\\/recommendations") + - set(span.attributes["http.route"], "/api/data") where IsMatch(span.attributes["http.target"], + "\\/api\\/data.*") - context: span statements: - - replace_pattern(name, "\\?.*", "") - - replace_match(name, "GET /api/products/*", "GET /api/products/{productId}") + - set_semconv_span_name("1.37.0", "unsanitized_span_name") receivers: hostmetrics: collection_interval: 10s diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/daemonset.yaml index 2dbcde3ea4..d71c80b402 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/daemonset.yaml @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 3814907d74471f16eacf5521e103de0137b27fab07867fc7d29a5a871fc9045c + checksum/config: 84c67e88758a9d855cb1e31ff140d3c476c5388d66cfd1b6fecf481f17b49c52 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/posgresql-init-config.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/posgresql-init-config.yaml index 1c95cdf154..ca099974a2 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/posgresql-init-config.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/posgresql-init-config.yaml @@ -6,7 +6,7 @@ metadata: name: postgresql-init namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" 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 7496c4be85..65535eb103 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 1b4c1e66cc..3ce90df5df 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -289,7 +289,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -314,7 +314,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -339,7 +339,7 @@ kind: Service metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -364,7 +364,7 @@ kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -389,7 +389,7 @@ kind: Service metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -414,7 +414,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -439,7 +439,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -464,7 +464,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -489,7 +489,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart @@ -514,7 +514,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: accounting @@ -584,7 +584,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -653,7 +653,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -732,7 +732,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -822,7 +822,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -889,7 +889,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -958,7 +958,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -1086,7 +1086,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: fraud-detection @@ -1160,7 +1160,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -1259,7 +1259,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -1367,7 +1367,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -1438,7 +1438,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -1515,7 +1515,7 @@ kind: Deployment metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -1577,7 +1577,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -1662,7 +1662,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -1735,7 +1735,7 @@ kind: Deployment metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -1820,7 +1820,7 @@ kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -1893,7 +1893,7 @@ kind: Deployment metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -1980,7 +1980,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -2053,7 +2053,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -2126,7 +2126,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -2193,7 +2193,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml index 8a18eae0c4..bd7ca8b50c 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-config.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-config.yaml index e78717b0c1..8cc687ea27 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-config.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-config.yaml @@ -6,7 +6,7 @@ metadata: name: grafana-alerting namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -24,7 +24,7 @@ metadata: name: grafana-dashboard-nginx-metrics namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -382,7 +382,7 @@ metadata: name: grafana-dashboard-apm-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -2666,7 +2666,7 @@ metadata: name: grafana-dashboard-demo-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -3870,7 +3870,7 @@ metadata: name: grafana-dashboard-exemplars-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -4346,7 +4346,7 @@ metadata: name: grafana-dashboard-linux-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -7203,7 +7203,7 @@ metadata: name: grafana-dashboard-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -12987,7 +12987,7 @@ metadata: name: grafana-dashboard-postgresql-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -14478,7 +14478,7 @@ metadata: name: grafana-dashboard-spanmetrics-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -15529,7 +15529,7 @@ metadata: name: grafana-datasources namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap-agent.yaml index 4c162d5801..f0f1ffa904 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap-agent.yaml @@ -105,10 +105,24 @@ data: transform: error_mode: ignore trace_statements: + - conditions: + - span.kind == SPAN_KIND_SERVER and resource.attributes["service.name"] == "frontend" + and span.attributes["http.route"] == nil + context: span + statements: + - set(span.attributes["http.route"], "/api/cart") where IsMatch(span.attributes["http.target"], + "\\/api\\/cart") + - set(span.attributes["http.route"], "/api/checkout") where IsMatch(span.attributes["http.target"], + "\\/api\\/checkout") + - set(span.attributes["http.route"], "/api/products/{productId}") where IsMatch(span.attributes["http.target"], + "\\/api\\/products\\/.*") + - set(span.attributes["http.route"], "/api/recommendations") where IsMatch(span.attributes["http.target"], + "\\/api\\/recommendations") + - set(span.attributes["http.route"], "/api/data") where IsMatch(span.attributes["http.target"], + "\\/api\\/data.*") - context: span statements: - - replace_pattern(name, "\\?.*", "") - - replace_match(name, "GET /api/products/*", "GET /api/products/{productId}") + - set_semconv_span_name("1.37.0", "unsanitized_span_name") receivers: hostmetrics: collection_interval: 10s diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/daemonset.yaml index 027832b638..689294e7ef 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/daemonset.yaml @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 5fd1975977daca85b9612fa614f01a741a656d5f66171602f7b756ddfa493c03 + checksum/config: 1fdac890ba8aee9d05a37e748f9dcb8f5571ddf715332cc2ba32a7cfdbc9893f labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-demo/examples/default/rendered/posgresql-init-config.yaml b/charts/opentelemetry-demo/examples/default/rendered/posgresql-init-config.yaml index 1c95cdf154..ca099974a2 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/posgresql-init-config.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/posgresql-init-config.yaml @@ -6,7 +6,7 @@ metadata: name: postgresql-init namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 7496c4be85..65535eb103 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/component.yaml b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/component.yaml index 1b4c1e66cc..3ce90df5df 100644 --- a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -289,7 +289,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -314,7 +314,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -339,7 +339,7 @@ kind: Service metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -364,7 +364,7 @@ kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -389,7 +389,7 @@ kind: Service metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -414,7 +414,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -439,7 +439,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -464,7 +464,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -489,7 +489,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart @@ -514,7 +514,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: accounting @@ -584,7 +584,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -653,7 +653,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -732,7 +732,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -822,7 +822,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -889,7 +889,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -958,7 +958,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -1086,7 +1086,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: fraud-detection @@ -1160,7 +1160,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -1259,7 +1259,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -1367,7 +1367,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -1438,7 +1438,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -1515,7 +1515,7 @@ kind: Deployment metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -1577,7 +1577,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -1662,7 +1662,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -1735,7 +1735,7 @@ kind: Deployment metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -1820,7 +1820,7 @@ kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -1893,7 +1893,7 @@ kind: Deployment metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -1980,7 +1980,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -2053,7 +2053,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -2126,7 +2126,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -2193,7 +2193,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/flagd-config.yaml index 8a18eae0c4..bd7ca8b50c 100644 --- a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/grafana-config.yaml b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/grafana-config.yaml index e78717b0c1..8cc687ea27 100644 --- a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/grafana-config.yaml +++ b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/grafana-config.yaml @@ -6,7 +6,7 @@ metadata: name: grafana-alerting namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -24,7 +24,7 @@ metadata: name: grafana-dashboard-nginx-metrics namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -382,7 +382,7 @@ metadata: name: grafana-dashboard-apm-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -2666,7 +2666,7 @@ metadata: name: grafana-dashboard-demo-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -3870,7 +3870,7 @@ metadata: name: grafana-dashboard-exemplars-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -4346,7 +4346,7 @@ metadata: name: grafana-dashboard-linux-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -7203,7 +7203,7 @@ metadata: name: grafana-dashboard-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -12987,7 +12987,7 @@ metadata: name: grafana-dashboard-postgresql-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -14478,7 +14478,7 @@ metadata: name: grafana-dashboard-spanmetrics-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -15529,7 +15529,7 @@ metadata: name: grafana-datasources namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml index 33280eb6d4..0cfde5494b 100644 --- a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml @@ -101,10 +101,24 @@ data: transform: error_mode: ignore trace_statements: + - conditions: + - span.kind == SPAN_KIND_SERVER and resource.attributes["service.name"] == "frontend" + and span.attributes["http.route"] == nil + context: span + statements: + - set(span.attributes["http.route"], "/api/cart") where IsMatch(span.attributes["http.target"], + "\\/api\\/cart") + - set(span.attributes["http.route"], "/api/checkout") where IsMatch(span.attributes["http.target"], + "\\/api\\/checkout") + - set(span.attributes["http.route"], "/api/products/{productId}") where IsMatch(span.attributes["http.target"], + "\\/api\\/products\\/.*") + - set(span.attributes["http.route"], "/api/recommendations") where IsMatch(span.attributes["http.target"], + "\\/api\\/recommendations") + - set(span.attributes["http.route"], "/api/data") where IsMatch(span.attributes["http.target"], + "\\/api\\/data.*") - context: span statements: - - replace_pattern(name, "\\?.*", "") - - replace_match(name, "GET /api/products/*", "GET /api/products/{productId}") + - set_semconv_span_name("1.37.0", "unsanitized_span_name") receivers: jaeger: protocols: diff --git a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml index 226a80c761..d8026949e7 100644 --- a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 6676d82b1f74241c57613b03d912fdef1b7ce591b1cab28821559c7102349a41 + checksum/config: 49343b5969a1b3c7ae1808634c3424c0757c38de8fed17576b380e82cdc55bdd labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/posgresql-init-config.yaml b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/posgresql-init-config.yaml index 1c95cdf154..ca099974a2 100644 --- a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/posgresql-init-config.yaml +++ b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/posgresql-init-config.yaml @@ -6,7 +6,7 @@ metadata: name: postgresql-init namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/serviceaccount.yaml index 7496c4be85..65535eb103 100644 --- a/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/disable-kubernetes-infra-monitoring/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" 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 957a90cb1f..0d0e86600e 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -289,7 +289,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -314,7 +314,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -339,7 +339,7 @@ kind: Service metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -364,7 +364,7 @@ kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -389,7 +389,7 @@ kind: Service metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -414,7 +414,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -439,7 +439,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -464,7 +464,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -489,7 +489,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart @@ -514,7 +514,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: accounting @@ -584,7 +584,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: ad @@ -653,7 +653,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: cart @@ -732,7 +732,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: checkout @@ -822,7 +822,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: currency @@ -889,7 +889,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: email @@ -958,7 +958,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: flagd @@ -1086,7 +1086,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: fraud-detection @@ -1160,7 +1160,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend @@ -1259,7 +1259,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy @@ -1367,7 +1367,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: image-provider @@ -1438,7 +1438,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: kafka @@ -1515,7 +1515,7 @@ kind: Deployment metadata: name: llm labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: llm @@ -1577,7 +1577,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: load-generator @@ -1662,7 +1662,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: payment @@ -1735,7 +1735,7 @@ kind: Deployment metadata: name: postgresql labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: postgresql @@ -1820,7 +1820,7 @@ kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-catalog @@ -1893,7 +1893,7 @@ kind: Deployment metadata: name: product-reviews labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: product-reviews @@ -1980,7 +1980,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: quote @@ -2053,7 +2053,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: recommendation @@ -2126,7 +2126,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: shipping @@ -2193,7 +2193,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: valkey-cart @@ -2253,7 +2253,7 @@ kind: Ingress metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 opentelemetry.io/name: frontend-proxy diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml index 8a18eae0c4..bd7ca8b50c 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-config.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-config.yaml index e78717b0c1..8cc687ea27 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-config.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-config.yaml @@ -6,7 +6,7 @@ metadata: name: grafana-alerting namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -24,7 +24,7 @@ metadata: name: grafana-dashboard-nginx-metrics namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -382,7 +382,7 @@ metadata: name: grafana-dashboard-apm-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -2666,7 +2666,7 @@ metadata: name: grafana-dashboard-demo-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -3870,7 +3870,7 @@ metadata: name: grafana-dashboard-exemplars-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -4346,7 +4346,7 @@ metadata: name: grafana-dashboard-linux-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -7203,7 +7203,7 @@ metadata: name: grafana-dashboard-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -12987,7 +12987,7 @@ metadata: name: grafana-dashboard-postgresql-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -14478,7 +14478,7 @@ metadata: name: grafana-dashboard-spanmetrics-dashboard namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" @@ -15529,7 +15529,7 @@ metadata: name: grafana-datasources namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap-agent.yaml index 4c162d5801..f0f1ffa904 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap-agent.yaml @@ -105,10 +105,24 @@ data: transform: error_mode: ignore trace_statements: + - conditions: + - span.kind == SPAN_KIND_SERVER and resource.attributes["service.name"] == "frontend" + and span.attributes["http.route"] == nil + context: span + statements: + - set(span.attributes["http.route"], "/api/cart") where IsMatch(span.attributes["http.target"], + "\\/api\\/cart") + - set(span.attributes["http.route"], "/api/checkout") where IsMatch(span.attributes["http.target"], + "\\/api\\/checkout") + - set(span.attributes["http.route"], "/api/products/{productId}") where IsMatch(span.attributes["http.target"], + "\\/api\\/products\\/.*") + - set(span.attributes["http.route"], "/api/recommendations") where IsMatch(span.attributes["http.target"], + "\\/api\\/recommendations") + - set(span.attributes["http.route"], "/api/data") where IsMatch(span.attributes["http.target"], + "\\/api\\/data.*") - context: span statements: - - replace_pattern(name, "\\?.*", "") - - replace_match(name, "GET /api/products/*", "GET /api/products/{productId}") + - set_semconv_span_name("1.37.0", "unsanitized_span_name") receivers: hostmetrics: collection_interval: 10s diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/daemonset.yaml index 027832b638..689294e7ef 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/daemonset.yaml @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 5fd1975977daca85b9612fa614f01a741a656d5f66171602f7b756ddfa493c03 + checksum/config: 1fdac890ba8aee9d05a37e748f9dcb8f5571ddf715332cc2ba32a7cfdbc9893f labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/posgresql-init-config.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/posgresql-init-config.yaml index 1c95cdf154..ca099974a2 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/posgresql-init-config.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/posgresql-init-config.yaml @@ -6,7 +6,7 @@ metadata: name: postgresql-init namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" 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 7496c4be85..65535eb103 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.40.3 + helm.sh/chart: opentelemetry-demo-0.40.4 app.kubernetes.io/version: "2.2.0" diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index 51ea2ba788..a4113c391d 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -967,17 +967,28 @@ opentelemetry-collector: spike_limit_percentage: 25 resourcedetection: detectors: [env, system] - # This processor is used to help limit high cardinality on next.js span names - # When this PR is merged (and released) we can remove this transform processor - # https://github.com/vercel/next.js/pull/64852 transform: error_mode: ignore trace_statements: + # Sanitize spans to prevent span metrics cardinality explosion + # caused by non-compliant high cardinality span names: + # 1. Define missing http.route on key HTTP operations for meaningful operation names + # 2. Then normalize span names; http server spans lacking http.route default to operations "GET", "POST", etc. - context: span + # FRONTEND SERVICE + conditions: + - span.kind == SPAN_KIND_SERVER and resource.attributes["service.name"] == "frontend" and span.attributes["http.route"] == nil statements: - # could be removed when https://github.com/vercel/next.js/pull/64852 is fixed upstream - - replace_pattern(name, "\\?.*", "") - - replace_match(name, "GET /api/products/*", "GET /api/products/{productId}") + # Workaround for Next.js high cardinality span name issue: https://github.com/vercel/next.js/issues/54694 + - set(span.attributes["http.route"], "/api/cart") where IsMatch(span.attributes["http.target"], "\\/api\\/cart") # e.g. # /api/cart + - set(span.attributes["http.route"], "/api/checkout") where IsMatch(span.attributes["http.target"], "\\/api\\/checkout") # e.g. # /api/checkout + - set(span.attributes["http.route"], "/api/products/{productId}") where IsMatch(span.attributes["http.target"], "\\/api\\/products\\/.*") # e.g. /api/products/1YMWWN1N4O + - set(span.attributes["http.route"], "/api/recommendations") where IsMatch(span.attributes["http.target"], "\\/api\\/recommendations") # e.g. # /api/recommendations?productIds=... + - set(span.attributes["http.route"], "/api/data") where IsMatch(span.attributes["http.target"], "\\/api\\/data.*") # e.g. # " /api/data?contextKeys=telescopes" or /api/data/?contextKeys=cameras + - context: span + statements: + # SANITIZE ALL SPAN NAMES TO PREVENT CARDINALITY EXPLOSION + - set_semconv_span_name("1.37.0", "unsanitized_span_name") resource: attributes: - key: service.instance.id