refactor: reorganize agent, generator, sqlutil, and error_status packages

Replace agent/ with runner/, move generator/ to recipe/scaffold,
relocate plugins/sqlutil to plugins/internal/sqlutil, and move
utils/error_status to metrics/otelgrpc/status. Update all imports
across extractors, cmd, metrics, and recipe packages.

Author: ravisuhag

cmd/lint.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/meteor/agent"
+	"github.com/raystack/meteor/runner"
 	"github.com/raystack/meteor/config"
 	"github.com/raystack/meteor/plugins"
 	"github.com/raystack/meteor/recipe"
@@ -61,7 +61,7 @@ func LintCmd() *cobra.Command {
 			lg := log.NewLogrus(log.LogrusWithLevel(cfg.LogLevel))
 			plugins.SetLog(lg)
 
-			runner := agent.NewAgent(agent.Config{
+			rnr := runner.NewRunner(runner.Config{
 				ExtractorFactory: registry.Extractors,
 				ProcessorFactory: registry.Processors,
 				SinkFactory:      registry.Sinks,
@@ -81,7 +81,7 @@ func LintCmd() *cobra.Command {
 
 			// Run linters and generate report
 			for _, recipe := range recipes {
-				errs := runner.Validate(recipe)
+				errs := rnr.Validate(recipe)
 				var row []string
 				var icon string
 

cmd/recipe.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/meteor/generator"
 	"github.com/raystack/meteor/recipe"
 	"github.com/raystack/meteor/registry"
 	"github.com/spf13/cobra"
@@ -90,7 +89,7 @@ func recipeInitCmd() *cobra.Command {
 				}
 			}
 
-			return generator.RecipeWriteTo(generator.RecipeParams{
+			return recipe.ScaffoldWriteTo(recipe.ScaffoldParams{
 				Name:       args[0],
 				Source:     extractor,
 				Scope:      scope,

cmd/run.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/meteor/agent"
+	"github.com/raystack/meteor/runner"
 	"github.com/raystack/meteor/config"
 	"github.com/raystack/meteor/metrics"
 	"github.com/raystack/meteor/plugins"
@@ -84,7 +84,7 @@ func RunCmd() *cobra.Command {
 			ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 			defer stop()
 
-			var mts agent.Monitor
+			var mts runner.Monitor
 
 			if cfg.OtelEnabled {
 				doneOtlp, err := metrics.InitOtel(ctx, cfg, lg, Version)
@@ -96,7 +96,7 @@ func RunCmd() *cobra.Command {
 				mts = metrics.NewOtelMonitor()
 			}
 
-			runner := agent.NewAgent(agent.Config{
+			rnr := runner.NewRunner(runner.Config{
 				ExtractorFactory:     registry.Extractors,
 				ProcessorFactory:     registry.Processors,
 				SinkFactory:          registry.Sinks,
@@ -137,7 +137,7 @@ func RunCmd() *cobra.Command {
 			)
 
 			// Run recipes and collect results
-			runs := runner.RunMultiple(ctx, recipes)
+			runs := rnr.RunMultiple(ctx, recipes)
 			for _, run := range runs {
 				lg.Debug("recipe details", "recipe", run.Recipe)
 				var row []string
@@ -201,7 +201,7 @@ func formatEntityTypes(types map[string]int) string {
 }
 
 // printRunErrors prints error details for failed runs.
-func printRunErrors(runs []agent.Run) {
+func printRunErrors(runs []runner.Run) {
 	for _, run := range runs {
 		if run.Error != nil {
 			fmt.Printf("  %s %s: %s\n", printer.Icon("failure"), run.Recipe.Name, run.Error)

metrics/opentelemetry_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/raystack/meteor/agent"
+	"github.com/raystack/meteor/runner"
 	"github.com/raystack/meteor/config"
 	"github.com/raystack/meteor/metrics"
 	"github.com/raystack/meteor/recipe"
@@ -34,7 +34,7 @@ func TestOtelMonitor_RecordRun(t *testing.T) {
 
 		monitor := metrics.NewOtelMonitor()
 
-		monitor.RecordRun(ctx, agent.Run{Recipe: recipe, DurationInMs: duration, RecordCount: recordCount, Success: false})
+		monitor.RecordRun(ctx, runner.Run{Recipe: recipe, DurationInMs: duration, RecordCount: recordCount, Success: false})
 
 		assert.NotNil(t, monitor)
 		assert.NotNil(t, done)
@@ -64,7 +64,7 @@ func TestOtelMonitor_RecordPlugin(t *testing.T) {
 		monitor := metrics.NewOtelMonitor()
 
 		monitor.RecordPlugin(context.Background(),
-			agent.PluginInfo{
+			runner.PluginInfo{
 				RecipeName: recipe.Name,
 				PluginName: recipe.Sinks[0].Name,
 				PluginType: "sink",

metrics/otel_monitor.go

@@ -3,7 +3,7 @@ package metrics
 import (
 	"context"
 
-	"github.com/raystack/meteor/agent"
+	"github.com/raystack/meteor/runner"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
@@ -41,7 +41,7 @@ func NewOtelMonitor() *OtelMonitor {
 }
 
 // RecordRun records a run behavior
-func (m *OtelMonitor) RecordRun(ctx context.Context, run agent.Run) {
+func (m *OtelMonitor) RecordRun(ctx context.Context, run runner.Run) {
 	m.recipeDuration.Record(ctx,
 		float64(run.DurationInMs)/1000.0,
 		metric.WithAttributes(
@@ -70,9 +70,9 @@ func (m *OtelMonitor) RecordRun(ctx context.Context, run agent.Run) {
 }
 
 // RecordPlugin records a individual plugin behavior in a run, this is being handled in otelmw
-func (*OtelMonitor) RecordPlugin(context.Context, agent.PluginInfo) {}
+func (*OtelMonitor) RecordPlugin(context.Context, runner.PluginInfo) {}
 
-func (m *OtelMonitor) RecordSinkRetryCount(ctx context.Context, pluginInfo agent.PluginInfo) {
+func (m *OtelMonitor) RecordSinkRetryCount(ctx context.Context, pluginInfo runner.PluginInfo) {
 	m.sinkRetries.Add(ctx,
 		1,
 		metric.WithAttributes(

metrics/otelgrpc/otelgrpc.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/raystack/meteor/utils"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
@@ -73,7 +72,7 @@ func (m *Monitor) RecordUnary(ctx context.Context, p UnaryParams) {
 
 	attrs := make([]attribute.KeyValue, len(m.attributes))
 	copy(attrs, m.attributes)
-	attrs = append(attrs, attribute.String("rpc.grpc.status_text", utils.StatusText(p.Err)))
+	attrs = append(attrs, attribute.String("rpc.grpc.status_text", StatusText(p.Err)))
 	attrs = append(attrs, attribute.String("network.type", netTypeFromCtx(ctx)))
 	attrs = append(attrs, ParseFullMethod(p.Method)...)
 
@@ -93,7 +92,7 @@ func (m *Monitor) RecordUnary(ctx context.Context, p UnaryParams) {
 func (m *Monitor) RecordStream(ctx context.Context, start time.Time, method string, err error) {
 	attrs := make([]attribute.KeyValue, len(m.attributes))
 	copy(attrs, m.attributes)
-	attrs = append(attrs, attribute.String("rpc.grpc.status_text", utils.StatusText(err)))
+	attrs = append(attrs, attribute.String("rpc.grpc.status_text", StatusText(err)))
 	attrs = append(attrs, attribute.String("network.type", netTypeFromCtx(ctx)))
 	attrs = append(attrs, ParseFullMethod(method)...)
 

utils/error_status.go metrics/otelgrpc/status.goutils/error_status.go renamed to metrics/otelgrpc/status.go

@@ -1,4 +1,4 @@
-package utils
+package otelgrpc
 
 import (
 	"errors"

utils/error_status_test.go metrics/otelgrpc/status_test.goutils/error_status_test.go renamed to metrics/otelgrpc/status_test.go

@@ -1,11 +1,11 @@
-package utils
+package otelgrpc_test
 
 import (
+	"errors"
 	"fmt"
 	"testing"
 
-	"errors"
-
+	"github.com/raystack/meteor/metrics/otelgrpc"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -40,7 +40,7 @@ func TestStatusCode(t *testing.T) {
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, StatusCode(tc.err))
+			assert.Equal(t, tc.expected, otelgrpc.StatusCode(tc.err))
 		})
 	}
 }

plugins/extractors/bigtable/middleware.go

@@ -7,7 +7,7 @@ import (
 
 	"cloud.google.com/go/bigtable"
 	"github.com/googleapis/gax-go/v2/apierror"
-	"github.com/raystack/meteor/utils"
+	"github.com/raystack/meteor/metrics/otelgrpc"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
@@ -107,7 +107,7 @@ func (o *InstanceAdminClientMW) Instances(ctx context.Context) (res []*bigtable.
 }
 
 func apiErrReason(err error) string {
-	reason := utils.StatusCode(err).String()
+	reason := otelgrpc.StatusCode(err).String()
 	var apiErr *apierror.APIError
 	if errors.As(err, &apiErr) {
 		reason = apiErr.Reason()

plugins/extractors/cassandra/cassandra.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/gocql/gocql"
 	"github.com/raystack/meteor/models"
-	"github.com/raystack/meteor/plugins/sqlutil"
+	"github.com/raystack/meteor/plugins/internal/sqlutil"
 
 	"github.com/raystack/meteor/plugins"
 	"github.com/raystack/meteor/registry"