Skip to content

WIP: native otel names #2632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
+420 −580
Draft

WIP: native otel names #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
31712d4
one
ywwg Oct 7, 2025
5a000fe
the rest
ywwg Oct 7, 2025
b4d3664
fix the rest
ywwg Oct 7, 2025
92837af
fixing label names and alerts
ywwg Oct 8, 2025
2d772bb
Merge remote-tracking branch 'origin/main' into owilliams/dots
ywwg Oct 10, 2025
a9b57fd
so many fixes
ywwg Oct 10, 2025
1450910
fix job selector
ywwg Oct 14, 2025
855c746
more fixes
ywwg Oct 15, 2025
49ede6e
alert typos
ywwg Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
661 changes: 250 additions & 411 deletions kubernetes/opentelemetry-demo.yaml
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions src/grafana/provisioning/alerting/cart-service-alerting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ groups:
expr: |-
histogram_quantile(
0.95,
sum by (deployment_environment_name, service_namespace, service_name, service_instance_id, http_route, http_request_method, le) (
sum by (deployment_environment_name, "service.namespace", "service.name", "service.instance.id", "http.route", "http.request.method", le) (
rate(
http_server_request_duration_seconds_bucket{
{"http.server.request.duration_bucket",
deployment_environment_name="",
service_namespace="opentelemetry-demo",
service_name="cart",
http_request_method="POST",
http_route="/oteldemo.CartService/AddItem"
"service.namespace"="opentelemetry-demo",
"service.name"="cart",
"http.request.method"="POST",
"http.route"="/oteldemo.CartService/AddItem"
}[5m]
)
)
Expand Down Expand Up @@ -75,17 +75,17 @@ groups:
keepFiringFor: 2m
annotations:
description: |-
The 95th percentile response time for operation {{ $labels.service_namespace
}}/{{ $labels.service_name }} "{{ $labels.http_request_method }} {{
$labels.http_route }}" has been
above xxx seconds for 2 minutes on {{ $labels.service_instance_id}}. Current
The 95th percentile response time for operation {{ index $labels "service.namespace"
}}/{{ index $labels "service.name" }} "{{ index $labels "http.request.method" }} {{
index $labels "http.route" }}" has been
above 0.0001 seconds for 2 minutes on {{ index $labels "service.instance.id"}}. Current
value: {{ .Value | humanizeDuration }}.
summary: |-
High P95 for {{ $labels.service_namespace }}/{{ $labels.service_name }} "{{
$labels.http_request_method }} {{ $labels.http_route }}"
High P95 for {{ index $labels "service.namespace" }}/{{ index $labels "service.name" }} "{{
index $labels "http.request.method" }} {{ index $labels "http.route" }}"
labels:
service_name: cart
service_namespace: opentelemetry-demo
"service.name": cart
"service.namespace": opentelemetry-demo
severity: warning
team_name: webstore
isPaused: false
Expand Down
10 changes: 5 additions & 5 deletions src/grafana/provisioning/dashboards/demo/NGINX-metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
},
"disableTextWrap": false,
"editorMode": "builder",
"expr": "nginx_connections_accepted_total",
"expr": "{\"nginx.connections_accepted\"}",
"fullMetaSearch": false,
"includeNullMetadata": true,
"legendFormat": "__auto",
Expand Down Expand Up @@ -149,7 +149,7 @@
{
"disableTextWrap": false,
"editorMode": "builder",
"expr": "nginx_connections_handled_total",
"expr": "{\"nginx.connections_handled\"}",
"fullMetaSearch": false,
"includeNullMetadata": true,
"legendFormat": "{{__name__}}",
Expand Down Expand Up @@ -213,7 +213,7 @@
{
"disableTextWrap": false,
"editorMode": "builder",
"expr": "nginx_requests_total",
"expr": "{\"nginx.requests\"}",
"fullMetaSearch": false,
"includeNullMetadata": true,
"legendFormat": "{{__name__}}",
Expand Down Expand Up @@ -310,7 +310,7 @@
{
"disableTextWrap": false,
"editorMode": "builder",
"expr": "nginx_connections_current",
"expr": "{\"nginx.connections_current\"}",
"fullMetaSearch": false,
"includeNullMetadata": true,
"legendFormat": "{{state}}",
Expand Down Expand Up @@ -338,4 +338,4 @@
"title": "[Image-Provider] NGINX Metrics",
"uid": "6fb665e0-cb81-40a5-bd21-a9485c5477b4",
"version": 1
}
}
64 changes: 32 additions & 32 deletions src/grafana/provisioning/dashboards/demo/apm-dashboard.json
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions src/grafana/provisioning/dashboards/demo/demo-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "sum by (span_name) (rate(traces_span_metrics_duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))",
"expr": "sum by (span_name) (rate({\"traces.span.metrics.duration_count\", \"service.name\"=\"${service}\"}[$__rate_interval]))",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -254,7 +254,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "sum by (span_name) (rate(traces_span_metrics_calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))",
"expr": "sum by (span_name) (rate({\"traces.span.metrics.calls\", status_code=\"STATUS_CODE_ERROR\", \"service.name\"=\"${service}\"}[$__rate_interval]))",
"interval": "",
"legendFormat": "{{ span_name }}",
"range": true,
Expand Down Expand Up @@ -356,7 +356,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.50, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le, span_name))",
"expr": "histogram_quantile(0.50, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=\"${service}\"}[$__rate_interval])) by (le, span_name))",
"legendFormat": "{{span_name}}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -752,7 +752,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100",
"expr": "rate({\"process.runtime.cpython.cpu_time\", type=~\"system\"}[$__rate_interval])*100",
"hide": false,
"interval": "2m",
"legendFormat": "{{job}} ({{type}})",
Expand All @@ -765,7 +765,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100",
"expr": "rate({\"process.runtime.cpython.cpu_time\", type=~\"user\"}[$__rate_interval])*100",
"hide": false,
"interval": "2m",
"legendFormat": "{{job}} ({{type}})",
Expand Down Expand Up @@ -874,7 +874,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}",
"expr": "{\"process.runtime.cpython.memory\", type=\"rss\"}",
"legendFormat": "{{job}}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -980,7 +980,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])",
"expr": "rate(app_recommendations_counter{\"recommendation.type\"=\"catalog\"}[$__rate_interval])",
"interval": "2m",
"legendFormat": "recommendations",
"range": true,
Expand Down Expand Up @@ -1079,7 +1079,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(otel_trace_span_processor_spans{job=\"quote\"}[2m])*120",
"expr": "rate({\"otel.trace.span_processor.spans\", job=\"opentelemetry-demo/quote\"}[2m])*120",
"interval": "2m",
"legendFormat": "{{state}}",
"range": true,
Expand Down Expand Up @@ -1158,13 +1158,13 @@
"type": "prometheus",
"uid": "webstore-metrics"
},
"definition": "traces_span_metrics_duration_milliseconds_bucket",
"definition": "{\"traces.span.metrics.duration_bucket\"}",
"includeAll": false,
"label": "Service",
"name": "service",
"options": [],
"query": {
"query": "traces_span_metrics_duration_milliseconds_bucket",
"query": "{\"traces.span.metrics.duration_bucket\"}",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
Expand Down
8 changes: 4 additions & 4 deletions src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"disableTextWrap": false,
"editorMode": "builder",
"exemplar": true,
"expr": "sum by(le) (rate(app_cart_get_cart_latency_seconds_bucket[$__rate_interval]))",
"expr": "sum by(le) (rate({\"app.cart.get_cart.latency_bucket\"}[$__rate_interval]))",
"format": "heatmap",
"fullMetaSearch": false,
"includeNullMetadata": false,
Expand Down Expand Up @@ -231,7 +231,7 @@
"disableTextWrap": false,
"editorMode": "builder",
"exemplar": true,
"expr": "histogram_quantile(0.95, sum by(le) (rate(app_cart_get_cart_latency_seconds_bucket[$__rate_interval])))",
"expr": "histogram_quantile(0.95, sum by(le) (rate({\"app.cart.get_cart.latency_bucket\"}[$__rate_interval])))",
"fullMetaSearch": false,
"includeNullMetadata": false,
"legendFormat": "p95 GetCart",
Expand Down Expand Up @@ -324,7 +324,7 @@
"disableTextWrap": false,
"editorMode": "builder",
"exemplar": true,
"expr": "sum by(le) (rate(app_cart_add_item_latency_seconds_bucket[$__rate_interval]))",
"expr": "sum by(le) (rate({\"app.cart.add_item.latency_bucket\"}[$__rate_interval]))",
"format": "heatmap",
"fullMetaSearch": false,
"includeNullMetadata": false,
Expand Down Expand Up @@ -428,7 +428,7 @@
"disableTextWrap": false,
"editorMode": "builder",
"exemplar": true,
"expr": "histogram_quantile(0.95, sum by(le) (rate(app_cart_add_item_latency_seconds_bucket[$__rate_interval])))",
"expr": "histogram_quantile(0.95, sum by(le) (rate({\"app.cart.add_item.latency_bucket\"}[$__rate_interval])))",
"fullMetaSearch": false,
"includeNullMetadata": false,
"legendFormat": "p95 AddItem",
Expand Down
Loading
Loading