Skip to content

Commit ca45d89

Browse files
skudasovskudasov
committed
remove otel batching
1 parent 76e0156 commit ca45d89

File tree

4 files changed

+40
-88
lines changed

4 files changed

+40
-88
lines changed

‎framework/cmd/observability/compose/conf/provisioning/dashboards/workflow-engine/engine.json‎

Lines changed: 19 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@
996996
"uid": "PBFA97CFB590B2093"
997997
},
998998
"editorMode": "code",
999-
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[2m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
999+
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[1m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
10001000
"legendFormat": "__auto",
10011001
"range": true,
10021002
"refId": "A"
@@ -1098,7 +1098,7 @@
10981098
"uid": "PBFA97CFB590B2093"
10991099
},
11001100
"editorMode": "code",
1101-
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_completed_time_seconds_count{}[2m]) > 0)",
1101+
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_completed_time_seconds_count{}[1m]) > 0)",
11021102
"legendFormat": "{{workflowName}}",
11031103
"range": true,
11041104
"refId": "A"
@@ -1196,7 +1196,7 @@
11961196
"uid": "PBFA97CFB590B2093"
11971197
},
11981198
"editorMode": "code",
1199-
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[2m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
1199+
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[1m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
12001200
"legendFormat": "__auto",
12011201
"range": true,
12021202
"refId": "A"
@@ -1298,7 +1298,7 @@
12981298
"uid": "PBFA97CFB590B2093"
12991299
},
13001300
"editorMode": "code",
1301-
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_earlyexit_time_seconds_count{}[2m]) > 0)",
1301+
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_earlyexit_time_seconds_count{}[1m]) > 0)",
13021302
"legendFormat": "{{workflowName}}",
13031303
"range": true,
13041304
"refId": "A"
@@ -1396,7 +1396,7 @@
13961396
"uid": "PBFA97CFB590B2093"
13971397
},
13981398
"editorMode": "code",
1399-
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[2m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
1399+
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[1m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
14001400
"legendFormat": "__auto",
14011401
"range": true,
14021402
"refId": "A"
@@ -1498,7 +1498,7 @@
14981498
"uid": "PBFA97CFB590B2093"
14991499
},
15001500
"editorMode": "code",
1501-
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_error_time_seconds_count{}[2m]) > 0)",
1501+
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_error_time_seconds_count{}[1m]))",
15021502
"legendFormat": "{{workflowName}}",
15031503
"range": true,
15041504
"refId": "A"
@@ -1596,7 +1596,7 @@
15961596
"uid": "PBFA97CFB590B2093"
15971597
},
15981598
"editorMode": "code",
1599-
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[2m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[2m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
1599+
"expr": "sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[1m]\n )\n) / (\n sum by (workflowName) (\n increase(\n platform_engine_workflow_completed_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_earlyexit_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_error_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n ) + sum by (workflowName) (\n increase(\n platform_engine_workflow_timeout_time_seconds_count{}[1m]\n ) or platform_engine_workflow_count{} * 0\n )\n)",
16001600
"legendFormat": "__auto",
16011601
"range": true,
16021602
"refId": "A"
@@ -1698,7 +1698,7 @@
16981698
"uid": "PBFA97CFB590B2093"
16991699
},
17001700
"editorMode": "code",
1701-
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_timeout_time_seconds_count{}[2m]) > 0)",
1701+
"expr": "group by (workflowName, workflowID) (rate(platform_engine_workflow_timeout_time_seconds_count{}[1m]) > 0)",
17021702
"legendFormat": "__auto",
17031703
"range": true,
17041704
"refId": "A"
@@ -1795,7 +1795,7 @@
17951795
"uid": "PBFA97CFB590B2093"
17961796
},
17971797
"editorMode": "code",
1798-
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_completed_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
1798+
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_completed_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
17991799
"legendFormat": "__auto",
18001800
"range": true,
18011801
"refId": "A"
@@ -1892,7 +1892,7 @@
18921892
"uid": "PBFA97CFB590B2093"
18931893
},
18941894
"editorMode": "code",
1895-
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_completed_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
1895+
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_completed_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
18961896
"legendFormat": "__auto",
18971897
"range": true,
18981898
"refId": "A"
@@ -1989,7 +1989,7 @@
19891989
"uid": "PBFA97CFB590B2093"
19901990
},
19911991
"editorMode": "code",
1992-
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_earlyexit_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
1992+
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_earlyexit_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
19931993
"legendFormat": "__auto",
19941994
"range": true,
19951995
"refId": "A"
@@ -2086,7 +2086,7 @@
20862086
"uid": "PBFA97CFB590B2093"
20872087
},
20882088
"editorMode": "code",
2089-
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_earlyexit_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
2089+
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_earlyexit_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
20902090
"legendFormat": "__auto",
20912091
"range": true,
20922092
"refId": "A"
@@ -2183,7 +2183,7 @@
21832183
"uid": "PBFA97CFB590B2093"
21842184
},
21852185
"editorMode": "code",
2186-
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_error_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
2186+
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_error_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
21872187
"legendFormat": "__auto",
21882188
"range": true,
21892189
"refId": "A"
@@ -2280,7 +2280,7 @@
22802280
"uid": "PBFA97CFB590B2093"
22812281
},
22822282
"editorMode": "code",
2283-
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_error_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
2283+
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_error_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
22842284
"legendFormat": "__auto",
22852285
"range": true,
22862286
"refId": "A"
@@ -2377,7 +2377,7 @@
23772377
"uid": "PBFA97CFB590B2093"
23782378
},
23792379
"editorMode": "code",
2380-
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_timeout_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
2380+
"expr": "max(histogram_quantile(0.95, sum(increase(platform_engine_workflow_timeout_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
23812381
"legendFormat": "__auto",
23822382
"range": true,
23832383
"refId": "A"
@@ -2474,7 +2474,7 @@
24742474
"uid": "PBFA97CFB590B2093"
24752475
},
24762476
"editorMode": "code",
2477-
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_timeout_time_seconds_bucket{}[15m])) by (le, workflowName, csa_public_key))) by (workflowName)",
2477+
"expr": "max(histogram_quantile(0.99, sum(increase(platform_engine_workflow_timeout_time_seconds_bucket{}[1m])) by (le, workflowName, csa_public_key))) by (workflowName)",
24782478
"legendFormat": "__auto",
24792479
"range": true,
24802480
"refId": "A"
@@ -3177,7 +3177,7 @@
31773177
"type": "timeseries"
31783178
}
31793179
],
3180-
"refresh": "30s",
3180+
"refresh": "10s",
31813181
"schemaVersion": 38,
31823182
"style": "dark",
31833183
"tags": [
@@ -3188,75 +3188,10 @@
31883188
" Performance"
31893189
],
31903190
"templating": {
3191-
"list": [
3192-
{
3193-
"current": {
3194-
"selected": false,
3195-
"text": [
3196-
"otel-collector"
3197-
],
3198-
"value": [
3199-
"otel-collector"
3200-
]
3201-
},
3202-
"datasource": {
3203-
"type": "prometheus",
3204-
"uid": "PBFA97CFB590B2093"
3205-
},
3206-
"definition": "label_values(up,job)",
3207-
"description": "",
3208-
"hide": 0,
3209-
"includeAll": true,
3210-
"label": "Job",
3211-
"multi": true,
3212-
"name": "job",
3213-
"options": [],
3214-
"query": {
3215-
"query": "label_values(up,job)",
3216-
"refId": "PrometheusVariableQueryEditor-VariableQuery"
3217-
},
3218-
"refresh": 1,
3219-
"regex": "",
3220-
"skipUrlSync": false,
3221-
"sort": 0,
3222-
"type": "query"
3223-
},
3224-
{
3225-
"current": {
3226-
"selected": false,
3227-
"text": [
3228-
"All"
3229-
],
3230-
"value": [
3231-
"$__all"
3232-
]
3233-
},
3234-
"datasource": {
3235-
"type": "prometheus",
3236-
"uid": "PBFA97CFB590B2093"
3237-
},
3238-
"definition": "label_values(platform_engine_workflow_count,workflowID)",
3239-
"description": "",
3240-
"hide": 0,
3241-
"includeAll": true,
3242-
"label": "WorkflowID",
3243-
"multi": true,
3244-
"name": "workflowID",
3245-
"options": [],
3246-
"query": {
3247-
"query": "label_values(platform_engine_workflow_count,workflowID)",
3248-
"refId": "PrometheusVariableQueryEditor-VariableQuery"
3249-
},
3250-
"refresh": 1,
3251-
"regex": "",
3252-
"skipUrlSync": false,
3253-
"sort": 0,
3254-
"type": "query"
3255-
}
3256-
]
3191+
"list": []
32573192
},
32583193
"time": {
3259-
"from": "now-30m",
3194+
"from": "now-5m",
32603195
"to": "now"
32613196
},
32623197
"timepicker": {},

‎framework/cmd/observability/compose/otel.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,10 @@ service:
2929
pipelines:
3030
traces:
3131
receivers: [otlp]
32-
processors: [batch]
3332
exporters: [debug, otlp]
3433
logs:
3534
receivers: [otlp]
36-
processors: [batch]
3735
exporters: [debug, otlphttp/logs]
3836
metrics:
3937
receivers: [otlp]
40-
processors: [batch]
4138
exporters: [debug, prometheus]

‎framework/examples/myproject/go.mod‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/blocto/solana-go-sdk v1.30.0
1414
github.com/ethereum/go-ethereum v1.15.0
1515
github.com/go-resty/resty/v2 v2.16.3
16-
github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.0
16+
github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.1
1717
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2
1818
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10
1919
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2
@@ -40,6 +40,7 @@ require (
4040
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4141
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4242
github.com/Microsoft/go-winio v0.6.2 // indirect
43+
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
4344
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
4445
github.com/armon/go-metrics v0.4.1 // indirect
4546
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -71,6 +72,7 @@ require (
7172
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7273
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7374
github.com/chaos-mesh/chaos-mesh/api v0.0.0-20240821051457-da69c6d9617a // indirect
75+
github.com/cloudflare/circl v1.1.0 // indirect
7476
github.com/cloudwego/base64x v0.1.4 // indirect
7577
github.com/cloudwego/iasm v0.2.0 // indirect
7678
github.com/coder/websocket v1.8.12 // indirect
@@ -81,6 +83,7 @@ require (
8183
github.com/coreos/go-semver v0.3.1 // indirect
8284
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8385
github.com/cpuguy83/dockercfg v0.3.2 // indirect
86+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
8487
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
8588
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
8689
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -135,6 +138,8 @@ require (
135138
github.com/google/btree v1.1.3 // indirect
136139
github.com/google/gnostic-models v0.6.8 // indirect
137140
github.com/google/go-cmp v0.6.0 // indirect
141+
github.com/google/go-github/v50 v50.2.0 // indirect
142+
github.com/google/go-querystring v1.1.0 // indirect
138143
github.com/google/gofuzz v1.2.0 // indirect
139144
github.com/google/s2a-go v0.1.9 // indirect
140145
github.com/google/uuid v1.6.0 // indirect
@@ -209,6 +214,7 @@ require (
209214
github.com/opentracing-contrib/go-grpc v0.1.1 // indirect
210215
github.com/opentracing-contrib/go-stdlib v1.1.0 // indirect
211216
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
217+
github.com/pelletier/go-toml v1.9.5 // indirect
212218
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
213219
github.com/pires/go-proxyproto v0.7.0 // indirect
214220
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@@ -226,6 +232,7 @@ require (
226232
github.com/redis/go-redis/v9 v9.7.0 // indirect
227233
github.com/robfig/cron/v3 v3.0.1 // indirect
228234
github.com/rs/zerolog v1.33.0 // indirect
235+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
229236
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
230237
github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
231238
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
@@ -251,7 +258,9 @@ require (
251258
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
252259
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
253260
github.com/ugorji/go/codec v1.2.12 // indirect
261+
github.com/urfave/cli/v2 v2.27.5 // indirect
254262
github.com/x448/float16 v0.8.4 // indirect
263+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
255264
github.com/yusufpapurcu/wmi v1.2.4 // indirect
256265
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
257266
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect

0 commit comments

Comments
 (0)