Revert "[TT-2539] added access/transaction logs"

.gitignore

@@ -50,7 +50,6 @@ session_state_gen_test.go
 __pycache__/
 tyk.test
 tyk-gateway.pid
-*.go-e
 
 tyk_linux_*
 /dist/

cli/linter/schema.json

@@ -648,15 +648,6 @@
       "type": "string",
       "enum": ["", "standard", "json"]
     },
-    "access_logs": {
-      "type": ["object", "null"],
-      "additionalProperties": false,
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        }
-      }
-    },
     "enable_http_profiler": {
       "type": "boolean"
     },

config/config.go

@@ -246,12 +246,6 @@ type AnalyticsConfigConfig struct {
 	SerializerType string `json:"serializer_type"`
 }
 
-// AccessLogsConfig defines the type of transactions logs printed to stdout
-type AccessLogsConfig struct {
-	// Enable the transaction logs. Default: false
-	Enabled bool `json:"enabled"`
-}
-
 type HealthCheckConfig struct {
 	// Setting this value to `true` will enable the health-check endpoint on /Tyk/health.
 	EnableHealthChecks bool `json:"enable_health_checks"`
@@ -1009,10 +1003,6 @@ type Config struct {
 	// If not set or left empty, it will default to `standard`.
 	LogFormat string `json:"log_format"`
 
-	// You can configure the transaction logs to be turned on
-	// If not set or left empty, it will default to 'false'
-	AccessLogs AccessLogsConfig `json:"access_logs"`
-
 	// Section for configuring OpenTracing support
 	// Deprecated: use OpenTelemetry instead.
 	Tracer Tracer `json:"tracing"`

gateway/handler_error.go

@@ -311,13 +311,6 @@ func (e *ErrorHandler) HandleError(w http.ResponseWriter, r *http.Request, errMs
 			log.WithError(err).Error("could not store analytic record")
 		}
 	}
-
-	// Print the transaction logs for error situations if enabled. Success transaction
-	// logs will be handled by the "handler_success.go"
-	if e.Spec.GlobalConfig.AccessLogs.Enabled {
-		e.recordAccessLog(r, response, nil)
-	}
-
 	// Report in health check
 	reportHealthValue(e.Spec, BlockedRequestLog, "-1")
 }

gateway/handler_error_test.go

@@ -9,8 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/TykTechnologies/tyk/config"
-
 	"github.com/TykTechnologies/tyk/header"
 	"github.com/TykTechnologies/tyk/test"
 )
@@ -124,52 +122,3 @@ func TestHandleDefaultErrorJSON(t *testing.T) {
 	})
 
 }
-
-func BenchmarkErrorLogTransaction(b *testing.B) {
-	b.Run("AccessLogs enabled with Hashkeys set to true", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = true
-			globalConf.AccessLogs.Enabled = true
-		}
-		benchmarkErrorLogTransaction(b, conf)
-
-	})
-	b.Run("AccessLogs enabled with Hashkeys set to false", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = false
-			globalConf.AccessLogs.Enabled = true
-		}
-		benchmarkErrorLogTransaction(b, conf)
-	})
-
-	b.Run("AccessLogs disabled with Hashkeys set to true", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = true
-			globalConf.AccessLogs.Enabled = false
-		}
-		benchmarkErrorLogTransaction(b, conf)
-	})
-
-	b.Run("AccessLogs disabled with Hashkeys set to false", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = false
-			globalConf.AccessLogs.Enabled = false
-		}
-		benchmarkErrorLogTransaction(b, conf)
-	})
-}
-
-func benchmarkErrorLogTransaction(b *testing.B, conf func(globalConf *config.Config)) {
-	b.ReportAllocs()
-	b.Helper()
-	b.ResetTimer()
-
-	ts := StartTest(conf)
-	defer ts.Close()
-
-	for i := 0; i < b.N; i++ {
-		ts.Run(b, test.TestCase{
-			Code: http.StatusNotFound,
-		})
-	}
-}

gateway/handler_success.go

@@ -10,8 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/TykTechnologies/tyk/apidef"
 	graphqlinternal "github.com/TykTechnologies/tyk/internal/graphql"
+
+	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/internal/httputil"
 
 	"github.com/TykTechnologies/tyk-pump/analytics"
@@ -381,15 +382,8 @@ func (s *SuccessHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) *http
 			Upstream: int64(DurationToMillisecond(resp.UpstreamLatency)),
 		}
 		s.RecordHit(r, latency, resp.Response.StatusCode, resp.Response, false)
-
-		// Don't print a transaction log there is no "resp", that indicates an error.
-		// In error situations, transaction log is already printed by "handler_error.go"
-		if s.Spec.GlobalConfig.AccessLogs.Enabled {
-			s.recordAccessLog(r, resp.Response, &latency)
-		}
 	}
 	log.Debug("Done proxy")
-
 	return nil
 }
 

gateway/handler_success_test.go

@@ -326,58 +326,3 @@ func TestAnalyticsIgnoreSubgraph(t *testing.T) {
 	)
 	assert.NoError(t, err)
 }
-
-func BenchmarkSuccessLogTransaction(b *testing.B) {
-	b.Run("AccessLogs enabled with Hashkeys set to true", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = true
-			globalConf.AccessLogs.Enabled = true
-		}
-		benchmarkSuccessLogTransaction(b, conf)
-
-	})
-	b.Run("AccessLogs enabled with Hashkeys set to false", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = false
-			globalConf.AccessLogs.Enabled = true
-		}
-		benchmarkSuccessLogTransaction(b, conf)
-	})
-	b.Run("AccessLogs disabled with Hashkeys set to true", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = true
-			globalConf.AccessLogs.Enabled = false
-		}
-		benchmarkSuccessLogTransaction(b, conf)
-	})
-	b.Run("AccessLogs disabled with Hashkeys set to false", func(b *testing.B) {
-		conf := func(globalConf *config.Config) {
-			globalConf.HashKeys = false
-			globalConf.AccessLogs.Enabled = false
-		}
-		benchmarkSuccessLogTransaction(b, conf)
-	})
-}
-
-func benchmarkSuccessLogTransaction(b *testing.B, conf func(globalConf *config.Config)) {
-	b.ReportAllocs()
-	b.Helper()
-	b.ResetTimer()
-
-	ts := StartTest(conf)
-	defer ts.Close()
-
-	API := BuildAPI(func(spec *APISpec) {
-		spec.Name = "test-api"
-		spec.APIID = "test-api-id"
-		spec.Proxy.ListenPath = "/"
-	})[0]
-
-	ts.Gw.LoadAPI(API)
-
-	for i := 0; i < b.N; i++ {
-		ts.Run(b, test.TestCase{
-			Code: http.StatusOK,
-		})
-	}
-}

gateway/middleware.go

@@ -12,11 +12,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/TykTechnologies/tyk-pump/analytics"
-
 	"github.com/TykTechnologies/tyk/internal/cache"
 	"github.com/TykTechnologies/tyk/internal/event"
-	"github.com/TykTechnologies/tyk/internal/httputil/accesslog"
 	"github.com/TykTechnologies/tyk/internal/otel"
 	"github.com/TykTechnologies/tyk/internal/policy"
 	"github.com/TykTechnologies/tyk/rpc"
@@ -361,19 +358,6 @@ func (t *BaseMiddleware) ApplyPolicies(session *user.SessionState) error {
 	return store.Apply(session)
 }
 
-// recordAccessLog is only used for Success/Error handler
-func (t *BaseMiddleware) recordAccessLog(req *http.Request, resp *http.Response, latency *analytics.Latency) {
-	hashKeys := t.Gw.GetConfig().HashKeys
-
-	accessLog := accesslog.NewRecord(t.Spec.APIID, t.Spec.OrgID)
-	accessLog.WithAuthToken(req, hashKeys, t.Gw.obfuscateKey)
-	accessLog.WithLatency(latency)
-	accessLog.WithRequest(req)
-	accessLog.WithResponse(resp)
-
-	t.Logger().WithFields(accessLog.Fields()).Info()
-}
-
 func copyAllowedURLs(input []user.AccessSpec) []user.AccessSpec {
 	if input == nil {
 		return nil

internal/httputil/Taskfile.yml

@@ -3,14 +3,13 @@ version: "3"
 
 vars:
   testArgs: -v
-  coverpkg: ./...,github.com/TykTechnologies/tyk/internal/httputil/...
 
 tasks:
   test:
     desc: "Run tests (requires redis)"
     cmds:
       - task: fmt
-      - go test {{.testArgs}} -count=1 -cover -coverprofile=rate.cov {{.coverpkg}} ./...
+      - go test {{.testArgs}} -count=1 -cover -coverprofile=rate.cov -coverpkg=./... ./...
 
   bench:
     desc: "Run benchmarks"