Skip to content

Commit 79b0e7a

Browse files
cijothomascijothomas
authored
Merge branch 'main' into cijothomas/tuneguidance
2 parents 170c640 + 8ae3f08 commit 79b0e7a

14 files changed

Lines changed: 186 additions & 117 deletions

File tree

‎collector/cmd/otelarrowcol/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
go.opentelemetry.io/collector/receiver v1.49.0
3232
go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.0
3333
go.opentelemetry.io/collector/service v0.143.0
34-
golang.org/x/sys v0.40.0
34+
golang.org/x/sys v0.41.0
3535
)
3636

3737
require (
@@ -78,7 +78,7 @@ require (
7878
github.com/jonboulle/clockwork v0.5.0 // indirect
7979
github.com/json-iterator/go v1.1.12 // indirect
8080
github.com/kamstrup/intmap v0.5.2 // indirect
81-
github.com/klauspost/compress v1.18.3 // indirect
81+
github.com/klauspost/compress v1.18.4 // indirect
8282
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
8383
github.com/knadh/koanf/maps v0.1.2 // indirect
8484
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
@@ -203,14 +203,14 @@ require (
203203
go.uber.org/zap v1.27.1 // indirect
204204
go.yaml.in/yaml/v2 v2.4.3 // indirect
205205
go.yaml.in/yaml/v3 v3.0.4 // indirect
206-
golang.org/x/crypto v0.47.0 // indirect
207-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
208-
golang.org/x/mod v0.32.0 // indirect
209-
golang.org/x/net v0.49.0 // indirect
206+
golang.org/x/crypto v0.48.0 // indirect
207+
golang.org/x/exp v0.0.0-20260209203927-2842357ff358 // indirect
208+
golang.org/x/mod v0.33.0 // indirect
209+
golang.org/x/net v0.50.0 // indirect
210210
golang.org/x/sync v0.19.0 // indirect
211-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
212-
golang.org/x/text v0.33.0 // indirect
213-
golang.org/x/tools v0.41.0 // indirect
211+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
212+
golang.org/x/text v0.34.0 // indirect
213+
golang.org/x/tools v0.42.0 // indirect
214214
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
215215
gonum.org/v1/gonum v0.16.0 // indirect
216216
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect

‎collector/cmd/otelarrowcol/go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ github.com/kamstrup/intmap v0.5.2 h1:qnwBm1mh4XAnW9W9Ue9tZtTff8pS6+s6iKF6JRIV2Dk
114114
github.com/kamstrup/intmap v0.5.2/go.mod h1:gWUVWHKzWj8xpJVFf5GC0O26bWmv3GqdnIX/LMT6Aq4=
115115
github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
116116
github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
117-
github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw=
118-
github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
117+
github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
118+
github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
119119
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
120120
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
121121
github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
@@ -479,17 +479,17 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
479479
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
480480
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
481481
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
482-
golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
483-
golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
484-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU=
485-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU=
482+
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
483+
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
484+
golang.org/x/exp v0.0.0-20260209203927-2842357ff358 h1:kpfSV7uLwKJbFSEgNhWzGSL47NDSF/5pYYQw1V0ub6c=
485+
golang.org/x/exp v0.0.0-20260209203927-2842357ff358/go.mod h1:R3t0oliuryB5eenPWl3rrQxwnNM3WTwnsRZZiXLAAW8=
486486
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
487487
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
488488
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
489489
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
490490
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
491-
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
492-
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
491+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
492+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
493493
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
494494
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
495495
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -499,8 +499,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
499499
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
500500
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
501501
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
502-
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
503-
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
502+
golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
503+
golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
504504
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
505505
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
506506
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -523,11 +523,11 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
523523
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
524524
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
525525
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
526-
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
527-
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
526+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
527+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
528528
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
529-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 h1:O1cMQHRfwNpDfDJerqRoE2oD+AFlyid87D40L/OkkJo=
530-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=
529+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0=
530+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548=
531531
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
532532
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
533533
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -545,16 +545,16 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
545545
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
546546
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
547547
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
548-
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
549-
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
548+
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
549+
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
550550
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
551551
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
552552
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
553553
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
554554
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
555555
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
556-
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
557-
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
556+
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
557+
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
558558
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
559559
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
560560
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=

‎go/go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ require (
1111
github.com/brianvoe/gofakeit/v6 v6.28.0
1212
github.com/dustin/go-humanize v1.0.1
1313
github.com/fxamacker/cbor/v2 v2.9.0
14-
github.com/klauspost/compress v1.18.3
14+
github.com/klauspost/compress v1.18.4
1515
github.com/olekukonko/tablewriter v0.0.5
1616
github.com/pierrec/lz4 v2.6.1+incompatible
1717
github.com/stretchr/testify v1.11.1
1818
go.opentelemetry.io/collector/pdata v1.50.0
1919
go.opentelemetry.io/otel v1.39.0
2020
go.opentelemetry.io/otel/metric v1.39.0
2121
go.uber.org/mock v0.6.0
22-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
22+
golang.org/x/exp v0.0.0-20260209203927-2842357ff358
2323
google.golang.org/grpc v1.78.0
2424
google.golang.org/protobuf v1.36.11
2525
)
@@ -50,13 +50,13 @@ require (
5050
go.opentelemetry.io/collector/featuregate v1.50.0 // indirect
5151
go.opentelemetry.io/otel/trace v1.39.0 // indirect
5252
go.uber.org/multierr v1.11.0 // indirect
53-
golang.org/x/mod v0.32.0 // indirect
54-
golang.org/x/net v0.49.0 // indirect
53+
golang.org/x/mod v0.33.0 // indirect
54+
golang.org/x/net v0.50.0 // indirect
5555
golang.org/x/sync v0.19.0 // indirect
56-
golang.org/x/sys v0.40.0 // indirect
57-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
58-
golang.org/x/text v0.33.0 // indirect
59-
golang.org/x/tools v0.41.0 // indirect
56+
golang.org/x/sys v0.41.0 // indirect
57+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
58+
golang.org/x/text v0.34.0 // indirect
59+
golang.org/x/tools v0.42.0 // indirect
6060
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
6161
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
6262
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go/go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ github.com/kamstrup/intmap v0.5.2 h1:qnwBm1mh4XAnW9W9Ue9tZtTff8pS6+s6iKF6JRIV2Dk
5252
github.com/kamstrup/intmap v0.5.2/go.mod h1:gWUVWHKzWj8xpJVFf5GC0O26bWmv3GqdnIX/LMT6Aq4=
5353
github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
5454
github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
55-
github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw=
56-
github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
55+
github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
56+
github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
5757
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
5858
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
5959
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -129,22 +129,22 @@ go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
129129
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
130130
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
131131
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
132-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU=
133-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU=
134-
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
135-
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
136-
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
137-
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
132+
golang.org/x/exp v0.0.0-20260209203927-2842357ff358 h1:kpfSV7uLwKJbFSEgNhWzGSL47NDSF/5pYYQw1V0ub6c=
133+
golang.org/x/exp v0.0.0-20260209203927-2842357ff358/go.mod h1:R3t0oliuryB5eenPWl3rrQxwnNM3WTwnsRZZiXLAAW8=
134+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
135+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
136+
golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
137+
golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
138138
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
139139
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
140-
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
141-
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
142-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 h1:O1cMQHRfwNpDfDJerqRoE2oD+AFlyid87D40L/OkkJo=
143-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=
144-
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
145-
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
146-
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
147-
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
140+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
141+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
142+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0=
143+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548=
144+
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
145+
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
146+
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
147+
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
148148
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
149149
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
150150
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=

‎rust/otap-dataflow/crates/admin/src/pipeline_group.rs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
//! - Query parameters:
99
//! - `wait` (bool, default: false) - if true, block until all pipelines have stopped
1010
//! - `timeout_secs` (u64, default: 60) - maximum seconds to wait when `wait=true`
11+
//!
12+
//! Example (fire-and-forget):
13+
//! ```sh
14+
//! curl -X POST http://localhost:8080/pipeline-groups/shutdown
15+
//! ```
16+
//! Example (wait for graceful shutdown with 30s timeout):
17+
//! ```sh
18+
//! curl -X POST "http://localhost:8080/pipeline-groups/shutdown?wait=true&timeout_secs=30"
19+
//! ```
20+
//!
1121
//! - 200 OK if `wait=true` and all pipelines stopped successfully
1222
//! - 202 Accepted if the stop request was accepted and is being processed (async operation)
1323
//! - 400 Bad Request if the pipeline is already stopped (ToDo)

‎rust/otap-dataflow/crates/controller/src/lib.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,16 @@ impl<PData: 'static + Clone + Send + Sync + std::fmt::Debug> Controller<PData> {
198198
telemetry_config.logs.providers.uses_its_provider(),
199199
) {
200200
(false, true) => {
201-
otel_warn!("ITS provider requested yet internal pipeline nodes not defined")
201+
otel_warn!(
202+
"its.provider.missing_pipeline",
203+
message = "ITS provider requested yet internal pipeline nodes not defined"
204+
)
202205
}
203206
(true, false) => {
204-
otel_warn!("internal pipeline nodes defined yet ITS provider not requested")
207+
otel_warn!(
208+
"its.pipeline.missing_provider",
209+
message = "Internal pipeline nodes defined yet ITS provider not requested"
210+
)
205211
}
206212
_ => {}
207213
};

‎rust/otap-dataflow/crates/otap/src/console_exporter.rs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,28 +131,34 @@ impl ConsoleExporter {
131131
self.formatter.print_logs_data(&logs_view).await;
132132
}
133133
Err(e) => {
134-
otel_error!("Failed to create OTLP logs view", error = ?e);
134+
otel_error!("console.logs_view.otlp_create_failed", error = ?e, message = "Failed to create OTLP logs view");
135135
}
136136
},
137137
OtapPayload::OtapArrowRecords(records) => match OtapLogsView::try_from(records) {
138138
Ok(logs_view) => {
139139
self.formatter.print_logs_data(&logs_view).await;
140140
}
141141
Err(e) => {
142-
otel_error!("Failed to create OTAP logs view", error = ?e);
142+
otel_error!("console.logs_view.otap_create_failed", error = ?e, message = "Failed to create OTAP logs view");
143143
}
144144
},
145145
}
146146
}
147147

148148
async fn export_traces(&self, _payload: &OtapPayload) {
149149
// TODO: Implement traces formatting.
150-
otel_error!("Traces formatting not yet implemented");
150+
otel_error!(
151+
"console.traces.not_implemented",
152+
message = "Traces formatting not yet implemented"
153+
);
151154
}
152155

153156
async fn export_metrics(&self, _payload: &OtapPayload) {
154157
// TODO: Implement metrics formatting.
155-
otel_error!("Metrics formatting not yet implemented");
158+
otel_error!(
159+
"console.metrics.not_implemented",
160+
message = "Metrics formatting not yet implemented"
161+
);
156162
}
157163
}
158164

@@ -209,7 +215,7 @@ impl HierarchicalFormatter {
209215
use tokio::io::AsyncWriteExt;
210216

211217
if let Err(err) = tokio::io::stdout().write_all(&output).await {
212-
otel_error!("could not write to console", error = ?err);
218+
otel_error!("console.write_failed", error = ?err, message = "Could not write to console");
213219
}
214220
}
215221

‎rust/otap-dataflow/crates/otap/src/experimental/resource_validator_processor/mod.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ use otap_df_pdata::views::otlp::bytes::traces::RawTraceData;
7272
use otap_df_pdata::views::resource::ResourceView;
7373
use otap_df_pdata::views::trace::{ResourceSpansView, TracesView};
7474
use otap_df_telemetry::metrics::MetricSet;
75+
use otap_df_telemetry::otel_warn;
7576
use serde_json::Value;
7677
use std::borrow::Cow;
7778
use std::collections::HashSet;
7879
use std::sync::Arc;
79-
use tracing::warn;
8080

8181
use crate::OTAP_PROCESSOR_FACTORIES;
8282
use crate::pdata::OtapPdata;
@@ -430,7 +430,11 @@ impl ResourceValidatorProcessor {
430430
self.metrics.items_accepted.add(num_items);
431431
}
432432
Err((failure, msg)) => {
433-
warn!(reason = %failure, "{}", msg);
433+
otel_warn!(
434+
"resource_validator_processor.validation.fail",
435+
failure_reason = %failure,
436+
message = msg.as_str()
437+
);
434438
self.metrics.items_rejected.add(num_items);
435439
match failure {
436440
ValidationFailure::MissingAttribute => {

0 commit comments

Comments
 (0)