Skip to content

Commit

Permalink
Setup logging for human feedback
Browse files Browse the repository at this point in the history
* We need to produce machine readable JSON logs
* We do this by creating two separate logging cores
  * This way we can have a consoleEncoder that potentially still writes in human readable format
  • Loading branch information
jlewi committed Apr 13, 2024
1 parent c6d2e14 commit 848be4e
Show file tree
Hide file tree
Showing 2 changed files with 111 additions and 14 deletions.
113 changes: 100 additions & 13 deletions app/pkg/application/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ import (
"context"
"fmt"
"io"
"io/fs"
"net/http"
"os"
"path/filepath"
"strings"
"time"

"go.uber.org/zap/zapcore"

"github.com/honeycombio/honeycomb-opentelemetry-go"
"github.com/honeycombio/otel-config-go/otelconfig"
Expand Down Expand Up @@ -135,32 +140,104 @@ func (a *App) SetupLogging() error {
if a.Config == nil {
return errors.New("Config is nil; call LoadConfig first")
}
cfg := a.Config
// Use a non-json configuration configuration
c := zap.NewDevelopmentConfig()

// TODO(jeremy): We don't need to create JSON logs for random commands; e.g. `foyle version` or
// `foyle assets download`
// Configure encoder for JSON format
jsonCore, err := a.createCoreLoggerForFiles()
if err != nil {
return errors.Wrap(err, "Could not create core logger for files")
}

consoleCore, err := a.createCoreForConsole()
if err != nil {
return errors.Wrap(err, "Could not create core logger for console")
}

// Create a multi-core logger with different encodings
core := zapcore.NewTee(
jsonCore,
consoleCore,
)

// Create the logger
newLogger := zap.New(core)

zap.ReplaceGlobals(newLogger)

return nil
}

func (a *App) createCoreForConsole() (zapcore.Core, error) {
// Configure encoder for non-JSON format (console-friendly)
c := zap.NewDevelopmentEncoderConfig()

// Use the keys used by cloud logging
// https://cloud.google.com/logging/docs/structured-logging
c.EncoderConfig.LevelKey = "severity"
c.EncoderConfig.TimeKey = "time"
c.EncoderConfig.MessageKey = "message"
c.LevelKey = "severity"
c.TimeKey = "time"
c.MessageKey = "message"

lvl := cfg.GetLogLevel()
lvl := a.Config.GetLogLevel()
zapLvl := zap.NewAtomicLevel()

if err := zapLvl.UnmarshalText([]byte(lvl)); err != nil {
return errors.Wrapf(err, "Could not convert level %v to ZapLevel", lvl)
return nil, errors.Wrapf(err, "Could not convert level %v to ZapLevel", lvl)
}

c.Level = zapLvl
newLogger, err := c.Build()
encoder := zapcore.NewConsoleEncoder(c)
core := zapcore.NewCore(encoder, zapcore.AddSync(os.Stderr), zapLvl)
return core, nil
}

// createCoreLoggerForFiles creates a core logger that writes logs to files. These logs are always written in JSON
// format. Their purpose is to capture AI traces that we use for retraining. Since these are supposed to be machine
// readable they are always written in JSON format.
func (a *App) createCoreLoggerForFiles() (zapcore.Core, error) {
// Configure encoder for JSON format
c := zap.NewProductionEncoderConfig()
// Use the keys used by cloud logging
// https://cloud.google.com/logging/docs/structured-logging
c.LevelKey = "severity"
c.TimeKey = "time"
c.MessageKey = "message"

jsonEncoder := zapcore.NewJSONEncoder(c)

if _, err := os.Stat(a.Config.GetLogDir()); os.IsNotExist(err) {
// Logger won't be setup yet so we can't use it.
fmt.Fprintf(os.Stdout, "Creating log directory %s\n", a.Config.GetLogLevel())
err := os.MkdirAll(a.Config.GetLogDir(), 0755)
if err != nil {
return nil, errors.Wrapf(err, "could not create log directory %s", a.Config.GetLogDir())
}
}

// We need to set a unique file name for the logs as a way of dealing with log rotation.
name := fmt.Sprintf("foyle.logs.%s.json", time.Now().Format("2006-01-02T15:04:05"))
logFile := filepath.Join(a.Config.GetLogDir(), name)

fmt.Fprintf(os.Stdout, "Writing logs to %s\n", logFile)

oFile, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
panic(fmt.Sprintf("Failed to initialize zap logger; error %v", err))
return nil, errors.Wrapf(err, "could not open log file %s", logFile)
}
zapLvl := zap.NewAtomicLevel()

if err := zapLvl.UnmarshalText([]byte(a.Config.GetLogLevel())); err != nil {
return nil, errors.Wrapf(err, "Could not convert level %v to ZapLevel", a.Config.GetLogLevel())
}

zap.ReplaceGlobals(newLogger)
// Force log level to be at least info. Because info is the level at which we capture the logs we need for
// tracing.
if zapLvl.Level() > zapcore.InfoLevel {
zapLvl.SetLevel(zapcore.InfoLevel)
}

return nil
core := zapcore.NewCore(jsonEncoder, zapcore.AddSync(oFile), zapLvl)

return core, nil
}

// SetupServer sets up the server
Expand Down Expand Up @@ -191,5 +268,15 @@ func (a *App) Shutdown() error {
}

log.Info("Shutting down the application")
// Flush the logs
if err := l.Sync(); err != nil {
// N.B. I don't understand why but calling sync appears to cause an error complaining about calling sync
// on /dev/stderr so we just filter that out to avoid spam.
pathErr := &fs.PathError{}

if !errors.As(err, &pathErr) {
return err
}
}
return nil
}
12 changes: 11 additions & 1 deletion app/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ type Asset struct {
}

type Logging struct {
Level string `json:"level" yaml:"level"`
Level string `json:"level,omitempty" yaml:"level,omitempty"`
LogDir string `json:"logDir,omitempty" yaml:"logDir,omitempty"`
}

type TelemetryConfig struct {
Expand All @@ -152,6 +153,15 @@ func (c *Config) GetModel() string {

return c.Agent.Model
}

func (c *Config) GetLogDir() string {
if c.Logging.LogDir != "" {
return c.Logging.LogDir
}

return filepath.Join(c.GetConfigDir(), "logs")
}

func (c *Config) GetLogLevel() string {
if c.Logging.Level == "" {
return "info"
Expand Down

0 comments on commit 848be4e

Please sign in to comment.