2 files changed, 7 insertions, 104 deletions

diff --git a/internal/logging/logging.go b/internal/logging/logging.go
index edc670d6..6e8533d8 100644
--- a/internal/logging/logging.go
+++ b/internal/logging/logging.go
@@ -52,34 +52,24 @@ func getAccessLogger(format string) (*logrus.Logger, error) {
 }
 
 // BasicAccessLogger configures the GitLab pages basic HTTP access logger middleware
-func BasicAccessLogger(handler http.Handler, format string, extraFields log.ExtraFieldsGeneratorFunc) (http.Handler, error) {
+func BasicAccessLogger(handler http.Handler, format string) (http.Handler, error) {
 	accessLogger, err := getAccessLogger(format)
 	if err != nil {
 		return nil, err
 	}
 
 	return log.AccessLogger(handler,
-		log.WithExtraFields(enrichExtraFields(extraFields)),
+		log.WithExtraFields(extraFields),
 		log.WithAccessLogger(accessLogger),
 		log.WithXFFAllowed(func(sip string) bool { return false }),
 	), nil
 }
 
-func enrichExtraFields(extraFields log.ExtraFieldsGeneratorFunc) log.ExtraFieldsGeneratorFunc {
-	return func(r *http.Request) log.Fields {
-		enrichedFields := log.Fields{
-			"correlation_id": correlation.ExtractFromContext(r.Context()),
-			"pages_https":    request.IsHTTPS(r),
-			"pages_host":     r.Host,
-		}
-
-		if extraFields != nil {
-			for field, value := range extraFields(r) {
-				enrichedFields[field] = value
-			}
-		}
-
-		return enrichedFields
+func extraFields(r *http.Request) log.Fields {
+	return log.Fields{
+		"correlation_id": correlation.ExtractFromContext(r.Context()),
+		"pages_https":    request.IsHTTPS(r),
+		"pages_host":     r.Host,
 	}
 }
 
diff --git a/internal/logging/logging_test.go b/internal/logging/logging_test.go
deleted file mode 100644
index d56f6777..00000000
--- a/internal/logging/logging_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package logging
-
-import (
-	"net/http"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
-	"gitlab.com/gitlab-org/gitlab-pages/internal/request"
-	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
-)
-
-type resolver struct {
-	err error
-	f   func(*http.Request) *serving.LookupPath
-}
-
-func (r *resolver) Resolve(req *http.Request) (*serving.Request, error) {
-	if r.f != nil {
-		return &serving.Request{LookupPath: r.f(req)}, nil
-	}
-
-	return nil, r.err
-}
-
-func TestGetExtraLogFields(t *testing.T) {
-	domainWithResolver := domain.New("", "", "", &resolver{f: func(*http.Request) *serving.LookupPath {
-		return &serving.LookupPath{
-			ServingType: "file",
-			ProjectID:   100,
-			Prefix:      "/prefix",
-			SHA256:      "foo",
-		}
-	}})
-
-	tests := []struct {
-		name                  string
-		scheme                string
-		host                  string
-		expectedHTTPS         interface{}
-		expectedHost          interface{}
-		expectedProjectID     interface{}
-		expectedProjectPrefix interface{}
-		expectedServingType   interface{}
-		expectedErrMsg        interface{}
-	}{
-		{
-			name:                  "https",
-			scheme:                request.SchemeHTTPS,
-			host:                  "githost.io",
-			expectedHTTPS:         true,
-			expectedHost:          "githost.io",
-			expectedProjectID:     uint64(100),
-			expectedProjectPrefix: "/prefix",
-			expectedServingType:   "file",
-		},
-		{
-			name:                  "http",
-			scheme:                request.SchemeHTTP,
-			host:                  "githost.io",
-			expectedHTTPS:         false,
-			expectedHost:          "githost.io",
-			expectedProjectID:     uint64(100),
-			expectedProjectPrefix: "/prefix",
-			expectedServingType:   "file",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req, err := http.NewRequest("GET", "/", nil)
-			require.NoError(t, err)
-
-			req.URL.Scheme = tt.scheme
-			req = domain.ReqWithHostAndDomain(req, tt.host, domainWithResolver)
-
-			got := domain.LogFields(req)
-			require.Equal(t, tt.expectedHTTPS, got["pages_https"])
-			require.Equal(t, tt.expectedHost, got["pages_host"])
-			require.Equal(t, tt.expectedProjectID, got["pages_project_id"])
-			require.Equal(t, tt.expectedProjectPrefix, got["pages_project_prefix"])
-			require.Equal(t, tt.expectedServingType, got["pages_project_serving_type"])
-			require.Equal(t, tt.expectedErrMsg, got["error"])
-		})
-	}
-}