Skip to content

Commit d7a6b25

Browse files
authored
feat/improve logging next (#1653)
* improve formatted logging * work * github test
1 parent a891004 commit d7a6b25

File tree

8 files changed

+2407
-45
lines changed

8 files changed

+2407
-45
lines changed

go.work.sum

Lines changed: 88 additions & 4 deletions
Large diffs are not rendered by default.

next/controllers/github.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"errors"
88
"fmt"
99
"github.com/diggerhq/digger/backend/segment"
10-
"github.com/diggerhq/digger/ee/cli/pkg/utils"
1110
"github.com/diggerhq/digger/libs/ci"
1211
orchestrator_scheduler "github.com/diggerhq/digger/libs/scheduler"
1312
"github.com/diggerhq/digger/next/ci_backends"
@@ -667,7 +666,7 @@ func getDiggerConfigForBranch(gh next_utils.GithubClientProvider, installationId
667666
log.Printf("Error getting changed files: %v", err)
668667
return "", nil, nil, nil, fmt.Errorf("error getting changed files")
669668
}
670-
err = utils.CloneGitRepoAndDoAction(cloneUrl, branch, *token, func(dir string) error {
669+
err = backend_utils.CloneGitRepoAndDoAction(cloneUrl, branch, *token, func(dir string) error {
671670
diggerYmlBytes, err := os.ReadFile(path.Join(dir, "digger.yml"))
672671
diggerYmlStr = string(diggerYmlBytes)
673672
config, _, dependencyGraph, err = dg_configuration.LoadDiggerConfig(dir, true, changedFiles)

next/dbmodels/setup.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package dbmodels
22

33
import (
44
"github.com/diggerhq/digger/next/models_generated"
5+
slogGorm "github.com/orandin/slog-gorm"
56
"gorm.io/driver/postgres"
67
_ "gorm.io/driver/postgres"
78
"gorm.io/gorm"
8-
"gorm.io/gorm/logger"
9+
"log/slog"
910
"os"
1011
)
1112

@@ -18,9 +19,16 @@ type Database struct {
1819
var DB *Database
1920

2021
func ConnectDatabase() {
22+
logger := slog.New(slog.NewJSONHandler(os.Stdout, nil)).With("gorm", true)
23+
gormLogger := slogGorm.New(
24+
slogGorm.WithHandler(logger.Handler()),
25+
slogGorm.WithTraceAll(),
26+
slogGorm.SetLogLevel(slogGorm.DefaultLogType, slog.LevelInfo),
27+
slogGorm.WithContextValue("gorm", "true"),
28+
)
2129

2230
database, err := gorm.Open(postgres.Open(os.Getenv("DIGGER_DATABASE_URL")), &gorm.Config{
23-
Logger: logger.Default.LogMode(logger.Info),
31+
Logger: gormLogger,
2432
})
2533

2634
if err != nil {

next/go.mod

Lines changed: 296 additions & 2 deletions
Large diffs are not rendered by default.

next/go.sum

Lines changed: 2005 additions & 0 deletions
Large diffs are not rendered by default.

next/main.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import (
1111
"github.com/diggerhq/digger/next/utils"
1212
"github.com/getsentry/sentry-go"
1313
"github.com/gin-gonic/gin"
14+
sloggin "github.com/samber/slog-gin"
1415
"io/fs"
1516
"log"
17+
"log/slog"
1618
"net/http"
1719
"os"
1820
)
@@ -46,7 +48,11 @@ func main() {
4648
// initialize the database
4749
dbmodels.ConnectDatabase()
4850

49-
r := gin.Default()
51+
logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
52+
53+
r := gin.New()
54+
r.Use(gin.Recovery())
55+
r.Use(sloggin.New(logger))
5056

5157
if _, err := os.Stat("templates"); err != nil {
5258
matches, _ := fs.Glob(templates, "templates/*.tmpl")

next/services/runs.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/diggerhq/digger/next/dbmodels"
1111
"github.com/diggerhq/digger/next/model"
1212
nextutils "github.com/diggerhq/digger/next/utils"
13-
1413
"log"
1514
)
1615

next/utils/github_test.go

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)