Skip to content

Commit

Permalink
[collector] update collector to 0.76.1 and remove connectors feature …
Browse files Browse the repository at this point in the history 
…gates (#857)

* update collector to 0.76.1 and remove connectors feature gates

Signed-off-by: Ziqi Zhao <[email protected]>

* add change log entry

Signed-off-by: Ziqi Zhao <[email protected]>

---------

Signed-off-by: Ziqi Zhao <[email protected]>
Co-authored-by: Carter Socha <[email protected]>
  • Loading branch information
@fatsheep9146 @cartersocha
fatsheep9146 and cartersocha authored May 1, 2023
1 parent 5b87e2b commit d01c25d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 20 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 18 additions & 18 deletions src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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": "",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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}}",
Expand Down Expand Up @@ -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": "",
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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": "",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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}}]",
Expand Down Expand Up @@ -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}}",
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit d01c25d

Please sign in to comment.