From 35cc04d255704464b68672dea44c2cd7064325fc Mon Sep 17 00:00:00 2001 From: Ravi Atluri Date: Sat, 3 May 2025 12:19:12 +0530 Subject: [PATCH 1/3] Remove CI command from pre_release.sh before committing changes --- pre_release.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pre_release.sh b/pre_release.sh index 2d89e4e..6480b4a 100755 --- a/pre_release.sh +++ b/pre_release.sh @@ -89,12 +89,11 @@ if [ -n "${XTOOLS_TAG}" ]; then patch_gomods github.com/gojekfarm/xtools "${XTOOLS_TAG}" fi -# Run lint to update go.sum -make lint +# Run gomod.tidy to update go.sum +make gomod.tidy # Add changes and commit. git add . -make ci declare COMMIT_MSG="" COMMIT_MSG+="Releasing ${XTOOLS_TAG}" From 92705bfc82ba14651d07acc4bc92e9b1648c1e9d Mon Sep 17 00:00:00 2001 From: Ravi Atluri Date: Sat, 3 May 2025 12:20:31 +0530 Subject: [PATCH 2/3] Releasing v0.10.0 --- examples/xkafka/go.mod | 4 ++-- examples/xload/go.mod | 4 ++-- version.go | 2 +- xkafka/middleware/go.mod | 2 +- xkafka/middleware/retry/go.mod | 2 +- xkafka/middleware/zerolog/go.mod | 2 +- xload/providers/cached/go.mod | 2 +- xload/providers/viper/go.mod | 2 +- xload/providers/yaml/go.mod | 2 +- xpod/go.mod | 2 +- xprom/xpromkafka/go.mod | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/xkafka/go.mod b/examples/xkafka/go.mod index 3709ee8..10fce94 100644 --- a/examples/xkafka/go.mod +++ b/examples/xkafka/go.mod @@ -11,8 +11,8 @@ replace ( require ( github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 github.com/gojekfarm/xrun v0.3.0 - github.com/gojekfarm/xtools/xkafka v0.9.0 - github.com/gojekfarm/xtools/xkafka/middleware/zerolog v0.0.0-00010101000000-000000000000 + github.com/gojekfarm/xtools/xkafka v0.10.0 + github.com/gojekfarm/xtools/xkafka/middleware/zerolog v0.10.0 github.com/rs/xid v1.5.0 github.com/rs/zerolog v1.29.0 github.com/urfave/cli/v2 v2.23.7 diff --git a/examples/xload/go.mod b/examples/xload/go.mod index e5e4d3b..4c10fe8 100644 --- a/examples/xload/go.mod +++ b/examples/xload/go.mod @@ -8,8 +8,8 @@ replace ( ) require ( - github.com/gojekfarm/xtools/xload v0.9.0 - github.com/gojekfarm/xtools/xload/providers/yaml v0.9.0 + github.com/gojekfarm/xtools/xload v0.10.0 + github.com/gojekfarm/xtools/xload/providers/yaml v0.10.0 ) require ( diff --git a/version.go b/version.go index c069857..38ec013 100644 --- a/version.go +++ b/version.go @@ -2,6 +2,6 @@ package xtools // Version can be used to get the current xtools library version func Version() string { - return "0.9.0" + return "0.10.0" // This string is updated by the pre_release.sh script during release } diff --git a/xkafka/middleware/go.mod b/xkafka/middleware/go.mod index 3b40452..709707e 100644 --- a/xkafka/middleware/go.mod +++ b/xkafka/middleware/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.0 replace github.com/gojekfarm/xtools/xkafka => ../ require ( - github.com/gojekfarm/xtools/xkafka v0.9.0 + github.com/gojekfarm/xtools/xkafka v0.10.0 github.com/stretchr/testify v1.8.1 ) diff --git a/xkafka/middleware/retry/go.mod b/xkafka/middleware/retry/go.mod index 0176dcf..a3d712d 100644 --- a/xkafka/middleware/retry/go.mod +++ b/xkafka/middleware/retry/go.mod @@ -6,7 +6,7 @@ replace github.com/gojekfarm/xtools/xkafka => ../../ require ( github.com/cenkalti/backoff/v4 v4.3.0 - github.com/gojekfarm/xtools/xkafka v0.9.0 + github.com/gojekfarm/xtools/xkafka v0.10.0 github.com/stretchr/testify v1.8.1 ) diff --git a/xkafka/middleware/zerolog/go.mod b/xkafka/middleware/zerolog/go.mod index e0aa8aa..aea74d3 100644 --- a/xkafka/middleware/zerolog/go.mod +++ b/xkafka/middleware/zerolog/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.0 replace github.com/gojekfarm/xtools/xkafka => ../../ require ( - github.com/gojekfarm/xtools/xkafka v0.9.0 + github.com/gojekfarm/xtools/xkafka v0.10.0 github.com/rs/zerolog v1.29.0 github.com/stretchr/testify v1.8.1 ) diff --git a/xload/providers/cached/go.mod b/xload/providers/cached/go.mod index 7bfa2d8..eece662 100644 --- a/xload/providers/cached/go.mod +++ b/xload/providers/cached/go.mod @@ -5,7 +5,7 @@ go 1.20 replace github.com/gojekfarm/xtools/xload => ../.. require ( - github.com/gojekfarm/xtools/xload v0.9.0 + github.com/gojekfarm/xtools/xload v0.10.0 github.com/stretchr/testify v1.8.4 ) diff --git a/xload/providers/viper/go.mod b/xload/providers/viper/go.mod index 7334872..b28c16a 100644 --- a/xload/providers/viper/go.mod +++ b/xload/providers/viper/go.mod @@ -5,7 +5,7 @@ go 1.21.3 replace github.com/gojekfarm/xtools/xload => ../.. require ( - github.com/gojekfarm/xtools/xload v0.9.0 + github.com/gojekfarm/xtools/xload v0.10.0 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 ) diff --git a/xload/providers/yaml/go.mod b/xload/providers/yaml/go.mod index a650af3..07c451d 100644 --- a/xload/providers/yaml/go.mod +++ b/xload/providers/yaml/go.mod @@ -5,7 +5,7 @@ go 1.20 replace github.com/gojekfarm/xtools/xload => ../.. require ( - github.com/gojekfarm/xtools/xload v0.9.0 + github.com/gojekfarm/xtools/xload v0.10.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/xpod/go.mod b/xpod/go.mod index 21dc2c6..f66f954 100644 --- a/xpod/go.mod +++ b/xpod/go.mod @@ -3,7 +3,7 @@ module github.com/gojekfarm/xtools/xpod go 1.20 require ( - github.com/gojekfarm/xtools/generic v0.9.0 + github.com/gojekfarm/xtools/generic v0.10.0 github.com/stretchr/testify v1.9.0 ) diff --git a/xprom/xpromkafka/go.mod b/xprom/xpromkafka/go.mod index 75d240c..c2ce111 100644 --- a/xprom/xpromkafka/go.mod +++ b/xprom/xpromkafka/go.mod @@ -8,8 +8,8 @@ replace ( ) require ( - github.com/gojekfarm/xtools/xkafka v0.9.0 - github.com/gojekfarm/xtools/xprom/semconv v0.9.0 + github.com/gojekfarm/xtools/xkafka v0.10.0 + github.com/gojekfarm/xtools/xprom/semconv v0.10.0 github.com/prometheus/client_golang v1.14.0 github.com/stretchr/testify v1.8.1 ) From 304921d83894ed0f85d88719cb4e3369fd75b82c Mon Sep 17 00:00:00 2001 From: Ravi Atluri Date: Sat, 3 May 2025 12:25:11 +0530 Subject: [PATCH 3/3] Update CHANGELOG.md for v0.10.0 release --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48f1b4e..b619953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Added +- [`xkafka`](./xkafka): Add `xkafka.BatchConsumer` to consume messages in batches. ([#60](https://github.com/gojekfarm/xtools/pull/60)) +- Add middleware for `xkafka.BatchConsumer` ([#61](https://github.com/gojekfarm/xtools/pull/61)) + +## [0.9.0] + +### Added + - [`xprom`](./xprom): Add `xprom` package to standardize Prometheus metrics with OTEL conventions. ([#55](https://github.com/gojekfarm/xtools/pull/55)) - [`riverkfq`](./riverkfq): Add `riverkfq` package to provide async publishing of messages to Kafka. ([#47](https://github.com/gojekfarm/xtools/pull/47)) @@ -119,7 +126,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - [`generic`](./generic) package added - [`xproto`](./xproto) package added -[Unreleased]: https://github.com/gojekfarm/xtools/compare/v0.9.0...HEAD +[Unreleased]: https://github.com/gojekfarm/xtools/compare/v0.10.0...HEAD +[0.10.0]: https://github.com/gojekfarm/xtools/releases/tag/v0.10.0 [0.9.0]: https://github.com/gojekfarm/xtools/releases/tag/v0.9.0 [0.8.1]: https://github.com/gojekfarm/xtools/releases/tag/v0.8.1 [0.8.0]: https://github.com/gojekfarm/xtools/releases/tag/v0.8.0