feat(confighttp): add max_redirects configuration option

.chloggen/add_max_redirects_confighttp.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: 'enhancement'
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: confighttp
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add the max_redirects configuration option
+
+# One or more tracking issues or pull requests related to the change
+issues: [10870]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

config/confighttp/confighttp.go

@@ -31,8 +31,11 @@ import (
 	"go.opentelemetry.io/collector/extension/auth"
 )
 
-const headerContentEncoding = "Content-Encoding"
-const defaultMaxRequestBodySize = 20 * 1024 * 1024 // 20MiB
+const (
+	headerContentEncoding     = "Content-Encoding"
+	defaultMaxRequestBodySize = 20 * 1024 * 1024 // 20MiB
+)
+
 var defaultCompressionAlgorithms = []string{"", "gzip", "zstd", "zlib", "snappy", "deflate"}
 
 // ClientConfig defines settings for creating an HTTP client.
@@ -102,6 +105,9 @@ type ClientConfig struct {
 	HTTP2PingTimeout time.Duration `mapstructure:"http2_ping_timeout"`
 	// Cookies configures the cookie management of the HTTP client.
 	Cookies *CookiesConfig `mapstructure:"cookies"`
+
+	// Maximum number of redirections to follow, if not defined, the Client uses its default policy, which is to stop after 10 consecutive requests.
+	MaxRedirects *int `mapstructure:"max_redirects"`
 }
 
 // CookiesConfig defines the configuration of the HTTP client regarding cookies served by the server.
@@ -238,12 +244,31 @@ func (hcs *ClientConfig) ToClient(ctx context.Context, host component.Host, sett
 	}
 
 	return &http.Client{
-		Transport: clientTransport,
-		Timeout:   hcs.Timeout,
-		Jar:       jar,
+		CheckRedirect: makeCheckRedirect(hcs.MaxRedirects),
+		Transport:     clientTransport,
+		Timeout:       hcs.Timeout,
+		Jar:           jar,
 	}, nil
 }
 
+// makeCheckRedirect checks if max redirects are exceeded
+func makeCheckRedirect(max *int) func(*http.Request, []*http.Request) error {
+	if max == nil {
+		return nil
+	} else if *max == 0 {
+		return func(_ *http.Request, _ []*http.Request) error {
+			return http.ErrUseLastResponse
+		}
+	}
+
+	return func(_ *http.Request, via []*http.Request) error {
+		if *max == len(via) {
+			return http.ErrUseLastResponse
+		}
+		return nil
+	}
+}
+
 // Custom RoundTripper that adds headers.
 type headerRoundTripper struct {
 	transport http.RoundTripper

config/confighttp/confighttp_test.go

@@ -37,8 +37,7 @@ import (
 	"go.opentelemetry.io/collector/internal/localhostgate"
 )
 
-type customRoundTripper struct {
-}
+type customRoundTripper struct{}
 
 var _ http.RoundTripper = (*customRoundTripper)(nil)
 
@@ -219,7 +218,6 @@ func TestPartialHTTPClientSettings(t *testing.T) {
 			assert.EqualValues(t, 0, transport.MaxConnsPerHost)
 			assert.EqualValues(t, 90*time.Second, transport.IdleConnTimeout)
 			assert.EqualValues(t, false, transport.DisableKeepAlives)
-
 		})
 	}
 }
@@ -335,6 +333,96 @@ func TestHTTPClientSettingsError(t *testing.T) {
 	}
 }
 
+func TestMaxRedirects(t *testing.T) {
+	toIntPtr := func(i int) *int {
+		return &i
+	}
+	tests := []struct {
+		name             string
+		settings         ClientConfig
+		expectedRequests int
+		expectedErrStr   string
+	}{
+		{
+			name:             "No redirects config",
+			settings:         ClientConfig{},
+			expectedRequests: 10,
+			// default client returns an error, custom implementations should return a ErrUseLastResponse which the internal http package will skip it to let the users select the previous response without closing the body.
+			expectedErrStr: "stopped after 10 redirects",
+		},
+		{
+			name:             "Zero redirects",
+			settings:         ClientConfig{MaxRedirects: toIntPtr(0)},
+			expectedRequests: 1,
+		},
+		{
+			name:             "Defined max redirects",
+			settings:         ClientConfig{MaxRedirects: toIntPtr(5)},
+			expectedRequests: 5,
+		},
+	}
+
+	host := &mockHost{
+		ext: map[component.ID]component.Component{},
+	}
+
+	countRequests := func(resp *http.Response) int {
+		counter := 0
+		for resp != nil {
+			resp = resp.Request.Response
+			counter++
+		}
+		return counter
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			client, err := test.settings.ToClient(context.Background(), host, componenttest.NewNopTelemetrySettings())
+			require.NoError(t, err)
+
+			hss := &ServerConfig{
+				Endpoint: "localhost:0",
+			}
+
+			ln, err := hss.ToListener(context.Background())
+			require.NoError(t, err)
+
+			url := fmt.Sprintf("http://%s", ln.Addr().String())
+
+			// always return a redirection to itself
+			s, err := hss.ToServer(
+				context.Background(),
+				componenttest.NewNopHost(),
+				componenttest.NewNopTelemetrySettings(),
+				http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+					http.Redirect(w, r, url, http.StatusMovedPermanently)
+				}))
+			require.NoError(t, err)
+
+			go func() {
+				_ = s.Serve(ln)
+			}()
+
+			req, err := http.NewRequest(http.MethodOptions, url, nil)
+			require.NoError(t, err)
+			resp, err := client.Do(req)
+
+			if test.expectedErrStr != "" {
+				assert.ErrorContains(t, err, test.expectedErrStr)
+			} else {
+				assert.NoError(t, err)
+			}
+			assert.Equal(t, http.StatusMovedPermanently, resp.StatusCode)
+
+			defer resp.Body.Close()
+
+			require.Equal(t, test.expectedRequests, countRequests(resp))
+
+			require.NoError(t, s.Close())
+		})
+	}
+}
+
 func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 	tests := []struct {
 		name      string
@@ -430,7 +518,8 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			host: &mockHost{
 				ext: map[component.ID]component.Component{
 					mockID: &authtest.MockClient{
-						ResultRoundTripper: &customRoundTripper{}, MustError: true},
+						ResultRoundTripper: &customRoundTripper{}, MustError: true,
+					},
 				},
 			},
 		},
@@ -560,7 +649,6 @@ func TestHTTPServerWarning(t *testing.T) {
 			require.Len(t, observed.FilterLevelExact(zap.WarnLevel).All(), test.len)
 		})
 	}
-
 }
 
 func TestHttpReception(t *testing.T) {
@@ -1307,7 +1395,6 @@ func TestServerWithDecoder(t *testing.T) {
 	srv.Handler.ServeHTTP(response, req)
 	// verify
 	assert.Equal(t, response.Result().StatusCode, http.StatusOK)
-
 }
 
 func TestServerWithDecompression(t *testing.T) {