2024-05-14 11:48:28 +00:00
|
|
|
package simplelog
|
|
|
|
|
|
|
|
import (
|
2024-05-14 11:57:12 +00:00
|
|
|
"context"
|
2024-05-14 11:48:28 +00:00
|
|
|
"log"
|
aider: Add file and line number information to ExtendedEvent in CustomHandler.
# Aider chat conversation:
USER: create an extended type called ExtendedEvent which conforms to Event. in the custom handler, attach the file and line number information from the caller to the ExtendedEvent. that way all of the extendedhandlers can access it without using the runtime module. add getters to the ExtendedEvent interface and type.
ASSISTANT: To create an `ExtendedEvent` type that conforms to `Event` and includes file and line number information, we need to:
1. Define the `ExtendedEvent` type and interface in `event.go`.
2. Update the `CustomHandler` in `simplelog.go` to attach file and line number information to the `ExtendedEvent`.
3. Add getters to the `ExtendedEvent` interface and type.
Here are the *SEARCH/REPLACE* blocks:
event.go
```go
<<<<<<< SEARCH
}
=======
}
type ExtendedEvent interface {
GetID() uuid.UUID
GetTimestamp() time.Time
GetLevel() string
GetMessage() string
GetData() json.RawMessage
GetFile() string
GetLine() int
}
type extendedEvent struct {
Event
File string `json:"file"`
Line int `json:"line"`
}
func (e extendedEvent) GetID() uuid.UUID {
return e.ID
}
func (e extendedEvent) GetTimestamp() time.Time {
return e.Timestamp
}
func (e extendedEvent) GetLevel() string {
return e.Level
}
func (e extendedEvent) GetMessage() string {
return e.Message
}
func (e extendedEvent) GetData() json.RawMessage {
return e.Data
}
func (e extendedEvent) GetFile() string {
return e.File
}
func (e extendedEvent) GetLine() int {
return e.Line
}
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
"log"
=======
"log"
"runtime"
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
event := NewEvent(record.Level.String(), record.Message, jsonData)
select {
case r.ch <- event:
return nil // Successfully sent event to channel
default:
return fmt.Errorf("failed to log event: channel is full")
}
=======
// Get the caller information
_, file, line, ok := runtime.Caller(5)
if !ok {
file = "???"
line = 0
}
event := NewExtendedEvent(record.Level.String(), record.Message, jsonData, file, line)
for _, handler := range cl.handlers {
if err := handler.Handle(ctx, event); err != nil {
return err
}
}
return nil
>>>>>>> REPLACE
```
2024-05-14 12:20:44 +00:00
|
|
|
"runtime"
|
2024-05-14 11:48:28 +00:00
|
|
|
"log/slog"
|
|
|
|
"os"
|
|
|
|
|
|
|
|
"github.com/mattn/go-isatty"
|
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
relpServerURL = os.Getenv("LOGGER_RELP_URL")
|
|
|
|
webhookURL = os.Getenv("LOGGER_WEBHOOK_URL")
|
|
|
|
)
|
|
|
|
|
|
|
|
var ourCustomLogger *slog.Logger
|
2024-05-14 12:20:43 +00:00
|
|
|
var ourCustomHandler slog.Handler
|
2024-05-14 11:48:28 +00:00
|
|
|
|
|
|
|
func init() {
|
2024-05-14 12:20:43 +00:00
|
|
|
ourCustomHandler = NewCustomHandler()
|
|
|
|
ourCustomLogger = slog.New(ourCustomHandler)
|
2024-05-14 11:48:28 +00:00
|
|
|
slog.SetDefault(ourCustomLogger)
|
|
|
|
}
|
|
|
|
|
2024-05-14 12:20:43 +00:00
|
|
|
type CustomHandler struct {
|
|
|
|
handlers []ExtendedHandler
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewCustomHandler() slog.Handler {
|
aider: Renamed CustomLogger to CustomHandler.
# Aider chat conversation:
USER: rename CustomLogger to CustomHandler
ASSISTANT: To make this change we need to modify `simplelog.go`:
1. Replace all instances of `CustomLogger` with `CustomHandler`.
Here are the *SEARCH/REPLACE* blocks:
simplelog.go
```go
<<<<<<< SEARCH
type CustomLogger struct {
handlers []slog.Handler
}
func (cl *CustomLogger) Log(level slog.Level, message string, data ...slog.Field) error {
for _, handler := range cl.handlers {
if err := handler.Log(level, message, data...); err != nil {
return err
}
}
return nil
}
var ourCustomLogger *slog.Logger
func init() {
ourCustomLogger = NewCustomLogger()
slog.SetDefault(ourCustomLogger)
}
func NewCustomLogger() *CustomLogger {
cl := &CustomLogger{}
=======
type CustomHandler struct {
handlers []slog.Handler
}
func (cl *CustomHandler) Log(level slog.Level, message string, data ...slog.Field) error {
for _, handler := range cl.handlers {
if err := handler.Log(level, message, data...); err != nil {
return err
}
}
return nil
}
var ourCustomLogger *slog.Logger
func init() {
ourCustomLogger = NewCustomHandler()
slog.SetDefault(ourCustomLogger)
}
func NewCustomHandler() *CustomHandler {
cl := &CustomHandler{}
>>>>>>> REPLACE
```
2024-05-14 11:48:29 +00:00
|
|
|
cl := &CustomHandler{}
|
2024-05-14 11:48:28 +00:00
|
|
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
|
|
|
cl.handlers = append(cl.handlers, NewConsoleHandler())
|
|
|
|
} else {
|
|
|
|
cl.handlers = append(cl.handlers, NewJSONHandler())
|
|
|
|
}
|
|
|
|
if relpServerURL != "" {
|
|
|
|
handler, err := NewRELPHandler(relpServerURL)
|
|
|
|
if err != nil {
|
|
|
|
log.Fatalf("Failed to initialize RELP handler: %v", err)
|
|
|
|
}
|
|
|
|
cl.handlers = append(cl.handlers, handler)
|
|
|
|
}
|
|
|
|
if webhookURL != "" {
|
|
|
|
handler, err := NewWebhookHandler(webhookURL)
|
|
|
|
if err != nil {
|
|
|
|
log.Fatalf("Failed to initialize Webhook handler: %v", err)
|
|
|
|
}
|
|
|
|
cl.handlers = append(cl.handlers, handler)
|
|
|
|
}
|
|
|
|
return cl
|
|
|
|
}
|
2024-05-14 12:20:43 +00:00
|
|
|
|
|
|
|
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
|
|
|
|
for _, handler := range cl.handlers {
|
|
|
|
if err := handler.Handle(ctx, record); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
|
|
|
|
// send us all events
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
func (cl *CustomHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
|
|
|
|
newHandlers := make([]ExtendedHandler, len(cl.handlers))
|
|
|
|
for i, handler := range cl.handlers {
|
|
|
|
newHandlers[i] = handler.WithAttrs(attrs)
|
|
|
|
}
|
|
|
|
return &CustomHandler{handlers: newHandlers}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (cl *CustomHandler) WithGroup(name string) slog.Handler {
|
|
|
|
newHandlers := make([]ExtendedHandler, len(cl.handlers))
|
|
|
|
for i, handler := range cl.handlers {
|
|
|
|
newHandlers[i] = handler.WithGroup(name)
|
|
|
|
}
|
|
|
|
return &CustomHandler{handlers: newHandlers}
|
|
|
|
}
|
aider: Moved the `ExtendedEvent` type and interface to `simplelog.go`.
# Aider chat conversation:
USER: the extendedevent type and interface should be in simplelog.go not the relp_handler.go because it's general to the simplelog package and not specific to the relp extendedhandler.
ASSISTANT: To move the `ExtendedEvent` type and interface to `simplelog.go`, we need to:
1. Remove the `ExtendedEvent` type and interface from `event.go`.
2. Add the `ExtendedEvent` type and interface to `simplelog.go`.
Here are the *SEARCH/REPLACE* blocks:
event.go
```go
<<<<<<< SEARCH
type ExtendedEvent interface {
GetID() uuid.UUID
GetTimestamp() time.Time
GetLevel() string
GetMessage() string
GetData() json.RawMessage
GetFile() string
GetLine() int
}
type extendedEvent struct {
Event
File string `json:"file"`
Line int `json:"line"`
}
func (e extendedEvent) GetID() uuid.UUID {
return e.ID
}
func (e extendedEvent) GetTimestamp() time.Time {
return e.Timestamp
}
func (e extendedEvent) GetLevel() string {
return e.Level
}
func (e extendedEvent) GetMessage() string {
return e.Message
}
func (e extendedEvent) GetData() json.RawMessage {
return e.Data
}
func (e extendedEvent) GetFile() string {
return e.File
}
func (e extendedEvent) GetLine() int {
return e.Line
}
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
=======
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
=======
type ExtendedEvent interface {
GetID() uuid.UUID
GetTimestamp() time.Time
GetLevel() string
GetMessage() string
GetData() json.RawMessage
GetFile() string
GetLine() int
}
type extendedEvent struct {
Event
File string `json:"file"`
Line int `json:"line"`
}
func (e extendedEvent) GetID() uuid.UUID {
return e.ID
}
func (e extendedEvent) GetTimestamp() time.Time {
return e.Timestamp
}
func (e extendedEvent) GetLevel() string {
return e.Level
}
func (e extendedEvent) GetMessage() string {
return e.Message
}
func (e extendedEvent) GetData() json.RawMessage {
return e.Data
}
func (e extendedEvent) GetFile() string {
return e.File
}
func (e extendedEvent) GetLine() int {
return e.Line
}
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
>>>>>>> REPLACE
```
2024-05-14 12:22:26 +00:00
|
|
|
type ExtendedEvent interface {
|
|
|
|
GetID() uuid.UUID
|
|
|
|
GetTimestamp() time.Time
|
|
|
|
GetLevel() string
|
|
|
|
GetMessage() string
|
|
|
|
GetData() json.RawMessage
|
|
|
|
GetFile() string
|
|
|
|
GetLine() int
|
|
|
|
}
|
|
|
|
|
|
|
|
type extendedEvent struct {
|
|
|
|
Event
|
|
|
|
File string `json:"file"`
|
|
|
|
Line int `json:"line"`
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e extendedEvent) GetID() uuid.UUID {
|
|
|
|
return e.ID
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e extendedEvent) GetTimestamp() time.Time {
|
|
|
|
return e.Timestamp
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e extendedEvent) GetLevel() string {
|
|
|
|
return e.Level
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e extendedEvent) GetMessage() string {
|
|
|
|
return e.Message
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e extendedEvent) GetData() json.RawMessage {
|
|
|
|
return e.Data
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e extendedEvent) GetFile() string {
|
|
|
|
return e.File
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e extendedEvent) GetLine() int {
|
|
|
|
return e.Line
|
|
|
|
}
|
|
|
|
|
aider: Update NewExtendedEvent to accept base event as an argument and populate additional fields.
# Aider chat conversation:
USER: newextendedevent should accept the base event as argument and populate the additional fields in the constructor
ASSISTANT: To modify the `NewExtendedEvent` function to accept a base event as an argument and populate the additional fields, we need to:
1. Update the `NewExtendedEvent` function in `simplelog.go`.
Here is the *SEARCH/REPLACE* block:
simplelog.go
```go
<<<<<<< SEARCH
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
=======
func NewExtendedEvent(baseEvent Event, file string, line int) ExtendedEvent {
return extendedEvent{
Event: baseEvent,
File: file,
Line: line,
}
}
>>>>>>> REPLACE
```
2024-05-14 12:23:52 +00:00
|
|
|
func NewExtendedEvent(baseEvent Event, file string, line int) ExtendedEvent {
|
aider: Moved the `ExtendedEvent` type and interface to `simplelog.go`.
# Aider chat conversation:
USER: the extendedevent type and interface should be in simplelog.go not the relp_handler.go because it's general to the simplelog package and not specific to the relp extendedhandler.
ASSISTANT: To move the `ExtendedEvent` type and interface to `simplelog.go`, we need to:
1. Remove the `ExtendedEvent` type and interface from `event.go`.
2. Add the `ExtendedEvent` type and interface to `simplelog.go`.
Here are the *SEARCH/REPLACE* blocks:
event.go
```go
<<<<<<< SEARCH
type ExtendedEvent interface {
GetID() uuid.UUID
GetTimestamp() time.Time
GetLevel() string
GetMessage() string
GetData() json.RawMessage
GetFile() string
GetLine() int
}
type extendedEvent struct {
Event
File string `json:"file"`
Line int `json:"line"`
}
func (e extendedEvent) GetID() uuid.UUID {
return e.ID
}
func (e extendedEvent) GetTimestamp() time.Time {
return e.Timestamp
}
func (e extendedEvent) GetLevel() string {
return e.Level
}
func (e extendedEvent) GetMessage() string {
return e.Message
}
func (e extendedEvent) GetData() json.RawMessage {
return e.Data
}
func (e extendedEvent) GetFile() string {
return e.File
}
func (e extendedEvent) GetLine() int {
return e.Line
}
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
=======
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
=======
type ExtendedEvent interface {
GetID() uuid.UUID
GetTimestamp() time.Time
GetLevel() string
GetMessage() string
GetData() json.RawMessage
GetFile() string
GetLine() int
}
type extendedEvent struct {
Event
File string `json:"file"`
Line int `json:"line"`
}
func (e extendedEvent) GetID() uuid.UUID {
return e.ID
}
func (e extendedEvent) GetTimestamp() time.Time {
return e.Timestamp
}
func (e extendedEvent) GetLevel() string {
return e.Level
}
func (e extendedEvent) GetMessage() string {
return e.Message
}
func (e extendedEvent) GetData() json.RawMessage {
return e.Data
}
func (e extendedEvent) GetFile() string {
return e.File
}
func (e extendedEvent) GetLine() int {
return e.Line
}
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
>>>>>>> REPLACE
```
2024-05-14 12:22:26 +00:00
|
|
|
return extendedEvent{
|
aider: Update NewExtendedEvent to accept base event as an argument and populate additional fields.
# Aider chat conversation:
USER: newextendedevent should accept the base event as argument and populate the additional fields in the constructor
ASSISTANT: To modify the `NewExtendedEvent` function to accept a base event as an argument and populate the additional fields, we need to:
1. Update the `NewExtendedEvent` function in `simplelog.go`.
Here is the *SEARCH/REPLACE* block:
simplelog.go
```go
<<<<<<< SEARCH
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
=======
func NewExtendedEvent(baseEvent Event, file string, line int) ExtendedEvent {
return extendedEvent{
Event: baseEvent,
File: file,
Line: line,
}
}
>>>>>>> REPLACE
```
2024-05-14 12:23:52 +00:00
|
|
|
Event: baseEvent,
|
aider: Moved the `ExtendedEvent` type and interface to `simplelog.go`.
# Aider chat conversation:
USER: the extendedevent type and interface should be in simplelog.go not the relp_handler.go because it's general to the simplelog package and not specific to the relp extendedhandler.
ASSISTANT: To move the `ExtendedEvent` type and interface to `simplelog.go`, we need to:
1. Remove the `ExtendedEvent` type and interface from `event.go`.
2. Add the `ExtendedEvent` type and interface to `simplelog.go`.
Here are the *SEARCH/REPLACE* blocks:
event.go
```go
<<<<<<< SEARCH
type ExtendedEvent interface {
GetID() uuid.UUID
GetTimestamp() time.Time
GetLevel() string
GetMessage() string
GetData() json.RawMessage
GetFile() string
GetLine() int
}
type extendedEvent struct {
Event
File string `json:"file"`
Line int `json:"line"`
}
func (e extendedEvent) GetID() uuid.UUID {
return e.ID
}
func (e extendedEvent) GetTimestamp() time.Time {
return e.Timestamp
}
func (e extendedEvent) GetLevel() string {
return e.Level
}
func (e extendedEvent) GetMessage() string {
return e.Message
}
func (e extendedEvent) GetData() json.RawMessage {
return e.Data
}
func (e extendedEvent) GetFile() string {
return e.File
}
func (e extendedEvent) GetLine() int {
return e.Line
}
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
=======
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
=======
type ExtendedEvent interface {
GetID() uuid.UUID
GetTimestamp() time.Time
GetLevel() string
GetMessage() string
GetData() json.RawMessage
GetFile() string
GetLine() int
}
type extendedEvent struct {
Event
File string `json:"file"`
Line int `json:"line"`
}
func (e extendedEvent) GetID() uuid.UUID {
return e.ID
}
func (e extendedEvent) GetTimestamp() time.Time {
return e.Timestamp
}
func (e extendedEvent) GetLevel() string {
return e.Level
}
func (e extendedEvent) GetMessage() string {
return e.Message
}
func (e extendedEvent) GetData() json.RawMessage {
return e.Data
}
func (e extendedEvent) GetFile() string {
return e.File
}
func (e extendedEvent) GetLine() int {
return e.Line
}
func NewExtendedEvent(level, message string, data json.RawMessage, file string, line int) ExtendedEvent {
return extendedEvent{
Event: NewEvent(level, message, data),
File: file,
Line: line,
}
}
>>>>>>> REPLACE
```
2024-05-14 12:22:26 +00:00
|
|
|
File: file,
|
|
|
|
Line: line,
|
|
|
|
}
|
|
|
|
}
|