diff --git a/.gitattributes b/.gitattributes index 96d3803b..c3833cd8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,7 +7,6 @@ line.go linguist-generated seed.go linguist-generated span.go linguist-generated sub.go linguist-generated -internal/enumer_test.go linguist-generated xopat/attributes.go linguist-generated xopbase/abbr.go linguist-generated xopbase/base.go linguist-generated @@ -25,6 +24,7 @@ xoppb/replay.go linguist-generated xoprecorder/recorder.go linguist-generated xoprecorder/replay.go linguist-generated xoptrace/hexbytes.go linguist-generated +xoputil/enumer_test.go linguist-generated xopbase/xopbaseutil/metadata.go linguist-generated xopjson/xopjsonutil/attributes.go linguist-generated xoptest/xoptestutil/enums.go linguist-generated diff --git a/seed.go b/seed.go index 1d169b02..be643e84 100644 --- a/seed.go +++ b/seed.go @@ -8,10 +8,10 @@ import ( "path/filepath" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xoptrace" + "github.com/xoplog/xop-go/xoputil/xopversion" ) // Seed is used to create a Logger. Seed contains @@ -150,16 +150,16 @@ func (seed Seed) applyMods(mods []SeedModifier) Seed { mod(&seed) } if seed.sourceInfo.Source == "" { - seed.sourceInfo.Source, seed.sourceInfo.SourceVersion = version.SplitVersion(filepath.Base(os.Args[0])) + seed.sourceInfo.Source, seed.sourceInfo.SourceVersion = xopversion.SplitVersion(filepath.Base(os.Args[0])) } if seed.sourceInfo.SourceVersion == nil { - seed.sourceInfo.SourceVersion = version.ZeroVersion + seed.sourceInfo.SourceVersion = xopversion.ZeroVersion } if seed.sourceInfo.Namespace == "" { - seed.sourceInfo.Namespace, seed.sourceInfo.NamespaceVersion = version.SplitVersion(xopat.DefaultNamespace) + seed.sourceInfo.Namespace, seed.sourceInfo.NamespaceVersion = xopversion.SplitVersion(xopat.DefaultNamespace) } if seed.sourceInfo.NamespaceVersion == nil { - seed.sourceInfo.NamespaceVersion = version.ZeroVersion + seed.sourceInfo.NamespaceVersion = xopversion.ZeroVersion } return seed } @@ -269,7 +269,7 @@ func WithSettings(f func(*LogSettings)) SeedModifier { // If not specified, namespace will default to xopat.DefaultNamespace func WithNamespace(namespace string) SeedModifier { return func(s *Seed) { - s.sourceInfo.Namespace, s.sourceInfo.NamespaceVersion = version.SplitVersion(namespace) + s.sourceInfo.Namespace, s.sourceInfo.NamespaceVersion = xopversion.SplitVersion(namespace) } } @@ -281,7 +281,7 @@ func WithNamespace(namespace string) SeedModifier { // If not specified, filepath.Base(os.Argv[0]) will be used. func WithSource(source string) SeedModifier { return func(s *Seed) { - s.sourceInfo.Source, s.sourceInfo.SourceVersion = version.SplitVersion(source) + s.sourceInfo.Source, s.sourceInfo.SourceVersion = xopversion.SplitVersion(source) } } diff --git a/seed.zzzgo b/seed.zzzgo index 24b11a9b..12a2b869 100644 --- a/seed.zzzgo +++ b/seed.zzzgo @@ -6,10 +6,10 @@ import ( "path/filepath" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xoptrace" + "github.com/xoplog/xop-go/xoputil/xopversion" ) // Seed is used to create a Logger. Seed contains @@ -148,16 +148,16 @@ func (seed Seed) applyMods(mods []SeedModifier) Seed { mod(&seed) } if seed.sourceInfo.Source == "" { - seed.sourceInfo.Source, seed.sourceInfo.SourceVersion = version.SplitVersion(filepath.Base(os.Args[0])) + seed.sourceInfo.Source, seed.sourceInfo.SourceVersion = xopversion.SplitVersion(filepath.Base(os.Args[0])) } if seed.sourceInfo.SourceVersion == nil { - seed.sourceInfo.SourceVersion = version.ZeroVersion + seed.sourceInfo.SourceVersion = xopversion.ZeroVersion } if seed.sourceInfo.Namespace == "" { - seed.sourceInfo.Namespace, seed.sourceInfo.NamespaceVersion = version.SplitVersion(xopat.DefaultNamespace) + seed.sourceInfo.Namespace, seed.sourceInfo.NamespaceVersion = xopversion.SplitVersion(xopat.DefaultNamespace) } if seed.sourceInfo.NamespaceVersion == nil { - seed.sourceInfo.NamespaceVersion = version.ZeroVersion + seed.sourceInfo.NamespaceVersion = xopversion.ZeroVersion } return seed } @@ -267,7 +267,7 @@ func WithSettings(f func(*LogSettings)) SeedModifier { // If not specified, namespace will default to xopat.DefaultNamespace func WithNamespace(namespace string) SeedModifier { return func(s *Seed) { - s.sourceInfo.Namespace, s.sourceInfo.NamespaceVersion = version.SplitVersion(namespace) + s.sourceInfo.Namespace, s.sourceInfo.NamespaceVersion = xopversion.SplitVersion(namespace) } } @@ -279,7 +279,7 @@ func WithNamespace(namespace string) SeedModifier { // If not specified, filepath.Base(os.Argv[0]) will be used. func WithSource(source string) SeedModifier { return func(s *Seed) { - s.sourceInfo.Source, s.sourceInfo.SourceVersion = version.SplitVersion(source) + s.sourceInfo.Source, s.sourceInfo.SourceVersion = xopversion.SplitVersion(source) } } diff --git a/xopat/attributes.go b/xopat/attributes.go index a6cedd32..e0424ea3 100644 --- a/xopat/attributes.go +++ b/xopat/attributes.go @@ -12,10 +12,10 @@ import ( "sync/atomic" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopproto" "github.com/xoplog/xop-go/xoptrace" "github.com/xoplog/xop-go/xoputil" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/Masterminds/semver/v3" "github.com/pkg/errors" @@ -150,7 +150,7 @@ func (s Make) make(registry *Registry, exampleValue interface{}, subType Attribu ck.AddConsoleString(s.Key) ck.AppendByte('=') - namespace, sver, err := version.SplitVersionWithError(namespace) + namespace, sver, err := xopversion.SplitVersionWithError(namespace) if err != nil { return Attribute{}, err } diff --git a/xopat/attributes.zzzgo b/xopat/attributes.zzzgo index 7df52f5a..7263b19f 100644 --- a/xopat/attributes.zzzgo +++ b/xopat/attributes.zzzgo @@ -15,9 +15,9 @@ import ( "sync" "sync/atomic" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopproto" "github.com/xoplog/xop-go/xoputil" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/Masterminds/semver/v3" "github.com/pkg/errors" @@ -150,7 +150,7 @@ func (s Make) make(registry *Registry, exampleValue interface{}, subType Attribu ck.AddConsoleString(s.Key) ck.AppendByte('=') - namespace, sver, err := version.SplitVersionWithError(namespace) + namespace, sver, err := xopversion.SplitVersionWithError(namespace) if err != nil { return Attribute{}, err } diff --git a/xopconsole/replay.go b/xopconsole/replay.go index 558a9ef2..ddc2a513 100644 --- a/xopconsole/replay.go +++ b/xopconsole/replay.go @@ -12,7 +12,6 @@ import ( "strings" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopnum" @@ -20,6 +19,7 @@ import ( "github.com/xoplog/xop-go/xoptrace" "github.com/xoplog/xop-go/xoputil" "github.com/xoplog/xop-go/xoputil/replayutil" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/pkg/errors" ) @@ -564,8 +564,8 @@ func (x replayRequest) replayRequestStart(ctx context.Context, t string) error { return errors.Errorf("unexpected stuff in request start: '%s'", word) } } - ns, nsVers := version.SplitVersion(x.namespaceAndVersion) - so, soVers := version.SplitVersion(x.sourceAndVersion) + ns, nsVers := xopversion.SplitVersion(x.namespaceAndVersion) + so, soVers := xopversion.SplitVersion(x.sourceAndVersion) sourceInfo := xopbase.SourceInfo{ Source: so, SourceVersion: soVers, diff --git a/xopconsole/replay.zzzgo b/xopconsole/replay.zzzgo index 45ebc074..27f727f9 100644 --- a/xopconsole/replay.zzzgo +++ b/xopconsole/replay.zzzgo @@ -5,7 +5,6 @@ package xopconsole import ( "bufio" "context" - "fmt" "io" "regexp" "runtime" @@ -13,7 +12,6 @@ import ( "strings" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopnum" @@ -21,6 +19,7 @@ import ( "github.com/xoplog/xop-go/xoptrace" "github.com/xoplog/xop-go/xoputil" "github.com/xoplog/xop-go/xoputil/replayutil" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/pkg/errors" ) @@ -565,8 +564,8 @@ func (x replayRequest) replayRequestStart(ctx context.Context, t string) error { return errors.Errorf("unexpected stuff in request start: '%s'", word) } } - ns, nsVers := version.SplitVersion(x.namespaceAndVersion) - so, soVers := version.SplitVersion(x.sourceAndVersion) + ns, nsVers := xopversion.SplitVersion(x.namespaceAndVersion) + so, soVers := xopversion.SplitVersion(x.sourceAndVersion) sourceInfo := xopbase.SourceInfo{ Source: so, SourceVersion: soVers, diff --git a/xopjson/replay.go b/xopjson/replay.go index 9e6d8a93..15f4d149 100644 --- a/xopjson/replay.go +++ b/xopjson/replay.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopnum" @@ -20,6 +19,7 @@ import ( "github.com/xoplog/xop-go/xoptrace" "github.com/xoplog/xop-go/xoputil" "github.com/xoplog/xop-go/xoputil/replayutil" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/pkg/errors" ) @@ -260,11 +260,11 @@ func ReplayFromStrings(ctx context.Context, data string, logger xopbase.Logger) } var err error var sourceInfo xopbase.SourceInfo - sourceInfo.Source, sourceInfo.SourceVersion, err = version.SplitVersionWithError(requestInput.Source) + sourceInfo.Source, sourceInfo.SourceVersion, err = xopversion.SplitVersionWithError(requestInput.Source) if err != nil { return errors.Errorf("invalid source (%s) in request (%s)", requestInput.Source, requestInput.unparsed) } - sourceInfo.Namespace, sourceInfo.NamespaceVersion, err = version.SplitVersionWithError(requestInput.Namespace) + sourceInfo.Namespace, sourceInfo.NamespaceVersion, err = xopversion.SplitVersionWithError(requestInput.Namespace) if err != nil { return errors.Errorf("invalid namespace (%s) in request (%s)", requestInput.Namespace, requestInput.unparsed) } diff --git a/xopjson/replay.zzzgo b/xopjson/replay.zzzgo index 824131bd..23089e0c 100644 --- a/xopjson/replay.zzzgo +++ b/xopjson/replay.zzzgo @@ -11,7 +11,6 @@ import ( "strings" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopnum" @@ -20,6 +19,7 @@ import ( "github.com/xoplog/xop-go/xoptrace" "github.com/xoplog/xop-go/xoputil" "github.com/xoplog/xop-go/xoputil/replayutil" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/pkg/errors" ) @@ -260,11 +260,11 @@ func ReplayFromStrings(ctx context.Context, data string, logger xopbase.Logger) } var err error var sourceInfo xopbase.SourceInfo - sourceInfo.Source, sourceInfo.SourceVersion, err = version.SplitVersionWithError(requestInput.Source) + sourceInfo.Source, sourceInfo.SourceVersion, err = xopversion.SplitVersionWithError(requestInput.Source) if err != nil { return errors.Errorf("invalid source (%s) in request (%s)", requestInput.Source, requestInput.unparsed) } - sourceInfo.Namespace, sourceInfo.NamespaceVersion, err = version.SplitVersionWithError(requestInput.Namespace) + sourceInfo.Namespace, sourceInfo.NamespaceVersion, err = xopversion.SplitVersionWithError(requestInput.Namespace) if err != nil { return errors.Errorf("invalid namespace (%s) in request (%s)", requestInput.Namespace, requestInput.unparsed) } diff --git a/xopotel/buffered.go b/xopotel/buffered.go index 131d77f2..5c3a5067 100644 --- a/xopotel/buffered.go +++ b/xopotel/buffered.go @@ -10,12 +10,12 @@ import ( "time" "github.com/muir/gwrap" - "github.com/xoplog/xop-go/internal/util/pointer" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopbase/xopbaseutil" "github.com/xoplog/xop-go/xoprecorder" "github.com/xoplog/xop-go/xoptrace" + "github.com/xoplog/xop-go/xoputil/pointer" "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" diff --git a/xopotel/buffered.zzzgo b/xopotel/buffered.zzzgo index 73cad2ca..685e4c05 100644 --- a/xopotel/buffered.zzzgo +++ b/xopotel/buffered.zzzgo @@ -11,12 +11,12 @@ import ( "time" "github.com/muir/gwrap" - "github.com/xoplog/xop-go/internal/util/pointer" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopbase/xopbaseutil" "github.com/xoplog/xop-go/xoprecorder" "github.com/xoplog/xop-go/xoptrace" + "github.com/xoplog/xop-go/xoputil/pointer" "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" diff --git a/xopotel/export.go b/xopotel/export.go index 76f5ae80..0d39f842 100644 --- a/xopotel/export.go +++ b/xopotel/export.go @@ -14,13 +14,13 @@ import ( "sync/atomic" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopconst" "github.com/xoplog/xop-go/xopnum" "github.com/xoplog/xop-go/xopproto" "github.com/xoplog/xop-go/xoptrace" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/muir/gwrap" "github.com/muir/list" @@ -646,8 +646,8 @@ func buildSourceInfo(span sdktrace.ReadOnlySpan, attributeMap aMap) xopbase.Sour } namespace = defaulted(attributeMap.GetString(xopNamespace), source) } - si.Source, si.SourceVersion = version.SplitVersion(source) - si.Namespace, si.NamespaceVersion = version.SplitVersion(namespace) + si.Source, si.SourceVersion = xopversion.SplitVersion(source) + si.Namespace, si.NamespaceVersion = xopversion.SplitVersion(namespace) return si } diff --git a/xopotel/export.zzzgo b/xopotel/export.zzzgo index 995bef77..acf73243 100644 --- a/xopotel/export.zzzgo +++ b/xopotel/export.zzzgo @@ -16,13 +16,13 @@ import ( "sync/atomic" "time" - "github.com/xoplog/xop-go/internal/util/version" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopconst" "github.com/xoplog/xop-go/xopnum" "github.com/xoplog/xop-go/xopproto" "github.com/xoplog/xop-go/xoptrace" + "github.com/xoplog/xop-go/xoputil/xopversion" "github.com/muir/gwrap" "github.com/muir/list" @@ -646,8 +646,8 @@ func buildSourceInfo(span sdktrace.ReadOnlySpan, attributeMap aMap) xopbase.Sour } namespace = defaulted(attributeMap.GetString(xopNamespace), source) } - si.Source, si.SourceVersion = version.SplitVersion(source) - si.Namespace, si.NamespaceVersion = version.SplitVersion(namespace) + si.Source, si.SourceVersion = xopversion.SplitVersion(source) + si.Namespace, si.NamespaceVersion = xopversion.SplitVersion(namespace) return si } diff --git a/xoprecorder/recorder.go b/xoprecorder/recorder.go index 803c8d6c..9ceddf9a 100644 --- a/xoprecorder/recorder.go +++ b/xoprecorder/recorder.go @@ -15,14 +15,14 @@ import ( "sync" "time" - "github.com/xoplog/xop-go/internal/util/generic" - "github.com/xoplog/xop-go/internal/util/pointer" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopbase/xopbaseutil" "github.com/xoplog/xop-go/xopnum" "github.com/xoplog/xop-go/xoptrace" "github.com/xoplog/xop-go/xoputil" + "github.com/xoplog/xop-go/xoputil/generic" + "github.com/xoplog/xop-go/xoputil/pointer" "github.com/google/uuid" "github.com/muir/list" diff --git a/xoprecorder/recorder.zzzgo b/xoprecorder/recorder.zzzgo index 28593068..a0f3b9ac 100644 --- a/xoprecorder/recorder.zzzgo +++ b/xoprecorder/recorder.zzzgo @@ -17,14 +17,14 @@ import ( "sync" "time" - "github.com/xoplog/xop-go/internal/util/generic" - "github.com/xoplog/xop-go/internal/util/pointer" "github.com/xoplog/xop-go/xopat" "github.com/xoplog/xop-go/xopbase" "github.com/xoplog/xop-go/xopbase/xopbaseutil" "github.com/xoplog/xop-go/xopnum" "github.com/xoplog/xop-go/xoptrace" "github.com/xoplog/xop-go/xoputil" + "github.com/xoplog/xop-go/xoputil/generic" + "github.com/xoplog/xop-go/xoputil/pointer" "github.com/google/uuid" "github.com/muir/list" diff --git a/internal/util/cast/cast.go b/xoputil/cast/cast.go similarity index 100% rename from internal/util/cast/cast.go rename to xoputil/cast/cast.go diff --git a/internal/enumer_test.go b/xoputil/enumer_test.go similarity index 99% rename from internal/enumer_test.go rename to xoputil/enumer_test.go index d03982ea..a854598c 100644 --- a/internal/enumer_test.go +++ b/xoputil/enumer_test.go @@ -1,6 +1,6 @@ // This file is generated, DO NOT EDIT. It comes from the corresponding .zzzgo file -package internal_test +package xoputil_test import ( "encoding/json" diff --git a/internal/enumer_test.zzzgo b/xoputil/enumer_test.zzzgo similarity index 98% rename from internal/enumer_test.zzzgo rename to xoputil/enumer_test.zzzgo index 81419ce0..6b91cfb9 100644 --- a/internal/enumer_test.zzzgo +++ b/xoputil/enumer_test.zzzgo @@ -1,4 +1,4 @@ -package internal_test +package xoputil_test import ( "encoding/json" diff --git a/internal/util/generic/map.go b/xoputil/generic/map.go similarity index 100% rename from internal/util/generic/map.go rename to xoputil/generic/map.go diff --git a/internal/util/pointer/pointer.go b/xoputil/pointer/pointer.go similarity index 100% rename from internal/util/pointer/pointer.go rename to xoputil/pointer/pointer.go diff --git a/internal/util/version/version_split.go b/xoputil/xopversion/version_split.go similarity index 97% rename from internal/util/version/version_split.go rename to xoputil/xopversion/version_split.go index f22ed20a..59ac7ed5 100644 --- a/internal/util/version/version_split.go +++ b/xoputil/xopversion/version_split.go @@ -1,4 +1,4 @@ -package version +package xopversion import ( "regexp"