Skip to content

Commit 9e31a7a

Browse files
jcantrilljcantrill
committed
LOG-6084: Replace functional-benchmark plot library
1 parent 073925e commit 9e31a7a

File tree

19 files changed

+460
-400
lines changed

19 files changed

+460
-400
lines changed

Diff for: ‎cmd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func main() {
8787
"Enabling this will ensure there is only one active controller manager.")
8888
flag.Parse()
8989

90-
logger := utils.InitLogger("cluster-logging-operator")
90+
logger := utils.InitStaticLogger("cluster-logging-operator")
9191
// LOG-5136 Fixes error caused by updates to controller-runtime
9292
ctrl.SetLogger(logger)
9393

Diff for: ‎go.mod

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/openshift/cluster-logging-operator
22

3-
go 1.22
3+
go 1.22.0
44

5-
toolchain go1.22.5
5+
toolchain go1.22.8
66

77
require (
88
github.com/ViaQ/logerr/v2 v2.1.0
@@ -23,8 +23,8 @@ require (
2323
github.com/spf13/pflag v1.0.5
2424
github.com/stretchr/testify v1.8.4
2525
golang.org/x/net v0.24.0
26-
golang.org/x/sync v0.6.0
27-
golang.org/x/sys v0.19.0
26+
golang.org/x/sync v0.11.0
27+
golang.org/x/sys v0.30.0
2828
k8s.io/api v0.29.1
2929
k8s.io/apimachinery v0.29.1
3030
k8s.io/apiserver v0.29.1
@@ -35,8 +35,14 @@ require (
3535
)
3636

3737
require (
38+
codeberg.org/go-fonts/liberation v0.4.1 // indirect
39+
codeberg.org/go-latex/latex v0.0.1 // indirect
40+
codeberg.org/go-pdf/fpdf v0.10.0 // indirect
41+
git.sr.ht/~sbinet/gg v0.6.0 // indirect
42+
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
3843
github.com/aws/smithy-go v1.8.0 // indirect
3944
github.com/beorn7/perks v1.0.1 // indirect
45+
github.com/campoy/embedmd v1.0.0 // indirect
4046
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4147
github.com/davecgh/go-spew v1.1.1 // indirect
4248
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
@@ -48,6 +54,7 @@ require (
4854
github.com/go-openapi/jsonreference v0.20.4 // indirect
4955
github.com/go-openapi/swag v0.22.9 // indirect
5056
github.com/gogo/protobuf v1.3.2 // indirect
57+
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
5158
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5259
github.com/golang/protobuf v1.5.3 // indirect
5360
github.com/google/gnostic-models v0.6.8 // indirect
@@ -67,14 +74,17 @@ require (
6774
github.com/prometheus/client_model v0.5.0 // indirect
6875
github.com/prometheus/common v0.46.0 // indirect
6976
github.com/prometheus/procfs v0.12.0 // indirect
77+
github.com/vspaz/wls-go v0.0.0-20230405190232-47d1e477c82c // indirect
7078
go.uber.org/multierr v1.11.0 // indirect
7179
go.uber.org/zap v1.26.0 // indirect
72-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
80+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
81+
golang.org/x/image v0.24.0 // indirect
7382
golang.org/x/oauth2 v0.17.0 // indirect
7483
golang.org/x/term v0.19.0 // indirect
75-
golang.org/x/text v0.14.0 // indirect
84+
golang.org/x/text v0.22.0 // indirect
7685
golang.org/x/time v0.5.0 // indirect
7786
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
87+
gonum.org/v1/plot v0.15.2 // indirect
7888
google.golang.org/appengine v1.6.8 // indirect
7989
google.golang.org/protobuf v1.32.0 // indirect
8090
gopkg.in/inf.v0 v0.9.1 // indirect

Diff for: ‎go.sum

+34
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1+
codeberg.org/go-fonts/liberation v0.4.1 h1:IhVhSAGMVtgOZV5h4QmvBfiwayJd1vlBq+zABNkOLco=
2+
codeberg.org/go-fonts/liberation v0.4.1/go.mod h1:Gu6FTZHMMpGxPBfc8WFL8RfwMYFTvG7TIFOMx8oM4B8=
3+
codeberg.org/go-latex/latex v0.0.1 h1:MXuLohSx43celEn609J+kXxdS3sYSTimgDV5hepMTwY=
4+
codeberg.org/go-latex/latex v0.0.1/go.mod h1:AiC91vVG2uURZRd4ZN1j3mAac0XBrLsxK6+ZNa7O9ok=
5+
codeberg.org/go-pdf/fpdf v0.10.0 h1:u+w669foDDx5Ds43mpiiayp40Ov6sZalgcPMDBcZRd4=
6+
codeberg.org/go-pdf/fpdf v0.10.0/go.mod h1:Y0DGRAdZ0OmnZPvjbMp/1bYxmIPxm0ws4tfoPOc4LjU=
7+
git.sr.ht/~sbinet/gg v0.6.0 h1:RIzgkizAk+9r7uPzf/VfbJHBMKUr0F5hRFxTUGMnt38=
8+
git.sr.ht/~sbinet/gg v0.6.0/go.mod h1:uucygbfC9wVPQIfrmwM2et0imr8L7KQWywX0xpFMm94=
9+
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
110
github.com/ViaQ/logerr/v2 v2.1.0 h1:8WwzuNa1x+a6tRUl+6sFel83A/QxlFBUaFW2FyG2zzY=
211
github.com/ViaQ/logerr/v2 v2.1.0/go.mod h1:/qoWLm3YG40Sv5u75s4fvzjZ5p36xINzaxU2L+DJ9uw=
12+
github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
13+
github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
14+
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b h1:slYM766cy2nI3BwyRiyQj/Ud48djTMtMebDqepE95rw=
15+
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
316
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
417
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
518
github.com/aws/aws-sdk-go-v2 v1.9.0 h1:+S+dSqQCN3MSU5vJRu1HqHrq00cJn6heIMU7X9hcsoo=
@@ -10,6 +23,8 @@ github.com/aws/smithy-go v1.8.0 h1:AEwwwXQZtUwP5Mz506FeXXrKBe0jA8gVM+1gEcSRooc=
1023
github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
1124
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
1225
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
26+
github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY=
27+
github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8=
1328
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
1429
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1530
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -42,6 +57,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
4257
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
4358
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
4459
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
60+
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
61+
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
4562
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
4663
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
4764
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -144,6 +161,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
144161
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
145162
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
146163
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
164+
github.com/vspaz/wls-go v0.0.0-20230405190232-47d1e477c82c h1:gc7YbOdV619w8KYK71jClfbq6m89wJkCVTAko8DNtfY=
165+
github.com/vspaz/wls-go v0.0.0-20230405190232-47d1e477c82c/go.mod h1:sN2G8r+ME16x0qBg571lKYvJe9dLgY5Kil58P7dm1Vw=
147166
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
148167
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
149168
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -159,6 +178,10 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
159178
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
160179
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
161180
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
181+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
182+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
183+
golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
184+
golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
162185
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
163186
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
164187
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -181,6 +204,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
181204
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
182205
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
183206
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
207+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
208+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
184209
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
185210
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
186211
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -191,11 +216,14 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
191216
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
192217
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
193218
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
219+
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
194220
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
195221
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
196222
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
197223
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
198224
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
225+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
226+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
199227
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
200228
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
201229
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
@@ -206,13 +234,16 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
206234
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
207235
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
208236
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
237+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
238+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
209239
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
210240
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
211241
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
212242
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
213243
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
214244
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
215245
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
246+
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
216247
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
217248
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
218249
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
@@ -222,6 +253,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
222253
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
223254
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
224255
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
256+
gonum.org/v1/plot v0.15.2 h1:Tlfh/jBk2tqjLZ4/P8ZIwGrLEWQSPDLRm/SNWKNXiGI=
257+
gonum.org/v1/plot v0.15.2/go.mod h1:DX+x+DWso3LTha+AdkJEv5Txvi+Tql3KAGkehP0/Ubg=
225258
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
226259
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
227260
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -250,6 +283,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
250283
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
251284
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
252285
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
286+
honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
253287
k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw=
254288
k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ=
255289
k8s.io/apiextensions-apiserver v0.29.1 h1:S9xOtyk9M3Sk1tIpQMu9wXHm5O2MX6Y1kIpPMimZBZw=

Diff for: ‎internal/cmd/forwarder-generator/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919

2020
// HACK - This command is for development use only
2121
func main() {
22-
utils.InitLogger("forwarder-generator")
22+
utils.InitStaticLogger("forwarder-generator")
2323

2424
yamlFile := flag.String("file", "", "ClusterLogForwarder yaml file. - for stdin")
2525
debugOutput := flag.Bool("debug-output", false, "Generate config normally, but replace output plugins with @stdout plugin, so that records can be printed in collector logs.")

Diff for: ‎internal/cmd/functional-benchmarker/config/options.go

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ type Options struct {
2424
Image string
2525
TotalMessages int
2626
MsgSize int
27-
Verbosity int
2827
BaseLine bool
2928
DoCleanup bool
3029
Sample bool
@@ -53,7 +52,6 @@ func InitOptions() Options {
5352
//fs.IntVar(&options.TotalMessages, "tot-messages", 10000, "The number of messages to write per stressor")
5453
fs.IntVar(&options.MsgSize, "size", 1024, "The message size in bytes per stressor for 'synthetic' payload")
5554
fs.IntVar(&options.LinesPerSecond, "lines-per-sec", 1, "The log lines per second per stressor")
56-
fs.IntVar(&options.Verbosity, "verbosity", 0, "The output log level")
5755
fs.BoolVar(&options.DoCleanup, "do-cleanup", true, "set to false to preserve the namespace")
5856
//fs.BoolVar(&options.BaseLine, "baseline", false, "run the test with a baseline config. This supercedes --collector-config")
5957
//fs.StringVar(&options.Platform, "platform", "cluster", "The runtime environment: cluster, local. local requires podman")

Diff for: ‎internal/cmd/functional-benchmarker/main.go

+13-2
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,23 @@ import (
1212
"github.com/openshift/cluster-logging-operator/internal/constants"
1313
"github.com/openshift/cluster-logging-operator/test/helpers/oc"
1414

15-
log "github.com/ViaQ/logerr/v2/log/static"
1615
"github.com/openshift/cluster-logging-operator/internal/cmd/functional-benchmarker/config"
1716
"github.com/openshift/cluster-logging-operator/internal/cmd/functional-benchmarker/reports"
1817
"github.com/openshift/cluster-logging-operator/internal/cmd/functional-benchmarker/runners"
1918
"github.com/openshift/cluster-logging-operator/internal/cmd/functional-benchmarker/stats"
2019
"github.com/openshift/cluster-logging-operator/internal/utils"
2120
)
2221

22+
var (
23+
log = utils.InitLogger("functional-benchmarker")
24+
)
25+
2326
// HACK - This command is for development use only
2427
func main() {
2528
utils.InitLogger("functional-benchmarker")
26-
29+
defer func() {
30+
log.Info("Test complete")
31+
}()
2732
options := config.InitOptions()
2833

2934
options.CollectorConfig = config.ReadConfig(options.CollectorConfigPath, options.BaseLine)
@@ -42,13 +47,15 @@ func main() {
4247

4348
options.CollectorConfig = config
4449
reporter := reports.NewReporter(options, artifactDir, metrics, statistics)
50+
log.Info("Generating reports...")
4551
reporter.Generate()
4652
}
4753

4854
func RunBenchmark(artifactDir string, options config.Options) (*stats.ResourceMetrics, *stats.Statistics, string, error) {
4955
runDuration := config.MustParseDuration(options.RunDuration, "run-duration")
5056
sampleDuration := config.MustParseDuration(options.SampleDuration, "resource-sample-duration")
5157
runner := runners.NewRunner(options)
58+
log.Info("Deploying collector, loaders, and receivers")
5259
runner.Deploy()
5360
if options.DoCleanup {
5461
log.V(2).Info("Deferring cleanup", "DoCleanup", options.DoCleanup)
@@ -58,6 +65,7 @@ func RunBenchmark(artifactDir string, options config.Options) (*stats.ResourceMe
5865
startTime := time.Now()
5966
sampler := time.NewTicker(sampleDuration)
6067
metrics := stats.NewResourceMetrics()
68+
log.V(0).Info("Starting to sample metrics for the collector...")
6169
go func() {
6270
for {
6371
select {
@@ -76,6 +84,8 @@ func RunBenchmark(artifactDir string, options config.Options) (*stats.ResourceMe
7684
endTime := time.Now()
7785
done <- true
7886
sampler.Stop()
87+
log.Info("Stopped sampling metrics")
88+
log.Info("Fetching log data from receiver...")
7989
if err := runner.FetchApplicationLogs(); err != nil {
8090
return nil, nil, "", err
8191
}
@@ -105,6 +115,7 @@ func fetchContainerLogs(runner runners.Runner, artifactDir string) {
105115
}
106116

107117
func gatherStatistics(runner runners.Runner, sample bool, msgSize int, startTime, endTime time.Time) *stats.Statistics {
118+
log.Info("Evaluating log data to calculate statistics")
108119
logs, err := runner.ReadApplicationLogs()
109120
if err != nil {
110121
log.Error(err, "Error reading logs")

Diff for: ‎internal/cmd/functional-benchmarker/reports/gnuplot/plot_scripts.go renamed to ‎internal/cmd/functional-benchmarker/reports/format_templates.go

+9-53
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,6 @@
1-
package gnuplot
1+
package reports
22

33
const (
4-
cpuPlotPNG = `set term png size 1024,768
5-
set output 'cpu.png'
6-
set timefmt '%s'
7-
set xdata time
8-
set title 'CPU(Cores)'
9-
set xlabel 'Time'
10-
plot 'cpu.data' using 1:2 with lines`
11-
12-
memPlotPNG = `set term png size 1024,768
13-
set output 'mem.png'
14-
set timefmt '%s'
15-
set xdata time
16-
set title 'Mem(Mb)'
17-
set xlabel 'Time'
18-
plot 'mem.data' using 1:2 with lines`
19-
20-
latencyPlotPNG = `set term png size 1024,768
21-
set output 'latency.png'
22-
set title 'Latency(s)'
23-
set xlabel 'Message'
24-
f(x)=m*x+b
25-
fit f(x) 'latency.data' using 1:2 via m,b
26-
plot 'latency.data' using 1:2 with lines title 'Data', f(x) title 'Trend'`
27-
28-
lossPlotPNG = `set term png size 1024,768
29-
set output 'loss.png';
30-
set xlabel 'SeqId';
31-
set ylabel 'Lost Count'`
32-
33-
lossPlotDumb = `set term dumb
34-
set xlabel 'SeqId';
35-
set ylabel 'Lost Count'`
36-
37-
cpuPlotDumb = `set term dumb
38-
set timefmt '%s'
39-
set xdata time
40-
set title 'CPU(Cores)'
41-
set xlabel 'Time'
42-
plot 'cpu.data' using 1:2 with lines`
43-
44-
memPlotDumb = `set term dumb
45-
set timefmt '%s'
46-
set xdata time
47-
set title 'Mem(Mb)'
48-
set xlabel 'Time'
49-
plot 'mem.data' using 1:2 with lines`
50-
51-
latencyPlotDumb = `set term dumb
52-
set title 'Latency(s)'
53-
set xlabel 'Message'
54-
plot 'latency.data' using 1:2 with lines`
55-
564
html = `
575
<html>
586
<div>
@@ -98,15 +46,23 @@ plot 'latency.data' using 1:2 with lines`
9846
<div>
9947
<img src="cpu.png">
10048
</div>
49+
<br/>
50+
<br/>
10151
<div>
10252
<img src="mem.png">
10353
</div>
54+
<br/>
55+
<br/>
10456
<div>
10557
<img src="latency.png">
10658
</div>
59+
<br/>
60+
<br/>
10761
<div>
10862
<img src="loss.png">
10963
</div>
64+
<br/>
65+
<br/>
11066
<div>
11167
<table border="1">
11268
<tr>

0 commit comments

Comments
 (0)