worked on PR comments

Author: Akshay2191

api/grpc/mpi/v1/command.pb.go

@@ -820,9 +820,13 @@ func Test_setProxyWithBasicAuth(t *testing.T) {
 	httpProxy := os.Getenv("HTTPS_PROXY")
 	assert.Equal(t, proxyURL, httpProxy)
 
+	logBuf := &bytes.Buffer{}
+	stub.StubLoggerWith(logBuf)
 	// Test missing username/password
 	proxyMissing := &config.Proxy{URL: "http://localhost:8080"}
-	setProxyWithBasicAuth(ctx, proxyMissing, u) // Should not panic
+	setProxyWithBasicAuth(ctx, proxyMissing, u)
+	helpers.ValidateLog(t, "Unable to configure OTLP exporter proxy, "+
+		"username or password missing for basic auth", logBuf)
 }
 
 //nolint:contextcheck // Can not update the "OTelConfig" function definition

api/grpc/mpi/v1/common.pb.go

@@ -33,7 +33,6 @@ const (
 	DefCommandTLSCaKey                    = ""
 	DefCommandTLSSkipVerifyKey            = false
 	DefCommandTLServerNameKey             = ""
-	DefCommandServerProxyTimeoutKey       = 0
 	DefCommandServerProxyURlKey           = ""
 	DefCommandServerProxyNoProxyKey       = ""
 	DefCommandServerProxyAuthMethodKey    = ""
@@ -45,6 +44,7 @@ const (
 	DefCommandServerProxyTLSCaKey         = ""
 	DefCommandServerProxyTLSSkipVerifyKey = false
 	DefCommandServerProxyTLServerNameKey  = ""
+	DefCommandServerProxyTimeoutKey       = 10 * time.Second
 
 	DefAuxiliaryCommandServerHostKey    = ""
 	DefAuxiliaryCommandServerPortKey    = 0

api/grpc/mpi/v1/files.pb.go

@@ -340,16 +340,15 @@ type (
 		MonitoringFrequency time.Duration `yaml:"monitoring_frequency" mapstructure:"monitoring_frequency"`
 	}
 
-	//nolint:govet // Tried different sequences but not able to fix the lint issue.
 	Proxy struct {
 		TLS        *TLSConfig    `yaml:"tls,omitempty"         mapstructure:"tls"`
-		Timeout    time.Duration `yaml:"timeout"               mapstructure:"timeout"`
 		URL        string        `yaml:"url"                   mapstructure:"url"`
 		NoProxy    string        `yaml:"no_proxy,omitempty"    mapstructure:"no_proxy"`
 		AuthMethod string        `yaml:"auth_method,omitempty" mapstructure:"auth_method"`
 		Username   string        `yaml:"username,omitempty"    mapstructure:"username"`
 		Password   string        `yaml:"password,omitempty"    mapstructure:"password"`
 		Token      string        `yaml:"token,omitempty"       mapstructure:"token"`
+		Timeout    time.Duration `yaml:"timeout"               mapstructure:"timeout"`
 	}
 )
 

internal/collector/otel_collector_plugin_test.go

@@ -72,7 +72,7 @@ func buildProxyTLSConfig(proxyConf *config.Proxy) (*tls.Config, error) {
 	return tlsConf, nil
 }
 
-//nolint:lll //This needs to be in a single line.
+//nolint:lll //This needs to be in a single line else getting gofumpt or compiler error.
 func dialToProxyTLS(ctx context.Context, proxyURL *url.URL, tlsConf *tls.Config, timeout time.Duration) (net.Conn, error) {
 	dialer := &net.Dialer{Timeout: timeout}
 	tlsDialer := &tls.Dialer{

internal/config/defaults.go

@@ -65,17 +65,15 @@ func TestDialViaHTTPProxy_RealProxy(t *testing.T) {
 		t.Errorf("failed to write to tunnel: %v", err)
 	}
 	buf := make([]byte, 128)
-	if deadlineErr := conn.SetReadDeadline(time.Now().Add(2 * time.Second)); deadlineErr != nil {
-		// Optionally log
-		t.Logf("Failed to set read deadline: %v", deadlineErr)
-	}
+	require.NoError(t, conn.SetReadDeadline(time.Now().Add(2*time.Second)), "failed to set read deadline")
+
 	_, err = conn.Read(buf)
-	if err != nil && err != context.DeadlineExceeded && !isTimeout(err) {
+	if err != nil && err != context.DeadlineExceeded && !os.IsTimeout(err) {
 		t.Errorf("failed to read from tunnel: %v", err)
 	}
 }
 
-//nolint:noctx //No need for ctx in test cases.
+//nolint:noctx,revive //No need for ctx in test cases.
 func TestDialViaHTTPProxy_BearerTokenHeader(t *testing.T) {
 	ln, err := net.Listen("tcp", "127.0.0.1:0")
 	require.NoError(t, err, "failed to listen")
@@ -91,8 +89,21 @@ func TestDialViaHTTPProxy_BearerTokenHeader(t *testing.T) {
 		defer conn.Close()
 		reader := bufio.NewReader(conn)
 		headerLines := readHeaders(reader)
-		if hasBearerHeader(headerLines, "testtoken") {
-			close(done)
+
+		if !hasBearerHeader(headerLines, "testtoken") {
+			_, writeErr := conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\n" +
+				"Proxy-Authenticate: Bearer realm=\"nginx-agent\"\r\n\r\n"))
+			if writeErr != nil {
+				t.Errorf("Warning: mock proxy failed to write 407 response: %v", writeErr)
+			}
+			t.Errorf("Proxy-Authorization Bearer header with token 'testtoken' was not found in received request")
+
+			return
+		}
+
+		_, writeErr := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
+		if writeErr != nil {
+			t.Errorf("mock proxy failed to write 200 OK response: %v", writeErr)
 			return
 		}
 		close(done)
@@ -106,21 +117,23 @@ func TestDialViaHTTPProxy_BearerTokenHeader(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
-	_, _ = DialViaHTTPProxy(ctx, proxyConf, "example.com:443")
+	_, err = DialViaHTTPProxy(ctx, proxyConf, "example.com:443")
+
+	if err != nil && err != context.DeadlineExceeded && !os.IsTimeout(err) {
+		require.NoError(t, err, "DialViaHTTPProxy returned an unexpected non-timeout error")
+	}
 
 	select {
 	case <-done:
 		// success
 	case <-time.After(1 * time.Second):
-		t.Errorf("Proxy-Authorization Bearer header was not sent")
+		if err == context.DeadlineExceeded {
+			t.Fatalf("Test timed out (DialViaHTTPProxy context deadline exceeded): %v", err)
+		}
+		t.Fatalf("Test timed out: Proxy-Authorization Bearer header was not sent or verified within %v", err)
 	}
 }
 
-func isTimeout(err error) bool {
-	nerr, ok := err.(net.Error)
-	return ok && nerr.Timeout()
-}
-
 func readHeaders(reader *bufio.Reader) []string {
 	var headerLines []string
 	for {
@@ -166,7 +179,6 @@ func TestDialViaHTTPProxy_MissingCertKey(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
 	_, err := DialViaHTTPProxy(ctx, proxyConf, "example.com:443")
-	// No assert needed: just covers the branch
 	require.Error(t, err, "expected error for missing cert")
 }