Use a new regression test log from varnish post 7.3

varnishd now uses 64bit vxids and a new VSL format, with some tags removed. I did ponder to write a VSL log converter or come up with some other deliverate way to somehow preserve the old log data in a regerssion log in the new format. But ultimately, it all seemed pretty much wasted effort. Let's just start with a new log and regression test future changes. I must admit that I only hat a bit of a superficial look at the log files, but as we made no changes at all to varnishevent, I do not see how they could have changed fundamentally. varnish-post-7.3.README.rst cotains information on how the log was created.

Use a new regression test log from varnish post 7.3
varnishd now uses 64bit vxids and a new VSL format, with some tags removed. I did ponder to write a VSL log converter or come up with some other deliverate way to somehow preserve the old log data in a regerssion log in the new format. But ultimately, it all seemed pretty much wasted effort. Let's just start with a new log and regression test future changes. I must admit that I only hat a bit of a superficial look at the log files, but as we made no changes at all to varnishevent, I do not see how they could have changed fundamentally. varnish-post-7.3.README.rst cotains information on how the log was created.
23b1d54d · Nils Goroll · 332aff65 · 23b1d54d · 23b1d54d · 332aff65
Unverified Commit 23b1d54d authored Jun 09, 2023 by Nils Goroll
8 changed files
--- a/src/test/ncsa.sh
+++ b/src/test/ncsa.sh
@@ -34,7 +34,7 @@ fi

 EVENT_LOG=$TMP/event.log
 NCSA_LOG=$TMP/ncsa.log
-INPUT=varnish-4.1.0-doc.log
+INPUT=varnish-post-7.3.vsl

 echo "... default format"
 $EVENT -r $INPUT | sed 's/-//g' > $EVENT_LOG

--- a/src/test/regress.sh
+++ b/src/test/regress.sh
@@ -13,10 +13,10 @@ OUT=output.log

 rm -f $LOG $OUT

-../varnishevent -f varnishevent.conf -r varnish-4.1.0-doc.log -w $OUT -v
+../varnishevent -f varnishevent.conf -r varnish-post-7.3.vsl -w $OUT -v

 CKSUM=$( cksum $OUT )
-if [ "$CKSUM" != "4160992159 443944 $OUT" ]; then
+if [ "$CKSUM" != "759017242 658582 $OUT" ]; then
    echo "ERROR: Regression test log output incorrect cksum: $CKSUM"
    exit 1
 fi
@@ -27,7 +27,7 @@ fi
 # predictable from one run to the next.
 CKSUM=$( sed -e 's/\(initializing\) \(.*\)/\1/' $LOG | egrep -v 'Writer: returned|Reader: took|^DEBUG: Allocating' | cksum )

-if [ "$CKSUM" != '1109151867 836995' ]; then
+if [ "$CKSUM" != '1540502566 1261931' ]; then
    echo "ERROR: Regression test varnishevent log incorrect cksum: $CKSUM"
    exit 1
 fi

--- a/src/test/varnish-4.1.0-doc.log
+++ b/src/test/varnish-4.1.0-doc.log
--- a/src/test/varnish-post-7.3.README.rst
+++ b/src/test/varnish-post-7.3.README.rst
+This log file was created as follows:
+
+* built varnish-cache documentation::
+
+	cd $VARNISHSRC
+	make html
+
+* copied the resulting html to the docroot of a debian vanilla nginx::
+
+	cp -r doc/sphinx/build/html/* /var/www/html
+
+* started varnishd with the nginx as a backend::
+
+	/tmp/sbin/varnishd -b 127.0.0.1:80 -a 127.0.0.1:8080 -n /tmp/v
+
+* crawled the entire content with wget
+
+	mkdir /tmp/scratch
+	cd /tmp/scratch
+	wget -r -l 99 http://localhost:8080
+
+* dumped the entire VSM:
+
+	/tmp/bin/varnishlog  -n /tmp/v -d -g raw -w varnish-post-7.3.vsl
+
+Version used:
+
+$ /tmp/sbin/varnishd -V
+varnishd (varnish-trunk revision a84b3c9416890a3f32e25ce4f6d6c87e40b10c79)
--- a/src/test/varnish-post-7.3.vsl
+++ b/src/test/varnish-post-7.3.vsl
--- a/src/test/varnishevent.conf
+++ b/src/test/varnishevent.conf
@@ -25,13 +25,13 @@ bformat+=%{X-Forwarded-For}i %{X-Varnish}i %{Accept-Ranges}o %{Connection}o
 bformat+=%{Content-Encoding}o %{Content-Length}o %{Content-Type}o %{Date}o
 bformat+=%{ETag}o %{Last-Modified}o %{Server}o %{Transfer-Encoding}o %{Vary}o
 bformat+=%l %m %O %q %r %s %t %{%F-%T}t %U %u %{Varnish:time_firstbyte}x
-bformat+=%{tag:Backend}x %{tag:BackendOpen}x %{tag:BackendClose}x
-bformat+=%{tag:BackendReuse}x %{tag:Begin}x %{tag:BereqAcct}x %{tag:Length}x
+bformat+=%{tag:BackendOpen}x %{tag:BackendClose}x
+bformat+=%{tag:Begin}x %{tag:BereqAcct}x %{tag:Length}x
 bformat+=%{tag:BerespProtocol}x %{tag:BerespReason}x %{tag:BerespStatus}x
 bformat+=%{tag:BereqProtocol}x %{tag:BereqMethod}x %{tag:BereqURL}x
 bformat+=%{tag:Debug}x %{tag:End}x %{tag:Timestamp:Bereq}x %{tag:BereqAcct[5]}x
-bformat+=%{tag:Timestamp:Bereq[2]}x %{VSL:Backend}x %{VSL:BackendOpen}x
-bformat+=%{VSL:BackendClose}x %{VSL:BackendReuse}x %{VSL:Begin}x
+bformat+=%{tag:Timestamp:Bereq[2]}x %{VSL:BackendOpen}x
+bformat+=%{VSL:BackendClose}x %{VSL:Begin}x
 bformat+=%{VSL:BereqAcct}x %{VSL:Length}x %{VSL:BerespProtocol}x
 bformat+=%{VSL:BerespReason}x %{VSL:BerespStatus}x %{VSL:BereqProtocol}x
 bformat+=%{VSL:BereqMethod}x %{VSL:BereqURL}x %{VSL:Debug}x %{VSL:End}x

--- a/src/test/vslarg.cksum
+++ b/src/test/vslarg.cksum
-805680033 830 vslarg.sh.trc.dash-C
-3453409010 443982 vslarg.sh.trc.no
-805680033 830 vslarg.sh.trc.query
-3267477005 21053 vslarg.sh.trc.raw
-16969574 444977 vslarg.sh.trc.request
-3453409010 443982 vslarg.sh.trc.vxid
+830793803 1890 vslarg.sh.trc.dash-C
+84438628 658620 vslarg.sh.trc.no
+830793803 1890 vslarg.sh.trc.query
+341992910 24339 vslarg.sh.trc.raw
+3861372615 659333 vslarg.sh.trc.request
+84438628 658620 vslarg.sh.trc.vxid
--- a/src/test/vslarg.sh
+++ b/src/test/vslarg.sh
@@ -4,7 +4,7 @@ echo
 echo "TEST: $0"
 echo "... testing standard VSL args"

-IN=varnish-4.1.0-doc.log
+IN=varnish-post-7.3.vsl
 CONF=varnishevent.conf
 LOG=/dev/null
 TRC=$(basename $0).trc