opensource/cocos
1
0
Fork 0
mirror of https://github.com/ultravioletrs/cocos.git synced 2026-08-07 07:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NOISSUE - Refactor computation parameter naming and remove tracing (#42)

Browse Source 
Standardized the variable name for computation parameter across various service and middleware implementations to improve code consistency. This enhances readability and maintainability.

Additionally, tracing functionality has been removed completely, signifying a potential shift in the telemetry strategy or removal of an unused feature. The run command associated with cli package has also been deleted, suggesting a change in the CLI tool's capabilities or its command handling strategy.

The service interface's Run method definition and its implementations now align with the updated parameter naming, ensuring coherence throughout the codebase.

Removed files:
- The entire `tracing` package has been deleted.
- Removed the `cli/run.go` file, indicating the removal of the 'run' command from the CLI.

Please note that these changes may affect any existing workflows or systems that rely on the removed tracing capabilities or the CLI run command, and appropriate adjustments will need to be made to accommodate these updates.

Refer to internal documentation or release notes for migration paths or additional context.

Signed-off-by: SammyOina <sammyoina@gmail.com>
This commit is contained in:
Sammy Kerata Oina
2024-01-10 13:52:37 +03:00
committed by GitHub
parent 4d9f7b1a45
commit b55b6c9734
16 changed files with 45 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/agent/main.go
+7 -23
View File
@@ -17,13 +17,10 @@ import (
"github.com/ultravioletrs/cocos/agent"
"github.com/ultravioletrs/cocos/agent/api"
agentgrpc "github.com/ultravioletrs/cocos/agent/api/grpc"
"github.com/ultravioletrs/cocos/agent/tracing"
"github.com/ultravioletrs/cocos/internal"
"github.com/ultravioletrs/cocos/internal/env"
jaegerclient "github.com/ultravioletrs/cocos/internal/jaeger"
"github.com/ultravioletrs/cocos/internal/server"
grpcserver "github.com/ultravioletrs/cocos/internal/server/grpc"
"go.opentelemetry.io/otel/trace"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
@@ -41,7 +38,6 @@ var errComputationNotFound = errors.New("computation not found in command line")
type config struct {
LogLevel string `env:"AGENT_LOG_LEVEL" envDefault:"info"`
JaegerURL string `env:"COCOS_JAEGER_URL" envDefault:"http://localhost:14268/api/traces"`
InstanceID string `env:"AGENT_INSTANCE_ID" envDefault:""`
}
@@ -66,24 +62,13 @@ func main() {
}
}
tp, err := jaegerclient.NewProvider(ctx, svcName, cfg.JaegerURL, cfg.InstanceID)
if err != nil {
logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err))
}
defer func() {
if err := tp.Shutdown(ctx); err != nil {
logger.Error(fmt.Sprintf("Error shutting down tracer provider: %v", err))
}
}()
tracer := tp.Tracer(svcName)
svc := newService(ctx, logger)
svc := newService(ctx, logger, tracer)
cmp, err := extractComputationValue()
ac, err := extractComputationValue()
if err != nil {
logger.Fatal(fmt.Sprintf("computation not loaded from cmdline : %s", err.Error()))
}
if _, err := svc.Run(ctx, cmp); err != nil {
if _, err := svc.Run(ctx, ac); err != nil {
logger.Fatal(fmt.Sprintf("failed to run computation with err: %s", err))
}
@@ -111,13 +96,12 @@ func main() {
}
}
func newService(ctx context.Context, logger mglog.Logger, tracer trace.Tracer) agent.Service {
func newService(ctx context.Context, logger mglog.Logger) agent.Service {
svc := agent.New(ctx, logger)
svc = api.LoggingMiddleware(svc, logger)
counter, latency := internal.MakeMetrics(svcName, "api")
svc = api.MetricsMiddleware(svc, counter, latency)
svc = tracing.New(svc, tracer)
return svc
}
@@ -140,7 +124,7 @@ func extractComputationValue() (agent.Computation, error) {
end := strings.Index(cmdLine[start:], " ")
cmpUnescaped := cmdLine[start : start+end]
var computation agent.Computation
var ac agent.Computation
if end == -1 {
cmpUnescaped = cmdLine[start:]
}
@@ -150,8 +134,8 @@ func extractComputationValue() (agent.Computation, error) {
return agent.Computation{}, err
}
if err := json.Unmarshal([]byte(escapedCmpStr), &computation); err != nil {
if err := json.Unmarshal([]byte(escapedCmpStr), &ac); err != nil {
return agent.Computation{}, err
}
return computation, nil
return ac, nil
}