fix: removed SetContext, modified to RequestLoggingWithFunc (for WebHook)

Author: 54m

middleware.go

@@ -57,43 +57,17 @@ func RequestLoggingWithEcho(config *Config) echo.MiddlewareFunc {
 	}
 }
 
-// SetContext for CloudFunctions
-func SetContext(config *Config, w http.ResponseWriter, r *http.Request) (http.ResponseWriter, *http.Request) {
-	before := time.Now()
-
-	traceId := getTraceId(r)
-	if traceId == "" {
-		// there is no span yet, so create one
-		var ctx context.Context
-		traceId, ctx = generateTraceId(r)
-		r = r.WithContext(ctx)
-	}
-
-	traces := fmt.Sprintf("projects/%s/traces/%s", config.ProjectId, traceId)
-
-	contextLogger := &ContextLogger{
-		out:            config.ContextLogOut,
-		Trace:          traces,
-		Severity:       config.Severity,
-		AdditionalData: config.AdditionalData,
-		loggedSeverity: make([]Severity, 0, 10),
-		Skip:           config.Skip,
-	}
-	ctx := context.WithValue(r.Context(), contextLoggerKey, contextLogger)
-	r = r.WithContext(ctx)
+// RequestLoggingWithFunc for WebHook
+func RequestLoggingWithFunc(config *Config, w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
+	reserve := NewReserve(config, r)
 
 	wrw := &wrappedResponseWriter{ResponseWriter: w}
 	defer func() {
 		// logging
-		elapsed := time.Since(before)
-		maxSeverity := contextLogger.maxSeverity()
-		err := writeRequestLog(r, config, wrw.status, wrw.responseSize, elapsed, traces, maxSeverity)
-		if err != nil {
-			_, _ = fmt.Fprintln(os.Stderr, err.Error())
-		}
+		reserve.LastHandling(wrw)
 	}()
 
-	return wrw, r
+	next.ServeHTTP(w, reserve.request)
 }
 
 type Reserve struct {