Skip to content

Commit 2ed208a

Browse files
skudasovskudasov
authored
JD fork test example, b64 decoding for OTEL, workflow custom messages dashboard (#1774)
* JD fork test example * set WaitHealthy logs to debug * skip typos check for flakeguard tests with logs * dashboard for CRE custom messages * changeset * go mod * update custom msgs query
1 parent 2943192 commit 2ed208a

File tree

19 files changed

+193
-282
lines changed

19 files changed

+193
-282
lines changed

‎_typos.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ extend-exclude = [
44
"framework/examples/myproject_cll/README.md",
55
"framework/components/blockchain/tron.go",
66
"tools/flakeguard/e2e-flaky-test-guide.md",
7+
"tools/flakeguard/runner/**",
78
"infra/**",
89
"book/**",
910
"**/go.mod",

‎framework/.changeset/v0.7.4.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- JD dump-restore example
2+
- Add dashboard query for workflow custom messages
3+
- Add b64 decoding for OTEL

‎framework/clclient/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (c *ChainlinkClient) WaitHealthy(pattern, status string, attempts uint) err
139139
}
140140
err = retry.Do(
141141
func() error {
142-
framework.L.Info().Str(NodeURL, c.Config.URL).Uint("Attempts", attempts).Msg("Awaiting Chainlink node health status")
142+
framework.L.Debug().Str(NodeURL, c.Config.URL).Uint("Attempts", attempts).Msg("Awaiting Chainlink node health status")
143143
resp, err := c.APIClient.R().
144144
SetResult(&respBody).
145145
Get("/health")

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

Lines changed: 74 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,54 @@
258258
"transparent": true,
259259
"type": "logs"
260260
},
261+
{
262+
"datasource": {
263+
"type": "loki",
264+
"uid": "P8E80F9AEF21F6940"
265+
},
266+
"description": "Workflow Custom Messages",
267+
"gridPos": {
268+
"h": 6,
269+
"w": 24,
270+
"x": 0,
271+
"y": 22
272+
},
273+
"id": 61,
274+
"options": {
275+
"dedupStrategy": "exact",
276+
"enableLogDetails": true,
277+
"prettifyLogMessage": false,
278+
"showCommonLabels": false,
279+
"showLabels": false,
280+
"showLogContextToggle": false,
281+
"showTime": true,
282+
"sortOrder": "Descending",
283+
"wrapLogMessage": true
284+
},
285+
"targets": [
286+
{
287+
"datasource": {
288+
"type": "loki"
289+
},
290+
"editorMode": "code",
291+
"expr": "{service_name=~\".*chainlink\"} !~ \"heartbeat\"\n| json | __error__ = \"\"",
292+
"format": "",
293+
"legendFormat": "",
294+
"queryType": "range",
295+
"refId": "A"
296+
}
297+
],
298+
"title": "Workflow Custom Messages",
299+
"transparent": true,
300+
"type": "logs"
301+
},
261302
{
262303
"collapsed": true,
263304
"gridPos": {
264305
"h": 1,
265306
"w": 24,
266307
"x": 0,
267-
"y": 22
308+
"y": 28
268309
},
269310
"id": 56,
270311
"panels": [
@@ -449,7 +490,7 @@
449490
"h": 1,
450491
"w": 24,
451492
"x": 0,
452-
"y": 23
493+
"y": 29
453494
},
454495
"id": 57,
455496
"panels": [],
@@ -487,7 +528,7 @@
487528
"h": 4,
488529
"w": 12,
489530
"x": 0,
490-
"y": 24
531+
"y": 30
491532
},
492533
"id": 3,
493534
"options": {
@@ -559,7 +600,7 @@
559600
"h": 4,
560601
"w": 12,
561602
"x": 12,
562-
"y": 24
603+
"y": 30
563604
},
564605
"id": 4,
565606
"options": {
@@ -665,7 +706,7 @@
665706
"h": 8,
666707
"w": 24,
667708
"x": 0,
668-
"y": 28
709+
"y": 34
669710
},
670711
"id": 6,
671712
"interval": "5s",
@@ -768,7 +809,7 @@
768809
"h": 8,
769810
"w": 24,
770811
"x": 0,
771-
"y": 36
812+
"y": 42
772813
},
773814
"id": 7,
774815
"interval": "5s",
@@ -871,7 +912,7 @@
871912
"h": 8,
872913
"w": 24,
873914
"x": 0,
874-
"y": 44
915+
"y": 50
875916
},
876917
"id": 8,
877918
"interval": "5s",
@@ -974,7 +1015,7 @@
9741015
"h": 8,
9751016
"w": 16,
9761017
"x": 0,
977-
"y": 52
1018+
"y": 58
9781019
},
9791020
"id": 9,
9801021
"options": {
@@ -1071,7 +1112,7 @@
10711112
"h": 8,
10721113
"w": 8,
10731114
"x": 16,
1074-
"y": 52
1115+
"y": 58
10751116
},
10761117
"id": 10,
10771118
"interval": "5s",
@@ -1174,7 +1215,7 @@
11741215
"h": 8,
11751216
"w": 16,
11761217
"x": 0,
1177-
"y": 60
1218+
"y": 66
11781219
},
11791220
"id": 11,
11801221
"options": {
@@ -1271,7 +1312,7 @@
12711312
"h": 8,
12721313
"w": 8,
12731314
"x": 16,
1274-
"y": 60
1315+
"y": 66
12751316
},
12761317
"id": 12,
12771318
"interval": "5s",
@@ -1374,7 +1415,7 @@
13741415
"h": 8,
13751416
"w": 16,
13761417
"x": 0,
1377-
"y": 68
1418+
"y": 74
13781419
},
13791420
"id": 13,
13801421
"options": {
@@ -1471,7 +1512,7 @@
14711512
"h": 8,
14721513
"w": 8,
14731514
"x": 16,
1474-
"y": 68
1515+
"y": 74
14751516
},
14761517
"id": 14,
14771518
"interval": "5s",
@@ -1574,7 +1615,7 @@
15741615
"h": 8,
15751616
"w": 16,
15761617
"x": 0,
1577-
"y": 76
1618+
"y": 82
15781619
},
15791620
"id": 15,
15801621
"options": {
@@ -1671,7 +1712,7 @@
16711712
"h": 8,
16721713
"w": 8,
16731714
"x": 16,
1674-
"y": 76
1715+
"y": 82
16751716
},
16761717
"id": 16,
16771718
"interval": "5s",
@@ -1773,7 +1814,7 @@
17731814
"h": 8,
17741815
"w": 12,
17751816
"x": 0,
1776-
"y": 84
1817+
"y": 90
17771818
},
17781819
"id": 17,
17791820
"options": {
@@ -1870,7 +1911,7 @@
18701911
"h": 8,
18711912
"w": 12,
18721913
"x": 12,
1873-
"y": 84
1914+
"y": 90
18741915
},
18751916
"id": 18,
18761917
"options": {
@@ -1967,7 +2008,7 @@
19672008
"h": 8,
19682009
"w": 12,
19692010
"x": 0,
1970-
"y": 92
2011+
"y": 98
19712012
},
19722013
"id": 19,
19732014
"options": {
@@ -2064,7 +2105,7 @@
20642105
"h": 8,
20652106
"w": 12,
20662107
"x": 12,
2067-
"y": 92
2108+
"y": 98
20682109
},
20692110
"id": 20,
20702111
"options": {
@@ -2161,7 +2202,7 @@
21612202
"h": 8,
21622203
"w": 12,
21632204
"x": 0,
2164-
"y": 100
2205+
"y": 106
21652206
},
21662207
"id": 21,
21672208
"options": {
@@ -2258,7 +2299,7 @@
22582299
"h": 8,
22592300
"w": 12,
22602301
"x": 12,
2261-
"y": 100
2302+
"y": 106
22622303
},
22632304
"id": 22,
22642305
"options": {
@@ -2355,7 +2396,7 @@
23552396
"h": 8,
23562397
"w": 12,
23572398
"x": 0,
2358-
"y": 108
2399+
"y": 114
23592400
},
23602401
"id": 23,
23612402
"options": {
@@ -2452,7 +2493,7 @@
24522493
"h": 8,
24532494
"w": 12,
24542495
"x": 12,
2455-
"y": 108
2496+
"y": 114
24562497
},
24572498
"id": 24,
24582499
"options": {
@@ -2490,7 +2531,7 @@
24902531
"h": 1,
24912532
"w": 24,
24922533
"x": 0,
2493-
"y": 116
2534+
"y": 122
24942535
},
24952536
"id": 58,
24962537
"panels": [],
@@ -2562,7 +2603,7 @@
25622603
"h": 8,
25632604
"w": 24,
25642605
"x": 0,
2565-
"y": 117
2606+
"y": 123
25662607
},
25672608
"id": 28,
25682609
"options": {
@@ -2659,7 +2700,7 @@
26592700
"h": 8,
26602701
"w": 24,
26612702
"x": 0,
2662-
"y": 125
2703+
"y": 131
26632704
},
26642705
"id": 29,
26652706
"options": {
@@ -2756,7 +2797,7 @@
27562797
"h": 8,
27572798
"w": 24,
27582799
"x": 0,
2759-
"y": 133
2800+
"y": 139
27602801
},
27612802
"id": 30,
27622803
"options": {
@@ -2853,7 +2894,7 @@
28532894
"h": 8,
28542895
"w": 24,
28552896
"x": 0,
2856-
"y": 141
2897+
"y": 147
28572898
},
28582899
"id": 31,
28592900
"options": {
@@ -2950,7 +2991,7 @@
29502991
"h": 8,
29512992
"w": 24,
29522993
"x": 0,
2953-
"y": 149
2994+
"y": 155
29542995
},
29552996
"id": 32,
29562997
"options": {
@@ -3047,7 +3088,7 @@
30473088
"h": 8,
30483089
"w": 24,
30493090
"x": 0,
3050-
"y": 157
3091+
"y": 163
30513092
},
30523093
"id": 33,
30533094
"options": {
@@ -3144,7 +3185,7 @@
31443185
"h": 8,
31453186
"w": 24,
31463187
"x": 0,
3147-
"y": 165
3188+
"y": 171
31483189
},
31493190
"id": 34,
31503191
"options": {
@@ -3177,7 +3218,7 @@
31773218
"type": "timeseries"
31783219
}
31793220
],
3180-
"refresh": "10s",
3221+
"refresh": "30s",
31813222
"schemaVersion": 38,
31823223
"style": "dark",
31833224
"tags": [
@@ -3191,7 +3232,7 @@
31913232
"list": []
31923233
},
31933234
"time": {
3194-
"from": "now-5m",
3235+
"from": "now-1h",
31953236
"to": "now"
31963237
},
31973238
"timepicker": {},

‎framework/cmd/observability/compose/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
- "14250:14250" # jaeger grpc
1515
- "55680:55680" # otlp http legacy
1616
otel-collector:
17-
image: otel/opentelemetry-collector-contrib:0.96.0
17+
image: otel/opentelemetry-collector-contrib:0.123.0
1818
volumes:
1919
- ./otel.yaml:/etc/otel/config.yaml
2020
command:

0 commit comments

Comments
 (0)