Incorrect caller when logs originate from modules with a major version suffix

[deitrix]

When using the logger in a Go module with a major version suffix, the package name is omitted, leaving only the version. In this case v2@v2.0.3. I would expect this to be go-pkg/v2@v2.0.3.
go.mod:

module github.com/me/go-pkg/v2

go 1.19

require go.uber.org/zap v1.24.0

log.go:

package pkg

import (
	"go.uber.org/zap"
)

func LogSomething() {
	logger, _ := zap.NewProduction(zap.AddCaller())
	logger.Info("logging from library")
}

Using the above library in another Go project:

package main

import "github.com/me/go-pkg/v2"

func main() {
	pkg.LogSomething()
}

Results in the following log:

{"level":"info","ts":1669917064.3370209,"caller":"v2@v2.0.3/pkg.go:9","msg":"logging from library"}

[prashantv]

This is caused by the logic in TrimmedPath which drops all but the final directory name. v2 is just another path of the package.

To solve this, we'd need a bit of a hack -- if we see v<N>@v<N>. at the beginning of the last directory path, we assume it's a version and use the previous / to get the directory instead.