diff --git a/benchmarks/go.mod b/benchmarks/go.mod index a658079e..2e5a1358 100644 --- a/benchmarks/go.mod +++ b/benchmarks/go.mod @@ -7,9 +7,9 @@ require ( github.com/klauspost/compress v1.18.0 github.com/open-telemetry/otel-arrow v0.31.0 github.com/parquet-go/parquet-go v0.23.0 - github.com/splunk/stef/go/otel v0.0.7 + github.com/splunk/stef/go/otel v0.0.8 github.com/splunk/stef/go/pdata v0.0.0 - github.com/splunk/stef/go/pkg v0.0.7 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/pdata v1.19.0 golang.org/x/text v0.29.0 diff --git a/examples/jsonl/go.mod b/examples/jsonl/go.mod index f6c32fd4..d15097f8 100644 --- a/examples/jsonl/go.mod +++ b/examples/jsonl/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/golang/protobuf v1.5.0 github.com/klauspost/compress v1.18.0 - github.com/splunk/stef/go/pkg v0.0.7 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.9.0 google.golang.org/protobuf v1.36.9 ) diff --git a/examples/profile/go.mod b/examples/profile/go.mod index 69344d32..817538c6 100644 --- a/examples/profile/go.mod +++ b/examples/profile/go.mod @@ -6,7 +6,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 github.com/klauspost/compress v1.17.8 - github.com/splunk/stef/go/pkg v0.0.6 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.10.0 modernc.org/b/v2 v2.1.4 ) diff --git a/go/grpc/go.mod b/go/grpc/go.mod index b9281721..6ccb6fee 100644 --- a/go/grpc/go.mod +++ b/go/grpc/go.mod @@ -5,7 +5,7 @@ go 1.22.7 toolchain go1.23.2 require ( - github.com/splunk/stef/go/pkg v0.0.7 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.10.0 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.2 diff --git a/go/otel/go.mod b/go/otel/go.mod index 36f86c97..be26c5dd 100644 --- a/go/otel/go.mod +++ b/go/otel/go.mod @@ -5,8 +5,8 @@ go 1.22.7 toolchain go1.23.2 require ( - github.com/splunk/stef/go/grpc v0.0.7 - github.com/splunk/stef/go/pkg v0.0.7 + github.com/splunk/stef/go/grpc v0.0.8 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.10.0 google.golang.org/grpc v1.68.0 ) diff --git a/go/pdata/go.mod b/go/pdata/go.mod index 555d210e..02cacaa3 100644 --- a/go/pdata/go.mod +++ b/go/pdata/go.mod @@ -6,8 +6,8 @@ toolchain go1.23.2 require ( github.com/google/go-cmp v0.6.0 - github.com/splunk/stef/go/otel v0.0.7 - github.com/splunk/stef/go/pkg v0.0.7 + github.com/splunk/stef/go/otel v0.0.8 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/pdata v1.16.0 modernc.org/b/v2 v2.1.0 diff --git a/makefile b/makefile index 1cb3e494..42be82ca 100644 --- a/makefile +++ b/makefile @@ -45,25 +45,27 @@ ifndef VERSION @exit 1 endif +RELEASE_MODULES := go/pkg go/grpc go/otel go/pdata +ALL_MODULES += $(RELEASE_MODULES) stefc stefc/generator/testdata examples/jsonl examples/profile otelcol benchmarks + .PHONY: prepver prepver: verifyver echo Updating to version ${VERSION} - cd go/grpc && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} && go mod tidy + cd go/grpc && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} cd go/otel && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} \ - && go mod edit -require=github.com/splunk/stef/go/grpc@${VERSION} && go mod tidy + && go mod edit -require=github.com/splunk/stef/go/grpc@${VERSION} cd go/pdata && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} \ - && go mod edit -require=github.com/splunk/stef/go/otel@${VERSION} && go mod tidy - cd stefc && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} && go mod tidy - cd examples/jsonl && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} && go mod tidy - cd otelcol && go mod tidy - cd benchmarks && go mod tidy - -MODULES := go/pkg go/grpc go/otel go/pdata + && go mod edit -require=github.com/splunk/stef/go/otel@${VERSION} + cd stefc && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} + cd stefc/generator/testdata && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} + cd examples/jsonl && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} + cd examples/profile && go mod edit -require=github.com/splunk/stef/go/pkg@${VERSION} + $(foreach gomod,$(ALL_MODULES),$(call exec-command,cd $(gomod) && go mod tidy)) .PHONY: releasever releasever: verifyver echo Tagging version $(VERSION) - $(foreach gomod,$(MODULES),$(call exec-command,git tag $(gomod)/$(VERSION) && git push origin $(gomod)/$(VERSION))) + $(foreach gomod,$(RELEASE_MODULES),$(call exec-command,git tag $(gomod)/$(VERSION) && git push origin $(gomod)/$(VERSION))) # Docs validation targets .PHONY: docs-validate docs-validate-html docs-validate-css docs-check-links docs-install-deps diff --git a/otelcol/go.mod b/otelcol/go.mod index 59796c22..aed2b7e8 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 require ( github.com/spf13/pflag v1.0.5 // indirect - github.com/splunk/stef/go/grpc v0.0.7 + github.com/splunk/stef/go/grpc v0.0.8 github.com/splunk/stef/go/pdata v0.0.0 go.opentelemetry.io/collector v0.120.0 // indirect go.opentelemetry.io/collector/confmap v1.26.0 @@ -26,8 +26,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.120.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.120.0 github.com/open-telemetry/otel-arrow v0.24.0 - github.com/splunk/stef/go/otel v0.0.7 - github.com/splunk/stef/go/pkg v0.0.7 + github.com/splunk/stef/go/otel v0.0.8 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v0.120.0 go.opentelemetry.io/collector/component/componentstatus v0.120.0 diff --git a/stefc/generator/generator_test.go b/stefc/generator/generator_test.go index cb82e85e..db675862 100644 --- a/stefc/generator/generator_test.go +++ b/stefc/generator/generator_test.go @@ -49,6 +49,7 @@ func TestGenerate(t *testing.T) { // Run tests in the generated code cmd := exec.Command("go", "test", "-v", genGo.OutputDir+"/...") + cmd.Dir = genGo.OutputDir stdoutStderr, err := cmd.CombinedOutput() if err != nil { fmt.Printf("%s\n", stdoutStderr) diff --git a/stefc/generator/testdata/go.mod b/stefc/generator/testdata/go.mod new file mode 100644 index 00000000..7901372f --- /dev/null +++ b/stefc/generator/testdata/go.mod @@ -0,0 +1,18 @@ +module github.com/splunk/stef/stefc/generator/testdata + +go 1.24 + +require ( + github.com/splunk/stef/go/pkg v0.0.8 + github.com/stretchr/testify v1.9.0 + modernc.org/b/v2 v2.1.9 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/klauspost/compress v1.17.8 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace github.com/splunk/stef/go/pkg => ../../../go/pkg diff --git a/stefc/generator/testdata/go.sum b/stefc/generator/testdata/go.sum new file mode 100644 index 00000000..dbf42673 --- /dev/null +++ b/stefc/generator/testdata/go.sum @@ -0,0 +1,22 @@ +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/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +modernc.org/b/v2 v2.1.9 h1:nG4cUEF0XUHxCR6NXFoV1iwL1Yp5/icUtQOrbNLGhpo= +modernc.org/b/v2 v2.1.9/go.mod h1:Xyvaj/0l3N2tUButg4o32FUWXhhQ9tCePmQwQYVJLXQ= +modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= +modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= +modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= +modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0= diff --git a/stefc/go.mod b/stefc/go.mod index a8f69041..ad71fe52 100644 --- a/stefc/go.mod +++ b/stefc/go.mod @@ -3,16 +3,14 @@ module github.com/splunk/stef/stefc go 1.22.7 require ( - github.com/splunk/stef/go/pkg v0.0.7 + github.com/splunk/stef/go/pkg v0.0.8 github.com/stretchr/testify v1.9.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/klauspost/compress v1.17.8 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - modernc.org/b/v2 v2.1.8 // indirect ) replace github.com/splunk/stef/go/pkg => ../go/pkg diff --git a/stefc/go.sum b/stefc/go.sum index 38579e20..809a6797 100644 --- a/stefc/go.sum +++ b/stefc/go.sum @@ -12,5 +12,3 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -modernc.org/b/v2 v2.1.8 h1:z8srI8Lm9cP3QtGBexjhJb7OU4cSuYDh83iA8q995Ds= -modernc.org/b/v2 v2.1.8/go.mod h1:Xyvaj/0l3N2tUButg4o32FUWXhhQ9tCePmQwQYVJLXQ=