ultravioletrs · dborovcanin · Oct 30, 2024 · Oct 16, 2024 · Oct 16, 2024 · Oct 17, 2024
diff --git a/Makefile b/Makefile
@@ -35,7 +35,8 @@ $(BACKEND_INFO):
 
 protoc:
 	protoc -I. --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative agent/agent.proto
-	protoc -I. --go_out=./pkg --go_opt=paths=source_relative --go-grpc_out=./pkg --go-grpc_opt=paths=source_relative manager/manager.proto
+	protoc -I. --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative manager/manager.proto
+	protoc -I. --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative agent/events/events.proto
 
 mocks:
 	go generate ./...

diff --git a/agent/algorithm/binary/binary.go b/agent/algorithm/binary/binary.go
@@ -9,6 +9,7 @@ import (
 	"os/exec"
 
 	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events"
 )
 
@@ -24,8 +25,8 @@ type binary struct {
 func NewAlgorithm(logger *slog.Logger, eventsSvc events.Service, algoFile string, args []string) algorithm.Algorithm {
 	return &binary{
 		algoFile: algoFile,
-		stderr:   &algorithm.Stderr{Logger: logger, EventSvc: eventsSvc},
-		stdout:   &algorithm.Stdout{Logger: logger},
+		stderr:   &logging.Stderr{Logger: logger, EventSvc: eventsSvc},
+		stdout:   &logging.Stdout{Logger: logger},
 		args:     args,
 	}
 }

diff --git a/agent/algorithm/binary/binary_test.go b/agent/algorithm/binary/binary_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events/mocks"
 )
 
@@ -39,11 +39,11 @@ func TestNewAlgorithm(t *testing.T) {
 		}
 	}
 
-	if _, ok := b.stderr.(*algorithm.Stderr); !ok {
+	if _, ok := b.stderr.(*logging.Stderr); !ok {
 		t.Errorf("Expected stderr to be *algorithm.Stderr")
 	}
 
-	if _, ok := b.stdout.(*algorithm.Stdout); !ok {
+	if _, ok := b.stdout.(*logging.Stdout); !ok {
 		t.Errorf("Expected stdout to be *algorithm.Stdout")
 	}
 }

diff --git a/agent/algorithm/docker/docker.go b/agent/algorithm/docker/docker.go
@@ -16,6 +16,7 @@ import (
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/client"
 	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events"
 )
 
@@ -38,8 +39,8 @@ func NewAlgorithm(logger *slog.Logger, eventsSvc events.Service, algoFile string
 	d := &docker{
 		algoFile: algoFile,
 		logger:   logger,
-		stderr:   &algorithm.Stderr{Logger: logger, EventSvc: eventsSvc},
-		stdout:   &algorithm.Stdout{Logger: logger},
+		stderr:   &logging.Stderr{Logger: logger, EventSvc: eventsSvc},
+		stdout:   &logging.Stdout{Logger: logger},
 	}
 
 	return d

diff --git a/agent/algorithm/docker/docker_test.go b/agent/algorithm/docker/docker_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events/mocks"
 )
 
@@ -24,6 +24,6 @@ func TestNewAlgorithm(t *testing.T) {
 	assert.True(t, ok, "NewAlgorithm should return a *docker")
 	assert.Equal(t, algoFile, d.algoFile, "algoFile should be set correctly")
 	assert.NotNil(t, d.logger, "logger should be set")
-	assert.IsType(t, &algorithm.Stderr{}, d.stderr, "stderr should be of type *algorithm.Stderr")
-	assert.IsType(t, &algorithm.Stdout{}, d.stdout, "stdout should be of type *algorithm.Stdout")
+	assert.IsType(t, &logging.Stderr{}, d.stderr, "stderr should be of type *algorithm.Stderr")
+	assert.IsType(t, &logging.Stdout{}, d.stdout, "stdout should be of type *algorithm.Stdout")
 }
diff --git a/agent/algorithm/logging.go → agent/algorithm/logging/logging.go b/agent/algorithm/logging.go → agent/algorithm/logging/logging.go
@@ -1,6 +1,6 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
-package algorithm
+package logging
 
 import (
 	"bytes"

diff --git a/agent/algorithm/logging_test.go → agent/algorithm/logging/logging_test.go b/agent/algorithm/logging_test.go → agent/algorithm/logging/logging_test.go
@@ -1,6 +1,6 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
-package algorithm
+package logging
 
 import (
 	"strings"

diff --git a/agent/algorithm/python/python.go b/agent/algorithm/python/python.go
@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 
 	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events"
 	"google.golang.org/grpc/metadata"
 )
@@ -43,8 +44,8 @@ type python struct {
 func NewAlgorithm(logger *slog.Logger, eventsSvc events.Service, runtime, requirementsFile, algoFile string, args []string) algorithm.Algorithm {
 	p := &python{
 		algoFile:         algoFile,
-		stderr:           &algorithm.Stderr{Logger: logger, EventSvc: eventsSvc},
-		stdout:           &algorithm.Stdout{Logger: logger},
+		stderr:           &logging.Stderr{Logger: logger, EventSvc: eventsSvc},
+		stdout:           &logging.Stdout{Logger: logger},
 		requirementsFile: requirementsFile,
 		args:             args,
 	}

diff --git a/agent/algorithm/python/python_test.go b/agent/algorithm/python/python_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events/mocks"
 	"google.golang.org/grpc/metadata"
 )
@@ -90,8 +90,8 @@ func TestRun(t *testing.T) {
 
 	algo := &python{
 		algoFile: scriptPath,
-		stderr:   io.MultiWriter(&stderr, &algorithm.Stderr{Logger: slog.Default(), EventSvc: eventsSvc}),
-		stdout:   io.MultiWriter(&stdout, &algorithm.Stdout{Logger: slog.Default()}),
+		stderr:   io.MultiWriter(&stderr, &logging.Stderr{Logger: slog.Default(), EventSvc: eventsSvc}),
+		stdout:   io.MultiWriter(&stdout, &logging.Stdout{Logger: slog.Default()}),
 		runtime:  "python3",
 	}
 
@@ -132,8 +132,8 @@ func TestRunWithRequirements(t *testing.T) {
 	algo := &python{
 		algoFile:         scriptPath,
 		requirementsFile: requirementsPath,
-		stderr:           io.MultiWriter(&stderr, &algorithm.Stderr{Logger: slog.Default(), EventSvc: eventsSvc}),
-		stdout:           io.MultiWriter(&stdout, &algorithm.Stdout{Logger: slog.Default()}),
+		stderr:           io.MultiWriter(&stderr, &logging.Stderr{Logger: slog.Default(), EventSvc: eventsSvc}),
+		stdout:           io.MultiWriter(&stdout, &logging.Stdout{Logger: slog.Default()}),
 		runtime:          "python3",
 	}
 

diff --git a/agent/algorithm/wasm/wasm.go b/agent/algorithm/wasm/wasm.go
@@ -9,6 +9,7 @@ import (
 	"os/exec"
 
 	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events"
 )
 
@@ -28,8 +29,8 @@ type wasm struct {
 func NewAlgorithm(logger *slog.Logger, eventsSvc events.Service, algoFile string, args []string) algorithm.Algorithm {
 	return &wasm{
 		algoFile: algoFile,
-		stderr:   &algorithm.Stderr{Logger: logger, EventSvc: eventsSvc},
-		stdout:   &algorithm.Stdout{Logger: logger},
+		stderr:   &logging.Stderr{Logger: logger, EventSvc: eventsSvc},
+		stdout:   &logging.Stdout{Logger: logger},
 		args:     args,
 	}
 }

diff --git a/agent/algorithm/wasm/wasm_test.go b/agent/algorithm/wasm/wasm_test.go
@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/ultravioletrs/cocos/agent/algorithm"
+	"github.com/ultravioletrs/cocos/agent/algorithm/logging"
 	"github.com/ultravioletrs/cocos/agent/events/mocks"
 )
 
@@ -33,12 +33,12 @@ func TestNewAlgorithm(t *testing.T) {
 		t.Errorf("Expected %d args, got %d", len(args), len(w.args))
 	}
 
-	_, ok = w.stderr.(*algorithm.Stderr)
+	_, ok = w.stderr.(*logging.Stderr)
 	if !ok {
 		t.Errorf("Expected stderr to be *algorithm.Stderr")
 	}
 
-	_, ok = w.stdout.(*algorithm.Stdout)
+	_, ok = w.stdout.(*logging.Stdout)
 	if !ok {
 		t.Errorf("Expected stdout to be *algorithm.Stdout")
 	}

diff --git a/agent/events/events.go b/agent/events/events.go
@@ -8,7 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ultravioletrs/cocos/pkg/manager"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
@@ -24,15 +23,6 @@ type service struct {
 	stopRetry      chan struct{}
 }
 
-type AgentEvent struct {
-	EventType     string          `json:"event_type"`
-	Timestamp     time.Time       `json:"timestamp"`
-	ComputationID string          `json:"computation_id,omitempty"`
-	Details       json.RawMessage `json:"details,omitempty"`
-	Originator    string          `json:"originator"`
-	Status        string          `json:"status,omitempty"`
-}
-
 //go:generate mockery --name Service --output=./mocks --filename events.go --quiet --note "Copyright (c) Ultraviolet \n // SPDX-License-Identifier: Apache-2.0"
 type Service interface {
 	SendEvent(event, status string, details json.RawMessage) error
@@ -54,7 +44,7 @@ func New(svc, computationID string, conn io.Writer) (Service, error) {
 }
 
 func (s *service) SendEvent(event, status string, details json.RawMessage) error {
-	body := manager.ClientStreamMessage{Message: &manager.ClientStreamMessage_AgentEvent{AgentEvent: &manager.AgentEvent{
+	body := EventsLogs{Message: &EventsLogs_AgentEvent{AgentEvent: &AgentEvent{
 		EventType:     event,
 		Timestamp:     timestamppb.Now(),
 		ComputationId: s.computationID,