Apply suggestions from code review

Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
DataDog · Jun 9, 2022 · adc7b28 · adc7b28
1 parent 7c475c0
commit adc7b28
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/contrib/internal/httptrace/httptrace.go b/contrib/internal/httptrace/httptrace.go
@@ -95,21 +95,17 @@ func getClientIP(remoteAddr string, headers http.Header, clientIPHeader string)
 		ipHeaders = []string{clientIPHeader}
 	}
 	check := func(value string) netaddr.IP {
-		for _, ip := range strings.Split(value, ",") {
-			ipStr := strings.Trim(ip, " ")
-			ip := parseIP(ipStr)
-
+		for _, ipstr := range strings.Split(value, ",") {
+			ip := parseIP(strings.TrimSpace(ipstr))
 			if !ip.IsValid() {
 				continue
 			}
-
 			if isGlobal(ip) {
 				return ip
 			}
 		}
 		return netaddr.IP{}
 	}
-
 	for _, hdr := range ipHeaders {
 		if value := headers.Get(hdr); value != "" {
 			if ip := check(value); ip.IsValid() {

diff --git a/contrib/internal/httptrace/options_test.go b/contrib/internal/httptrace/options_test.go
@@ -13,13 +13,18 @@ import (
 )
 
 func TestConfig(t *testing.T) {
-	t.Run("config", func(t *testing.T) {
-		t.Run("client-ip-header-unset", func(t *testing.T) {
+	t.Run("client-ip", func(t *testing.T) {
+		t.Run("unset", func(t *testing.T) {
+			restore := cleanEnv()
+			err := os.Unsetenv(clientIPHeaderEnvVar)
+			require.NoError(t, err)
 			cfg := newConfig()
 			require.Empty(t, cfg.ipHeader)
+			defer restore()
 
 		})
-		t.Run("client-ip-header-empty", func(t *testing.T) {
+
+		t.Run("empty", func(t *testing.T) {
 			restore := cleanEnv()
 			err := os.Setenv(clientIPHeaderEnvVar, "")
 			require.NoError(t, err)
@@ -28,7 +33,8 @@ func TestConfig(t *testing.T) {
 			defer restore()
 
 		})
-		t.Run("client-ip-header-set", func(t *testing.T) {
+
+		t.Run("set", func(t *testing.T) {
 			restore := cleanEnv()
 			err := os.Setenv(clientIPHeaderEnvVar, "custom-header")
 			require.NoError(t, err)