step1 splitup

.gitattributes

@@ -2,30 +2,30 @@
 doc.go linguist-documentation
 *.md linguist-documentation
 *.pb.go linguist-generated
-basegroup.go linguist-generated
-line.go linguist-generated
-seed.go linguist-generated
-span.go linguist-generated
-sub.go linguist-generated
-xopat/attributes.go linguist-generated
-xopbase/abbr.go linguist-generated
-xopbase/base.go linguist-generated
-xopbase/skip.go linguist-generated
-xopcon/console.go linguist-generated
-xopconsole/attributes.go linguist-generated
-xopconsole/replay.go linguist-generated
-xopjson/jsonlogger.go linguist-generated
-xopjson/replay.go linguist-generated
-xopotel/buffered.go linguist-generated
-xopotel/export.go linguist-generated
-xopotel/otel.go linguist-generated
-xoppb/pb.go linguist-generated
-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
-xoptest/xoptestutil/verify_replay.go linguist-generated
+../xop-go/basegroup.go linguist-generated
+../xop-go/line.go linguist-generated
+../xop-go/seed.go linguist-generated
+../xop-go/span.go linguist-generated
+../xop-go/sub.go linguist-generated
+../xopotel-go/buffered.go linguist-generated
+../xopotel-go/export.go linguist-generated
+../xopotel-go/otel.go linguist-generated
+../xop-go/xopat/attributes.go linguist-generated
+../xop-go/xopbase/abbr.go linguist-generated
+../xop-go/xopbase/base.go linguist-generated
+../xop-go/xopbase/skip.go linguist-generated
+../xop-go/xopcon/console.go linguist-generated
+../xop-go/xopconsole/attributes.go linguist-generated
+../xop-go/xopconsole/replay.go linguist-generated
+../xop-go/xopjson/jsonlogger.go linguist-generated
+../xop-go/xopjson/replay.go linguist-generated
+../xop-go/xoppb/pb.go linguist-generated
+../xop-go/xoppb/replay.go linguist-generated
+../xop-go/xoprecorder/recorder.go linguist-generated
+../xop-go/xoprecorder/replay.go linguist-generated
+../xop-go/xoptrace/hexbytes.go linguist-generated
+../xop-go/xoputil/enumer_test.go linguist-generated
+../xop-go/xopbase/xopbaseutil/metadata.go linguist-generated
+../xop-go/xopjson/xopjsonutil/attributes.go linguist-generated
+../xop-go/xoptest/xoptestutil/enums.go linguist-generated
+../xop-go/xoptest/xoptestutil/verify_replay.go linguist-generated

.github/workflows/go.yml

@@ -14,5 +14,7 @@ jobs:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
       uses: actions/checkout@v2
+    - name: Checkout peers
+      run: make ci_checkout_peers
     - name: Test
       run: make citest

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021, 2022 David Sharnoff
+Copyright (c) 2021-2024 David Sharnoff
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -3,15 +3,22 @@ GOHOME ?= ${HOME}
 GOPATH ?= ${GOHOME}
 GOBIN ?= ${GOPATH}/bin
 
-ZZZGO = $(wildcard *.zzzgo */*.zzzgo */*/*.zzzgo)
+ZZZGO = $(wildcard ../xop*-go/*.zzzgo ../xop*-go/*/*.zzzgo ../xop*-go/*/*/*.zzzgo)
 ZZZGENERATED = $(patsubst %.zzzgo, %.go, $(ZZZGO))
 PB = xopproto/ingest.pb.go xopproto/ingest_grpc.pb.go
 TOOLS = ${GOBIN}/gofumpt ${GOBIN}/goimports ${GOBIN}/enumer
-TEST_ONLY =?
+TEST_ONLY ?= 
+
+RELATED = xopresty-go xopotel-go
 
 all:	$(ZZZGENERATED) $(PB) .gitattributes
 	go generate ./...
 	go build ./...
+	for i in $(RELATED); do (echo $$i ...; cd ../$$i && go generate ./... && go build ./...); done
+
+
+ci_checkout_peers:;
+	env branch="$${GITHUB_REF##*/}"; for i in $(RELATED); do (cd ..; git clone https://github.com/xoplog/$$i -d 1 -b $branch || git clone https://github.com/xoplog/$$i -d 1); done
 
 .gitattributes: $(ZZZGENERATED)
 	echo '*.zzzgo linguist-language=Go' > $@
@@ -25,7 +32,9 @@ test:	$(ZZZGENERATED) testadjuster
 	go test -v ./xopjson/... -run TestASingleLine
 	go test -v ./xopjson/... -tags xoptesting -run TestParameters -failfast $(TEST_ONLY)
 	go test -tags xoptesting ./... -failfast $(TEST_ONLY)
+	for i in $(RELATED); do (echo $$i...; cd ../$$i && go test -tags xoptesting ./... $(TEST_ONLY) ); done
 	go test -tags xoptesting -race ./... -failfast $(TEST_ONLY)
+	for i in $(RELATED); do (echo $$i...; cd ../$$i && go test -tags xoptesting -race ./... $(TEST_ONLY) ); done
 
 
 testadjuster: $(ZZZGenerated)

go.mod

@@ -8,24 +8,17 @@ require (
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/muir/gwrap v0.1.0
 	github.com/muir/list v1.1.1
-	github.com/muir/reflectutils v0.7.0
-	github.com/muir/resty v0.0.1
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.2
-	go.opentelemetry.io/otel v1.14.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0
-	go.opentelemetry.io/otel/sdk v1.14.0
-	go.opentelemetry.io/otel/trace v1.14.0
 	golang.org/x/text v0.3.6
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect
 	golang.org/x/sys v0.5.0 // indirect

go.sum

@@ -9,13 +9,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
-github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -35,6 +28,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
@@ -43,10 +37,6 @@ github.com/muir/gwrap v0.1.0 h1:o63/q6YgVge1MPwjvH9EJva1EdvOXWKc2mRdNXyo9Zo=
 github.com/muir/gwrap v0.1.0/go.mod h1:lPm430bQmQkudhpdC8txcEwZgl3azfQAN3Ppg2kmUws=
 github.com/muir/list v1.1.1 h1:y8wD4u9Jmphcr2480Xndo1N3wVZmrwTnO5NK1eKDStU=
 github.com/muir/list v1.1.1/go.mod h1:w2K+uRWCjFPlKuQGkl3vusHkUo3GU5xiJXErhvCiU60=
-github.com/muir/reflectutils v0.7.0 h1:7ez7OLYTThDQ5kpEpxtOgFvJgtE4E11D6PVTVw+Lwl0=
-github.com/muir/reflectutils v0.7.0/go.mod h1:l8W7iTj6zMdmsWcPfsdnaAYLEuipJ7baVROqpfuonIc=
-github.com/muir/resty v0.0.1 h1:dSWIF/uLX01/AzniDi+XukP9Q6g5QO10DPVJsZ+49n0=
-github.com/muir/resty v0.0.1/go.mod h1:Vjk1Uhi1m4/Och2tNJ2nxuGJnoaI8L0U4a27TbzKMR4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -55,19 +45,10 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
-go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 h1:sEL90JjOO/4yhquXl5zTAkLLsZ5+MycAgX99SDsxGc8=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0/go.mod h1:oCslUcizYdpKYyS9e8srZEqM6BB8fq41VJBjLAE6z1w=
-go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
-go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
-go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
-go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -85,11 +66,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=