refactor: rename internal module to avoid conflict with aws sdk cloudwatchlogs -> cwlogs

Author: batovpasha

cmd/cli/main.go

@@ -10,7 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 
 	"github.com/batovpasha/aws-cw-log-sampler/internal/cli"
-	"github.com/batovpasha/aws-cw-log-sampler/internal/cloudwatchlogs"
+	"github.com/batovpasha/aws-cw-log-sampler/internal/cwlogs"
 	"github.com/batovpasha/aws-cw-log-sampler/internal/logger"
 	"github.com/batovpasha/aws-cw-log-sampler/internal/sample"
 )
@@ -38,7 +38,7 @@ func main() {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
-	client := cloudwatchlogs.NewFromConfig(cfg)
+	client := cwlogs.NewFromConfig(cfg)
 
 	cutoff := time.Now().Add(-time.Duration(*lookbackHours) * time.Hour).UnixMilli()
 

cmd/service/main.go

@@ -14,7 +14,7 @@ import (
 	"github.com/robfig/cron/v3"
 
 	"github.com/batovpasha/aws-cw-log-sampler/internal/cli"
-	"github.com/batovpasha/aws-cw-log-sampler/internal/cloudwatchlogs"
+	"github.com/batovpasha/aws-cw-log-sampler/internal/cwlogs"
 	"github.com/batovpasha/aws-cw-log-sampler/internal/logger"
 	"github.com/batovpasha/aws-cw-log-sampler/internal/sample"
 )
@@ -49,7 +49,7 @@ func main() {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
-	client := cloudwatchlogs.NewFromConfig(cfg)
+	client := cwlogs.NewFromConfig(cfg)
 
 	now := time.Now()
 	next1 := sched.Next(now)

internal/cloudwatchlogs/cloudwatchlogs.go internal/cwlogs/cwlogs.gointernal/cloudwatchlogs/cloudwatchlogs.go renamed to internal/cwlogs/cwlogs.go

@@ -1,4 +1,4 @@
-package cloudwatchlogs
+package cwlogs
 
 import (
 	"context"

internal/sample/rand_log_streams.go

@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/batovpasha/aws-cw-log-sampler/internal/cloudwatchlogs"
+	"github.com/batovpasha/aws-cw-log-sampler/internal/cwlogs"
 )
 
 // GetLogEvents has the lowest TPS - 10, and it's a bottleneck.
@@ -21,7 +21,7 @@ const concurrencyLimit = 10
 
 func SampleByRandLogStreams(
 	ctx context.Context,
-	client *cloudwatchlogs.Client,
+	client *cwlogs.Client,
 	cutoff int64,
 	srcGroups []string,
 	dstGroup string,
@@ -50,12 +50,12 @@ func SampleByRandLogStreams(
 
 func processLogGroup(
 	ctx context.Context,
-	client *cloudwatchlogs.Client,
+	client *cwlogs.Client,
 	cutoff int64,
 	srcGroup, dstGroup string,
 	randLogStreamsNumber int,
 ) (processed int64, err error) {
-	allStreams, err := cloudwatchlogs.DescribeLogStreamsUntilCutoff(ctx, client, srcGroup, cutoff)
+	allStreams, err := cwlogs.DescribeLogStreamsUntilCutoff(ctx, client, srcGroup, cutoff)
 	if err != nil {
 		return processed, fmt.Errorf("describe log streams: %w", err)
 	}
@@ -82,7 +82,7 @@ func processLogGroup(
 		)
 
 		slog.InfoContext(ctx, "copy log streams", "src_stream", srcStreamName, "dst_stream", dstStreamName)
-		err = cloudwatchlogs.CopyLogStream(
+		err = cwlogs.CopyLogStream(
 			ctx,
 			client,
 			srcGroup,

internal/sample/sample.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/batovpasha/aws-cw-log-sampler/internal/cloudwatchlogs"
+	"github.com/batovpasha/aws-cw-log-sampler/internal/cwlogs"
 )
 
 type Config struct {
@@ -22,8 +22,8 @@ const (
 	TypeRandLogStreams = "rand-log-streams"
 )
 
-func Sample(ctx context.Context, client *cloudwatchlogs.Client, cfg *Config) error {
-	srcGroups, err := cloudwatchlogs.ListLogGroupNames(ctx, client, cfg.LogGroupNamePattern)
+func Sample(ctx context.Context, client *cwlogs.Client, cfg *Config) error {
+	srcGroups, err := cwlogs.ListLogGroupNames(ctx, client, cfg.LogGroupNamePattern)
 	if err != nil {
 		return fmt.Errorf("list log groups: %w", err)
 	}