Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: standardize logging #1302

Merged
merged 51 commits into from
Jan 25, 2024
Merged

feat: standardize logging #1302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
72f96cc
Initial slog switch
zivkovicmilos Oct 26, 2023
9328f52
Change log level
zivkovicmilos Oct 26, 2023
3abfc67
Merge branch 'feat/standardized-logging' into feat/log
zivkovicmilos Oct 26, 2023
a4449bd
Drop the logger backend in tm2
zivkovicmilos Oct 26, 2023
c08de43
Use custom zap config
zivkovicmilos Oct 26, 2023
035bbef
Use log level from config
zivkovicmilos Oct 26, 2023
e6dd5ac
Merge branch 'master' into feat/log
zivkovicmilos Oct 26, 2023
dec3fed
Update workflows
zivkovicmilos Oct 26, 2023
9aa5d7d
Remove test case because of Go 1.21
zivkovicmilos Oct 26, 2023
209041f
Resolve faulty log lines
zivkovicmilos Oct 26, 2023
568ff80
Revert go version change
zivkovicmilos Jan 15, 2024
be13b5d
Merge master
zivkovicmilos Jan 15, 2024
b32ea84
Tidy go mods
zivkovicmilos Jan 15, 2024
32603c2
Switch to /exp/log because of go 1.20
zivkovicmilos Jan 15, 2024
71787aa
Update gnodev logger usage:
zivkovicmilos Jan 15, 2024
28bebde
Please the go mod gods
zivkovicmilos Jan 15, 2024
5db0ddb
Add logger err case
zivkovicmilos Jan 15, 2024
13fefe7
Merge branch 'master' into feat/log
zivkovicmilos Jan 15, 2024
33f1934
fix: use zap logger specific initialization
gfanton Jan 15, 2024
75c7285
Resolve API changes
zivkovicmilos Jan 16, 2024
f23782f
Tidy loop go mod
zivkovicmilos Jan 16, 2024
655557b
Lowercase log format
zivkovicmilos Jan 16, 2024
c8b6d54
Move github.com/kr/pretty into indirect deps
zivkovicmilos Jan 22, 2024
db969ac
Move golang.org/x/exp into direct deps
zivkovicmilos Jan 22, 2024
a39674b
Remove duplicate defer
zivkovicmilos Jan 22, 2024
1c29d7c
Add import cleanup directive
zivkovicmilos Jan 22, 2024
a8e0dce
Move block to indirect imports; add mod linter
zivkovicmilos Jan 22, 2024
fe5f770
Remove leftover message from go.mods
zivkovicmilos Jan 22, 2024
4130b15
Add goimports CI
zivkovicmilos Jan 22, 2024
34e4087
Update gno.land/pkg/sdk/vm/keeper.go
zivkovicmilos Jan 22, 2024
d66b6f7
Update gno.land/pkg/sdk/vm/keeper.go
zivkovicmilos Jan 22, 2024
c3cd030
Merge branch 'master' into feat/log
zivkovicmilos Jan 22, 2024
795fe67
Make the linting gods happy
zivkovicmilos Jan 22, 2024
6779dc6
Merge branch 'master' into feat/log
zivkovicmilos Jan 23, 2024
01e4fd5
Add testing logger
zivkovicmilos Jan 23, 2024
6471c93
Tidy go mods
zivkovicmilos Jan 23, 2024
86ad349
Output the log to a dir
zivkovicmilos Jan 23, 2024
9e45196
Update workflows
zivkovicmilos Jan 23, 2024
301409a
fix: workflow debug env variable
gfanton Jan 23, 2024
821c01d
fix: fixup gnoland logs
gfanton Jan 23, 2024
09d3ec0
fix(ci): glob every log file into the artifact archive
gfanton Jan 23, 2024
de264d4
wip: test ci full logging
gfanton Jan 23, 2024
6b9230c
fix(log): replace slash by _ in log name to avoid sub-directory
gfanton Jan 23, 2024
27e2383
Enable debug artifacts
zivkovicmilos Jan 23, 2024
bac025e
Merge branch 'master' into feat/log
zivkovicmilos Jan 24, 2024
7eb92d2
Merge goimports format with 'fmt'
zivkovicmilos Jan 24, 2024
7720593
Update fmt CI
zivkovicmilos Jan 24, 2024
a8fe8d3
Update tidy workflow
zivkovicmilos Jan 24, 2024
9ab96d0
Simplify tidy workflows
zivkovicmilos Jan 24, 2024
89c7b62
Add basic base config verification
zivkovicmilos Jan 24, 2024
18727d8
Merge branch 'master' into feat/log
zivkovicmilos Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,8 @@ lint:
imports:
$(MAKE) --no-print-directory -C tm2 imports
$(MAKE) --no-print-directory -C gnovm imports
$(MAKE) --no-print-directory -C gno.land imports
$(MAKE) --no-print-directory -C gno.land imports

.PHONY: tidy
tidy:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please double-check? I vaguely recall creating something similar, possibly only in the CI. Just ensure that there isn't already an existing solution for the same purpose.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It turns out we had not 1, but 2 tidy flows 🙂

Fixed:
9ab96d0 and a8fe8d3

$(MAKE) --no-print-directory -C misc tidy
5 changes: 5 additions & 0 deletions contribs/gnokeykc/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ require (
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
Expand All @@ -30,14 +31,17 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v1.12.1 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/jaekwon/testify v1.6.1 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.12.3 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/linxGnu/grocksdb v1.8.11 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/peterbourgon/ff/v3 v3.4.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.opencensus.io v0.22.5 // indirect
Expand All @@ -48,4 +52,5 @@ require (
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
7 changes: 7 additions & 0 deletions contribs/gnokeykc/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions misc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,10 @@ GOTEST_FLAGS ?= -v -p 1 -timeout=30m
.PHONY: _test.genstd
_test.genstd:
go test ./genstd/... $(GOTEST_FLAGS)

.PHONY: tidy
tidy:
# Give execute permissions
chmod +x ./mod_tidy.sh
# Tidy go mods
./mod_tidy.sh
4 changes: 4 additions & 0 deletions misc/loop/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,17 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v1.12.1 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/jaekwon/testify v1.6.1 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.12.3 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/linxGnu/grocksdb v1.8.11 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/peterbourgon/ff/v3 v3.4.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.opencensus.io v0.22.5 // indirect
Expand All @@ -49,6 +52,7 @@ require (
golang.org/x/term v0.16.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/gnolang/gno => ../../
7 changes: 7 additions & 0 deletions misc/loop/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions misc/mod_tidy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env bash

# This script finds and tidies all go.mod
# files recursively from the repository root

set -e # exit on error

# CD into the repo root
cd ..

# Find all go.mod files
gomods=$(find . -type f -name go.mod)

# Tidy each go.mod file
for modfile in $gomods; do
dir=$(dirname "$modfile")

# Run go mod tidy in the directory
(cd "$dir" && go mod tidy -v) || exit 1
done
Loading