fix(v0.150): reconcile main's incoming code post-rebase

- cloudwatchlogs deadlock (#2190) part-2 adapted to aws-sdk-go-v2 (sharedRetryer/sharedClient) + v1->v2 tests
- windowseventlog translator: component id windowseventlog -> windows_event_log (v0.150 factory type)
- regenerate main's new/updated OTel-section goldens for v0.150 (default_otel_config*, files_config, host_metrics azure/aks, prometheus pipelines)

Author: sky333999

go.sum

@@ -244,7 +244,6 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotel
 github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20260728215743-95055c0f9cfd/go.mod h1:zk6PvQyUDsjyvgI0ugtzvfgvSmHRsiq4NsU/Nf43mdY=
 github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20260728215743-95055c0f9cfd h1:Q0TzFlLgphKVvKRtUXih3Uzu5rpDq/fVHUiZBdd1ynE=
 github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20260728215743-95055c0f9cfd/go.mod h1:8oXRIBSggiKdi+WFeBwbil2VybfOGNnrcxxS4kxuvuw=
-github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20260607233959-ee44579b1ae3/go.mod h1:Pw6sp3wj1SH3LVvAn4Lwld9j6RDyw/5SxPii8aK8nu4=
 github.com/amazon-contributing/opentelemetry-collector-contrib/processor/attributestocontextprocessor v0.0.0-20260728215743-95055c0f9cfd h1:zF3lNp9NV6pU6iM0srEB20FYCBinyXxx5xE4iU4pYyo=
 github.com/amazon-contributing/opentelemetry-collector-contrib/processor/attributestocontextprocessor v0.0.0-20260728215743-95055c0f9cfd/go.mod h1:E+PmgeASy3qNX1QRqcPDypclu8EIGqd7QY9EjPkVFKo=
 github.com/amazon-contributing/opentelemetry-collector-contrib/processor/awsattributelimitprocessor v0.0.0-20260728215743-95055c0f9cfd h1:iCGAxLhjH9URw7+YUX+sJtU0+X9SlfyP4XMt4KHxMsk=

internal/retryer/logthrottle_test.go

@@ -130,17 +130,14 @@ func TestShouldRetryDoesNotBlockAfterStop(t *testing.T) {
 	r.Stop()
 	time.Sleep(50 * time.Millisecond) // Give the goroutine time to exit
 
-	req := &request.Request{
-		Error:     awserr.New("RequestLimitExceeded", "Test AWS Error", nil),
-		Operation: &request.Operation{Name: "Test"},
-	}
+	err := &smithy.GenericAPIError{Code: "RequestLimitExceeded", Message: "Test AWS Error"}
 
-	// Call ShouldRetry in a goroutine and use a timeout to detect blocking
+	// Call IsErrorRetryable in a goroutine and use a timeout to detect blocking
 	done := make(chan bool, 1)
 	go func() {
-		// Call ShouldRetry multiple times to exceed channel capacity (1)
+		// Call IsErrorRetryable multiple times to exceed channel capacity (1)
 		for i := 0; i < 10; i++ {
-			r.ShouldRetry(req)
+			r.IsErrorRetryable(err)
 		}
 		done <- true
 	}()

plugins/outputs/cloudwatchlogs/cloudwatchlogs.go

@@ -79,7 +79,7 @@ type CloudWatchLogs struct {
 	// Dedicated retryer/client for the TargetManager, owned by the plugin so its
 	// lifecycle is independent of any destination stop.
 	sharedRetryer *retryer.LogThrottleRetryer
-	sharedClient  *cloudwatchlogs.CloudWatchLogs
+	sharedClient  *cloudwatchlogs.Client
 }
 
 var _ logs.LogBackend = (*CloudWatchLogs)(nil)
@@ -172,8 +172,13 @@ func (c *CloudWatchLogs) getDest(t pusher.Target, logSrc logs.LogSrc) *cwDest {
 		}
 		// Dedicated retryer/client so the TargetManager isn't tied to the first dest.
 		c.sharedRetryer = retryer.NewLogThrottleRetryer(c.Log)
-		c.sharedClient = c.createClient(c.sharedRetryer)
-		c.targetManager = pusher.NewTargetManager(c.Log, c.sharedClient)
+		sharedClient, cerr := c.createClient(context.Background(), c.sharedRetryer, nil)
+		if cerr != nil {
+			c.Log.Errorf("Failed to create shared CloudWatch Logs client for target manager, falling back to per-destination client: %v", cerr)
+			sharedClient = client
+		}
+		c.sharedClient = sharedClient
+		c.targetManager = pusher.NewTargetManager(c.Log, sharedClient)
 	})
 	cwd.pusher = pusher.NewPusher(c.Log, t, client, c.targetManager, logSrc, c.workerPool, c.ForceFlushInterval.Duration, maxRetryTimeout, &c.pusherWaitGroup)
 	c.cwDests.Store(t, cwd)

plugins/outputs/cloudwatchlogs/internal/pusher/queue_test.go

@@ -844,7 +844,7 @@ func TestForceFlushTimerRearmsAfterHeldSend(t *testing.T) {
 	releaseSend := func() { releaseOnce.Do(func() { close(release) }) }
 
 	var s stubLogsService
-	s.ple = func(_ *cloudwatchlogs.PutLogEventsInput) (*cloudwatchlogs.PutLogEventsOutput, error) {
+	s.ple = func(_ context.Context, _ *cloudwatchlogs.PutLogEventsInput) (*cloudwatchlogs.PutLogEventsOutput, error) {
 		switch sendCount.Load() {
 		case 0:
 			sendCount.Add(1)
@@ -896,7 +896,7 @@ func TestForceFlushTimer_SingleLowVolumeEventFlushes(t *testing.T) {
 
 	var sendCount atomic.Int32
 	var s stubLogsService
-	s.ple = func(_ *cloudwatchlogs.PutLogEventsInput) (*cloudwatchlogs.PutLogEventsOutput, error) {
+	s.ple = func(_ context.Context, _ *cloudwatchlogs.PutLogEventsInput) (*cloudwatchlogs.PutLogEventsOutput, error) {
 		sendCount.Add(1)
 		return &cloudwatchlogs.PutLogEventsOutput{}, nil
 	}

plugins/outputs/cloudwatchlogs/internal/pusher/target_deadlock_test.go

@@ -10,44 +10,41 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 
 	"github.com/aws/amazon-cloudwatch-agent/internal/retryer"
-	"github.com/aws/amazon-cloudwatch-agent/sdk/service/cloudwatchlogs"
 	"github.com/aws/amazon-cloudwatch-agent/tool/testutil"
 )
 
 // newThrottlingClient returns a real CloudWatch Logs client whose endpoint points
 // at a local server that always responds with a ThrottlingException, wired with a
 // LogThrottleRetryer. The returned retryer is also handed back so the test can stop
 // its consumer goroutine to reproduce the dead-consumer condition.
-func newThrottlingClient(t *testing.T) (*cloudwatchlogs.CloudWatchLogs, *retryer.LogThrottleRetryer, func()) {
+func newThrottlingClient(t *testing.T) (*cloudwatchlogs.Client, *retryer.LogThrottleRetryer, func()) {
 	t.Helper()
 
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		// JSON 1.1 protocol: the SDK classifies the error from the error type,
 		// which it reads from this header / body. ThrottlingException is a
-		// throttling error, so the SDK will invoke ShouldRetry and retry.
+		// throttling error, so the SDK will invoke IsErrorRetryable and retry.
 		w.Header().Set("X-Amzn-Errortype", "ThrottlingException")
 		w.Header().Set("Content-Type", "application/x-amz-json-1.1")
 		w.WriteHeader(http.StatusBadRequest)
 		_, _ = w.Write([]byte(`{"__type":"ThrottlingException","message":"Rate exceeded"}`))
 	}))
 
+	// The embedded retry.Standard bounds attempts (default 3, i.e. >1) so a dead
+	// consumer fills the capacity-1 throttle channel and (pre-fix) the next send blocks.
 	r := retryer.NewLogThrottleRetryer(testutil.NewNopLogger())
-	// Bound the retry count: fast, but >1 so a dead consumer fills the capacity-1
-	// throttle channel and (pre-fix) the next send blocks.
-	r.NumMaxRetries = 2
 
-	sess := session.Must(session.NewSession())
-	client := cloudwatchlogs.New(sess, &aws.Config{
-		Region:      aws.String("us-east-1"),
-		Endpoint:    aws.String(srv.URL),
-		DisableSSL:  aws.Bool(true),
-		Credentials: credentials.NewStaticCredentials("ak", "sk", ""),
-		Retryer:     r,
+	client := cloudwatchlogs.NewFromConfig(aws.Config{
+		Region:      "us-east-1",
+		Credentials: credentials.NewStaticCredentialsProvider("ak", "sk", ""),
+	}, func(o *cloudwatchlogs.Options) {
+		o.BaseEndpoint = aws.String(srv.URL)
+		o.Retryer = r
 	})
 
 	return client, r, srv.Close