mini 3.0.0

cmd/replayer/main.go

@@ -1,14 +1,12 @@
 package main
 
 import (
-	_ "github.com/v2pro/koala/gateway/gw4libc"
 	"github.com/v2pro/koala/envarg"
-	"github.com/v2pro/plz/witch"
+	_ "github.com/v2pro/koala/gateway/gw4libc"
 )
 
 func init() {
 	envarg.SetupLogging()
-	witch.Start(":8318")
 }
 
 func main() {

envarg/envarg.go

@@ -25,30 +25,24 @@ var gcGlobalStatusTimeout = 5 * time.Second
 func init() {
 	initInboundAddr()
 	initOutboundAddr()
-	initOutboundBypassPort()
 	initSutAddr()
-	logFile = GetenvFromC("KOALA_LOG_FILE")
-	if logFile == "" {
-		logFile = "STDOUT"
-	}
-	initLogLevel()
-	logFormat = GetenvFromC("KOALA_LOG_FORMAT")
-	if logFormat == "" {
-		logFormat = "HumanReadableFormat"
-	}
+	initOutboundBypassPort()
 	initGcGlobalStatusTimeout()
+	initLog()
+
 	countlog.Trace("event!koala.envarg_init",
-		"logLevel", logLevel,
-		"logFile", logFile,
-		"logFormat", logFormat,
+		"logLevel", logLevel, "logFile", logFile, "logFormat", logFormat,
 		"inboundReadTimeout", inboundReadTimeout,
 		"outboundBypassPort", outboundBypassPort,
-		"isReplaying", IsReplaying(),
-		"isRecording", IsRecording(),
-		"isTracing", IsTracing())
+		"isReplaying", IsReplaying(), "isRecording", IsRecording(), "isTracing", IsTracing())
 }
 
-func initLogLevel() {
+func initLog() {
+	logFile = GetenvFromC("KOALA_LOG_FILE")
+	if logFile == "" {
+		logFile = "STDOUT"
+	}
+
 	logLevelStr := strings.ToUpper(GetenvFromC("KOALA_LOG_LEVEL"))
 	switch logLevelStr {
 	case "TRACE":
@@ -64,6 +58,11 @@ func initLogLevel() {
 	case "FATAL":
 		logLevel = countlog.LevelFatal
 	}
+
+	logFormat = GetenvFromC("KOALA_LOG_FORMAT")
+	if logFormat == "" {
+		logFormat = "HumanReadableFormat"
+	}
 }
 
 func initInboundAddr() {

gateway/gw4libc/version.c

@@ -1 +1 @@
-char* library_version = { "KOALA-VERSION: 2.4.4" };
+char* library_version = { "KOALA-VERSION: 3.0.0" };

sut/thread.go

@@ -3,17 +3,17 @@ package sut
 import (
 	"bytes"
 	"context"
-	"github.com/v2pro/koala/envarg"
-	"github.com/v2pro/koala/recording"
-	"github.com/v2pro/koala/replaying"
-	"github.com/v2pro/koala/trace"
-	"github.com/v2pro/plz/countlog"
 	"net"
 	"os"
 	"strings"
 	"sync"
 	"time"
 	"unsafe"
+
+	"github.com/v2pro/koala/envarg"
+	"github.com/v2pro/koala/recording"
+	"github.com/v2pro/koala/replaying"
+	"github.com/v2pro/plz/countlog"
 )
 
 // InboundRequestPrefix is used to recognize php-fpm FCGI_BEGIN_REQUEST packet.
@@ -318,20 +318,11 @@ func (thread *Thread) OnOpeningFile(fileName string, flags int) string {
 		return ""
 	}
 	originalFileName := fileName
-	shouldTrace := thread.replayingSession.ShouldTraceFile(fileName)
 	fileName = thread.tryMockFile(fileName)
-	if shouldTrace {
-		fileName = thread.instrumentFile(fileName)
-	}
 	fileName = thread.tryRedirectFile(fileName)
-	shouldTrace = thread.replayingSession.ShouldTraceFile(fileName)
 	fileName = thread.tryMockFile(fileName)
-	if shouldTrace {
-		fileName = thread.instrumentFile(fileName)
-	}
 	countlog.Trace("event!sut.opening_file",
 		"threadID", thread.threadID,
-		"shouldTrace", shouldTrace,
 		"originalFile", originalFileName,
 		"finalFile", fileName)
 	return fileName
@@ -350,14 +341,6 @@ func (thread *Thread) tryRedirectFile(fileName string) string {
 	return fileName
 }
 
-func (thread *Thread) instrumentFile(fileName string) string {
-	instrumentedFileName := trace.InstrumentFile(fileName)
-	if instrumentedFileName != "" {
-		return instrumentedFileName
-	}
-	return fileName
-}
-
 func (thread *Thread) tryMockFile(fileName string) string {
 	if thread.replayingSession.MockFiles != nil {
 		mockContent := thread.replayingSession.MockFiles[fileName]