2024-05-14 11:48:28 +00:00
|
|
|
package simplelog
|
|
|
|
|
|
|
|
import (
|
2024-05-14 11:57:12 +00:00
|
|
|
"context"
|
2024-06-10 09:39:01 +00:00
|
|
|
"encoding/json"
|
2024-05-14 11:48:28 +00:00
|
|
|
"log"
|
|
|
|
"log/slog"
|
|
|
|
"os"
|
2024-06-10 09:39:01 +00:00
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/google/uuid"
|
2024-05-14 11:48:28 +00:00
|
|
|
|
|
|
|
"github.com/mattn/go-isatty"
|
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
2024-06-14 12:34:05 +00:00
|
|
|
webhookURL = os.Getenv("LOGGER_WEBHOOK_URL")
|
2024-05-14 11:48:28 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
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() {
|
aider: Rename CustomHandler to MultiplexHandler.
# Aider chat conversation:
USER: rename CustomHandler to MultiplexHandler
ASSISTANT: Here are the necessary changes to rename `CustomHandler` to `MultiplexHandler`:
simplelog.go
```go
<<<<<<< SEARCH
ourCustomHandler = NewCustomHandler()
=======
ourCustomHandler = NewMultiplexHandler()
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
type CustomHandler struct {
=======
type MultiplexHandler struct {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func NewCustomHandler() slog.Handler {
cl := &CustomHandler{}
=======
func NewMultiplexHandler() slog.Handler {
cl := &MultiplexHandler{}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
=======
func (cl *MultiplexHandler) Handle(ctx context.Context, record slog.Record) error {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
=======
func (cl *MultiplexHandler) Enabled(ctx context.Context, level slog.Level) bool {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
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}
=======
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithAttrs(attrs)
}
return &MultiplexHandler{handlers: newHandlers}
}
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithGroup(name)
}
return &MultiplexHandler{handlers: newHandlers}
>>>>>>> REPLACE
```
2024-05-14 12:26:56 +00:00
|
|
|
ourCustomHandler = NewMultiplexHandler()
|
2024-05-14 12:20:43 +00:00
|
|
|
ourCustomLogger = slog.New(ourCustomHandler)
|
2024-05-14 11:48:28 +00:00
|
|
|
slog.SetDefault(ourCustomLogger)
|
|
|
|
}
|
|
|
|
|
aider: Rename CustomHandler to MultiplexHandler.
# Aider chat conversation:
USER: rename CustomHandler to MultiplexHandler
ASSISTANT: Here are the necessary changes to rename `CustomHandler` to `MultiplexHandler`:
simplelog.go
```go
<<<<<<< SEARCH
ourCustomHandler = NewCustomHandler()
=======
ourCustomHandler = NewMultiplexHandler()
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
type CustomHandler struct {
=======
type MultiplexHandler struct {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func NewCustomHandler() slog.Handler {
cl := &CustomHandler{}
=======
func NewMultiplexHandler() slog.Handler {
cl := &MultiplexHandler{}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
=======
func (cl *MultiplexHandler) Handle(ctx context.Context, record slog.Record) error {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
=======
func (cl *MultiplexHandler) Enabled(ctx context.Context, level slog.Level) bool {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
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}
=======
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithAttrs(attrs)
}
return &MultiplexHandler{handlers: newHandlers}
}
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithGroup(name)
}
return &MultiplexHandler{handlers: newHandlers}
>>>>>>> REPLACE
```
2024-05-14 12:26:56 +00:00
|
|
|
type MultiplexHandler struct {
|
2024-05-14 12:20:43 +00:00
|
|
|
handlers []ExtendedHandler
|
|
|
|
}
|
|
|
|
|
aider: Rename CustomHandler to MultiplexHandler.
# Aider chat conversation:
USER: rename CustomHandler to MultiplexHandler
ASSISTANT: Here are the necessary changes to rename `CustomHandler` to `MultiplexHandler`:
simplelog.go
```go
<<<<<<< SEARCH
ourCustomHandler = NewCustomHandler()
=======
ourCustomHandler = NewMultiplexHandler()
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
type CustomHandler struct {
=======
type MultiplexHandler struct {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func NewCustomHandler() slog.Handler {
cl := &CustomHandler{}
=======
func NewMultiplexHandler() slog.Handler {
cl := &MultiplexHandler{}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
=======
func (cl *MultiplexHandler) Handle(ctx context.Context, record slog.Record) error {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
=======
func (cl *MultiplexHandler) Enabled(ctx context.Context, level slog.Level) bool {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
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}
=======
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithAttrs(attrs)
}
return &MultiplexHandler{handlers: newHandlers}
}
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithGroup(name)
}
return &MultiplexHandler{handlers: newHandlers}
>>>>>>> REPLACE
```
2024-05-14 12:26:56 +00:00
|
|
|
func NewMultiplexHandler() slog.Handler {
|
|
|
|
cl := &MultiplexHandler{}
|
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 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
|
|
|
|
2024-06-14 12:34:05 +00:00
|
|
|
func (cl *MultiplexHandler) Handle(
|
|
|
|
ctx context.Context,
|
|
|
|
record slog.Record,
|
|
|
|
) error {
|
2024-05-14 12:20:43 +00:00
|
|
|
for _, handler := range cl.handlers {
|
|
|
|
if err := handler.Handle(ctx, record); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2024-06-14 12:34:05 +00:00
|
|
|
func (cl *MultiplexHandler) Enabled(
|
|
|
|
ctx context.Context,
|
|
|
|
level slog.Level,
|
|
|
|
) bool {
|
2024-05-14 12:20:43 +00:00
|
|
|
// send us all events
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
aider: Rename CustomHandler to MultiplexHandler.
# Aider chat conversation:
USER: rename CustomHandler to MultiplexHandler
ASSISTANT: Here are the necessary changes to rename `CustomHandler` to `MultiplexHandler`:
simplelog.go
```go
<<<<<<< SEARCH
ourCustomHandler = NewCustomHandler()
=======
ourCustomHandler = NewMultiplexHandler()
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
type CustomHandler struct {
=======
type MultiplexHandler struct {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func NewCustomHandler() slog.Handler {
cl := &CustomHandler{}
=======
func NewMultiplexHandler() slog.Handler {
cl := &MultiplexHandler{}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
=======
func (cl *MultiplexHandler) Handle(ctx context.Context, record slog.Record) error {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
=======
func (cl *MultiplexHandler) Enabled(ctx context.Context, level slog.Level) bool {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
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}
=======
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithAttrs(attrs)
}
return &MultiplexHandler{handlers: newHandlers}
}
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithGroup(name)
}
return &MultiplexHandler{handlers: newHandlers}
>>>>>>> REPLACE
```
2024-05-14 12:26:56 +00:00
|
|
|
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
|
2024-05-14 12:20:43 +00:00
|
|
|
newHandlers := make([]ExtendedHandler, len(cl.handlers))
|
|
|
|
for i, handler := range cl.handlers {
|
|
|
|
newHandlers[i] = handler.WithAttrs(attrs)
|
|
|
|
}
|
aider: Rename CustomHandler to MultiplexHandler.
# Aider chat conversation:
USER: rename CustomHandler to MultiplexHandler
ASSISTANT: Here are the necessary changes to rename `CustomHandler` to `MultiplexHandler`:
simplelog.go
```go
<<<<<<< SEARCH
ourCustomHandler = NewCustomHandler()
=======
ourCustomHandler = NewMultiplexHandler()
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
type CustomHandler struct {
=======
type MultiplexHandler struct {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func NewCustomHandler() slog.Handler {
cl := &CustomHandler{}
=======
func NewMultiplexHandler() slog.Handler {
cl := &MultiplexHandler{}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
=======
func (cl *MultiplexHandler) Handle(ctx context.Context, record slog.Record) error {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
=======
func (cl *MultiplexHandler) Enabled(ctx context.Context, level slog.Level) bool {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
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}
=======
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithAttrs(attrs)
}
return &MultiplexHandler{handlers: newHandlers}
}
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithGroup(name)
}
return &MultiplexHandler{handlers: newHandlers}
>>>>>>> REPLACE
```
2024-05-14 12:26:56 +00:00
|
|
|
return &MultiplexHandler{handlers: newHandlers}
|
2024-05-14 12:20:43 +00:00
|
|
|
}
|
|
|
|
|
aider: Rename CustomHandler to MultiplexHandler.
# Aider chat conversation:
USER: rename CustomHandler to MultiplexHandler
ASSISTANT: Here are the necessary changes to rename `CustomHandler` to `MultiplexHandler`:
simplelog.go
```go
<<<<<<< SEARCH
ourCustomHandler = NewCustomHandler()
=======
ourCustomHandler = NewMultiplexHandler()
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
type CustomHandler struct {
=======
type MultiplexHandler struct {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func NewCustomHandler() slog.Handler {
cl := &CustomHandler{}
=======
func NewMultiplexHandler() slog.Handler {
cl := &MultiplexHandler{}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
=======
func (cl *MultiplexHandler) Handle(ctx context.Context, record slog.Record) error {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
=======
func (cl *MultiplexHandler) Enabled(ctx context.Context, level slog.Level) bool {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
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}
=======
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithAttrs(attrs)
}
return &MultiplexHandler{handlers: newHandlers}
}
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithGroup(name)
}
return &MultiplexHandler{handlers: newHandlers}
>>>>>>> REPLACE
```
2024-05-14 12:26:56 +00:00
|
|
|
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
|
2024-05-14 12:20:43 +00:00
|
|
|
newHandlers := make([]ExtendedHandler, len(cl.handlers))
|
|
|
|
for i, handler := range cl.handlers {
|
|
|
|
newHandlers[i] = handler.WithGroup(name)
|
|
|
|
}
|
aider: Rename CustomHandler to MultiplexHandler.
# Aider chat conversation:
USER: rename CustomHandler to MultiplexHandler
ASSISTANT: Here are the necessary changes to rename `CustomHandler` to `MultiplexHandler`:
simplelog.go
```go
<<<<<<< SEARCH
ourCustomHandler = NewCustomHandler()
=======
ourCustomHandler = NewMultiplexHandler()
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
type CustomHandler struct {
=======
type MultiplexHandler struct {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func NewCustomHandler() slog.Handler {
cl := &CustomHandler{}
=======
func NewMultiplexHandler() slog.Handler {
cl := &MultiplexHandler{}
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Handle(ctx context.Context, record slog.Record) error {
=======
func (cl *MultiplexHandler) Handle(ctx context.Context, record slog.Record) error {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
func (cl *CustomHandler) Enabled(ctx context.Context, level slog.Level) bool {
=======
func (cl *MultiplexHandler) Enabled(ctx context.Context, level slog.Level) bool {
>>>>>>> REPLACE
```
simplelog.go
```go
<<<<<<< SEARCH
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}
=======
func (cl *MultiplexHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithAttrs(attrs)
}
return &MultiplexHandler{handlers: newHandlers}
}
func (cl *MultiplexHandler) WithGroup(name string) slog.Handler {
newHandlers := make([]ExtendedHandler, len(cl.handlers))
for i, handler := range cl.handlers {
newHandlers[i] = handler.WithGroup(name)
}
return &MultiplexHandler{handlers: newHandlers}
>>>>>>> REPLACE
```
2024-05-14 12:26:56 +00:00
|
|
|
return &MultiplexHandler{handlers: newHandlers}
|
2024-05-14 12:20:43 +00:00
|
|
|
}
|
2024-06-10 09:39:01 +00:00
|
|
|
|
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,
|
|
|
|
}
|
|
|
|
}
|