Skip to content

Commit 9e973bd

Browse files
fatsheep9146cartersocha
authored and
AlexanderWert
committed
[collector] update collector to 0.76.1 and remove connectors feature gates (open-telemetry#857)
* update collector to 0.76.1 and remove connectors feature gates Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> * add change log entry Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> --------- Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
1 parent de4cbac commit 9e973bd

3 files changed

Lines changed: 22 additions & 20 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ release.
1313
([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
1414
* [chore] use `otel-demo` namespace for generated kubernetes manifests
1515
([#848](https://github.com/open-telemetry/opentelemetry-demo/pull/848))
16+
* [collector] update collector version to 0.76.1 and remove connectors feature gate.
17+
([#857](https://github.com/open-telemetry/opentelemetry-demo/pull/857))
1618

1719
## 1.4.0
1820

‎docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,14 +616,14 @@ services:
616616

617617
# OpenTelemetry Collector
618618
otelcol:
619-
image: otel/opentelemetry-collector-contrib:0.75.0
619+
image: otel/opentelemetry-collector-contrib:0.76.1
620620
container_name: otel-col
621621
deploy:
622622
resources:
623623
limits:
624624
memory: 125M
625625
restart: unless-stopped
626-
command: [ "--feature-gates=service.connectors", "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
626+
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
627627
volumes:
628628
- ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml
629629
- ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml

‎src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
},
114114
"editorMode": "code",
115115
"exemplar": false,
116-
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
116+
"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)))",
117117
"format": "time_series",
118118
"hide": true,
119119
"instant": false,
@@ -129,7 +129,7 @@
129129
},
130130
"editorMode": "code",
131131
"exemplar": false,
132-
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
132+
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
133133
"hide": false,
134134
"instant": true,
135135
"interval": "",
@@ -144,7 +144,7 @@
144144
},
145145
"editorMode": "code",
146146
"exemplar": false,
147-
"expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
147+
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
148148
"hide": true,
149149
"interval": "",
150150
"legendFormat": "quantile99",
@@ -158,7 +158,7 @@
158158
},
159159
"editorMode": "code",
160160
"exemplar": false,
161-
"expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
161+
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
162162
"hide": true,
163163
"interval": "",
164164
"legendFormat": "quantile999",
@@ -238,7 +238,7 @@
238238
},
239239
"editorMode": "code",
240240
"exemplar": false,
241-
"expr": "topk(7,sum by (service_name) (rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))",
241+
"expr": "topk(7,sum by (service_name) (rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))",
242242
"format": "time_series",
243243
"instant": true,
244244
"interval": "",
@@ -316,7 +316,7 @@
316316
},
317317
"editorMode": "code",
318318
"exemplar": false,
319-
"expr": "topk(7,sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))",
319+
"expr": "topk(7,sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))",
320320
"instant": true,
321321
"interval": "",
322322
"legendFormat": "{{service_name}}",
@@ -489,7 +489,7 @@
489489
"uid": "webstore-metrics"
490490
},
491491
"exemplar": false,
492-
"expr": "topk(7, sum(rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ",
492+
"expr": "topk(7, sum(rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ",
493493
"format": "table",
494494
"instant": true,
495495
"interval": "",
@@ -502,7 +502,7 @@
502502
"uid": "webstore-metrics"
503503
},
504504
"exemplar": false,
505-
"expr": "topk(7, sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))",
505+
"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))",
506506
"format": "table",
507507
"hide": false,
508508
"instant": true,
@@ -696,7 +696,7 @@
696696
},
697697
"editorMode": "code",
698698
"exemplar": false,
699-
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
699+
"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)))",
700700
"format": "time_series",
701701
"hide": true,
702702
"instant": false,
@@ -712,7 +712,7 @@
712712
},
713713
"editorMode": "code",
714714
"exemplar": false,
715-
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
715+
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
716716
"hide": false,
717717
"instant": true,
718718
"interval": "",
@@ -727,7 +727,7 @@
727727
},
728728
"editorMode": "code",
729729
"exemplar": false,
730-
"expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
730+
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
731731
"hide": true,
732732
"interval": "",
733733
"legendFormat": "quantile99",
@@ -741,7 +741,7 @@
741741
},
742742
"editorMode": "code",
743743
"exemplar": false,
744-
"expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
744+
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
745745
"hide": true,
746746
"interval": "",
747747
"legendFormat": "quantile999",
@@ -812,7 +812,7 @@
812812
},
813813
"editorMode": "code",
814814
"exemplar": false,
815-
"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])))",
815+
"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])))",
816816
"instant": true,
817817
"interval": "",
818818
"legendFormat": "{{span_name}} [{{service_name}}]",
@@ -916,7 +916,7 @@
916916
},
917917
"editorMode": "code",
918918
"exemplar": true,
919-
"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])))",
919+
"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])))",
920920
"instant": false,
921921
"interval": "",
922922
"legendFormat": "[{{service_name}}] {{span_name}}",
@@ -945,14 +945,14 @@
945945
"type": "prometheus",
946946
"uid": "webstore-metrics"
947947
},
948-
"definition": "query_result(count by (service_name)(count_over_time(calls[$__range])))",
948+
"definition": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))",
949949
"hide": 0,
950950
"includeAll": true,
951951
"multi": true,
952952
"name": "service",
953953
"options": [],
954954
"query": {
955-
"query": "query_result(count by (service_name)(count_over_time(calls[$__range])))",
955+
"query": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))",
956956
"refId": "StandardVariableQuery"
957957
},
958958
"refresh": 2,
@@ -972,14 +972,14 @@
972972
"type": "prometheus",
973973
"uid": "webstore-metrics"
974974
},
975-
"definition": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))",
975+
"definition": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))",
976976
"hide": 0,
977977
"includeAll": true,
978978
"multi": true,
979979
"name": "span_name",
980980
"options": [],
981981
"query": {
982-
"query": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))",
982+
"query": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))",
983983
"refId": "StandardVariableQuery"
984984
},
985985
"refresh": 2,

0 commit comments

Comments
 (0)