Merge branch 'main' into release-v1.39.0

Author: MrAlias

exporters/otlp/otlplog/otlploggrpc/internal/retry/retry.go

@@ -879,7 +879,8 @@ func TestClientInstrumentation(t *testing.T) {
 
 	client, coll, addr := factory(rCh)
 	t.Cleanup(func() {
-		assert.NoError(t, coll.Shutdown(t.Context()))
+		ctx := context.Background() //nolint:usetesting // required to avoid getting a canceled context at cleanup.
+		assert.NoError(t, coll.Shutdown(ctx))
 	})
 	assert.ErrorIs(t, client.UploadLogs(t.Context(), resourceLogs), internal.PartialSuccess{})
 

exporters/otlp/otlplog/otlploghttp/client_test.go

@@ -94,6 +94,11 @@ func (c Config) RequestFunc(evaluate EvaluateFunc) RequestFunc {
 				return err
 			}
 
+			// Check if context is canceled before attempting to wait and retry.
+			if ctx.Err() != nil {
+				return fmt.Errorf("%w: %w", ctx.Err(), err)
+			}
+
 			if maxElapsedTime != 0 && time.Since(startTime) > maxElapsedTime {
 				return fmt.Errorf("max retry time elapsed: %w", err)
 			}