diff --git a/CHANGELOG.md b/CHANGELOG.md index acdf6c55b2..0e98d909b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ release. ([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853)) * [chore] use `otel-demo` namespace for generated kubernetes manifests ([#848](https://github.com/open-telemetry/opentelemetry-demo/pull/848)) +* [collector] update collector version to 0.76.1 and remove connectors feature gate. + ([#857](https://github.com/open-telemetry/opentelemetry-demo/pull/857)) ## 1.4.0 diff --git a/docker-compose.yml b/docker-compose.yml index e21afb41f1..70bc4bc182 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -616,14 +616,14 @@ services: # OpenTelemetry Collector otelcol: - image: otel/opentelemetry-collector-contrib:0.75.0 + image: otel/opentelemetry-collector-contrib:0.76.1 container_name: otel-col deploy: resources: limits: memory: 125M restart: unless-stopped - command: [ "--feature-gates=service.connectors", "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ] + command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ] volumes: - ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml - ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml diff --git a/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json b/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json index 0a82318232..be3b329b21 100644 --- a/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json +++ b/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json @@ -113,7 +113,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", "format": "time_series", "hide": true, "instant": false, @@ -129,7 +129,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))", "hide": false, "instant": true, "interval": "", @@ -144,7 +144,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile99", @@ -158,7 +158,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile999", @@ -238,7 +238,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,sum by (service_name) (rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))", + "expr": "topk(7,sum by (service_name) (rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))", "format": "time_series", "instant": true, "interval": "", @@ -316,7 +316,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))", + "expr": "topk(7,sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))", "instant": true, "interval": "", "legendFormat": "{{service_name}}", @@ -489,7 +489,7 @@ "uid": "webstore-metrics" }, "exemplar": false, - "expr": "topk(7, sum(rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ", + "expr": "topk(7, sum(rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ", "format": "table", "instant": true, "interval": "", @@ -502,7 +502,7 @@ "uid": "webstore-metrics" }, "exemplar": false, - "expr": "topk(7, sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))", + "expr": "topk(7, sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))", "format": "table", "hide": false, "instant": true, @@ -696,7 +696,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", "format": "time_series", "hide": true, "instant": false, @@ -712,7 +712,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))", + "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))", "hide": false, "instant": true, "interval": "", @@ -727,7 +727,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile99", @@ -741,7 +741,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile999", @@ -812,7 +812,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7, sum by (span_name,service_name)(increase(duration_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))", + "expr": "topk(7, sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_milliseconds_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))", "instant": true, "interval": "", "legendFormat": "{{span_name}} [{{service_name}}]", @@ -916,7 +916,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "topk(7,sum by (span_name,service_name)(increase(duration_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))", + "expr": "topk(7,sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_milliseconds_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))", "instant": false, "interval": "", "legendFormat": "[{{service_name}}] {{span_name}}", @@ -945,14 +945,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "query_result(count by (service_name)(count_over_time(calls[$__range])))", + "definition": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))", "hide": 0, "includeAll": true, "multi": true, "name": "service", "options": [], "query": { - "query": "query_result(count by (service_name)(count_over_time(calls[$__range])))", + "query": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))", "refId": "StandardVariableQuery" }, "refresh": 2, @@ -972,14 +972,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))", + "definition": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))", "hide": 0, "includeAll": true, "multi": true, "name": "span_name", "options": [], "query": { - "query": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))", + "query": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))", "refId": "StandardVariableQuery" }, "refresh": 2,