Skip to content

Commit 9e5d5bb

Browse files
aryanmehrotraaryanmehrotra
authored
Merge pull request #1815 from gofr-dev/release/v1.40.1
2 parents 493ab96 + d7b785d commit 9e5d5bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+866
-625
lines changed

‎.github/workflows/go.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
branches:
1111
- main
1212
- development
13+
- fix/test_coverage
1314
paths-ignore:
1415
- 'docs/**' # Ignore changes to docs folder
1516
# Run on pull requests to main or development branches
@@ -102,7 +103,7 @@ jobs:
102103
# Run tests for the examples directory with coverage
103104
go test gofr.dev/examples/... -v -short -coverprofile packageWithpbgo.cov -coverpkg=gofr.dev/examples/...
104105
# Filter out auto-generated files by protobuf and gofr framework from coverage report
105-
grep -vE '^gofr\.dev\/.*(\.pb\.go|hello\.proto|hello_grpc\.pb\.go|health_client\.go|hello_client\.go|hello_gofr\.go|health_gofr\.go)' packageWithpbgo.cov > profile.cov
106+
grep -vE '(/client/|grpc-.+-client/main\.go|_client\.go|_gofr\.go|_grpc\.pb\.go|\.pb\.go|\.proto|health_.*\.go)' packageWithpbgo.cov > profile.cov
106107
# Display coverage statistics
107108
go tool cover -func profile.cov
108109
@@ -148,14 +149,14 @@ jobs:
148149
max_attempts: 2
149150
command: |
150151
export APP_ENV=test
151-
# Run tests for the pkg directory with coverage
152-
cd pkg
153-
go test ./... -v -short -coverprofile package.cov -coverpkg=./...
154-
# Filter out mock files from coverage report
155-
grep -v '/mock_' package.cov > profile.cov
156-
mv profile.cov ../profile.cov
157-
# Display coverage statistics
158-
go tool cover -func ../profile.cov
152+
# Run tests with coverage for root gofr package only
153+
go test -v -short -covermode=atomic -coverpkg=./pkg/gofr -coverprofile=gofr_only.cov ./pkg/gofr
154+
# Run tests for all sub-packages under gofr
155+
go test -v -covermode=atomic -coverpkg=./pkg/gofr -coverprofile=submodules.cov ./pkg/gofr/...
156+
# Combine coverage profiles
157+
echo "mode: atomic" > profile.cov
158+
grep -h -v "mode:" gofr_only.cov submodules.cov | grep -v '/mock_' >> profile.cov
159+
go tool cover -func profile.cov
159160
160161
# Upload coverage report for the 1.24 Go version only
161162
- name: Upload Test Coverage
@@ -195,6 +196,7 @@ jobs:
195196
codeCoverage=$(go tool cover -func=merged_profile.cov | grep total | awk '{print $3}')
196197
codeCoverage=${codeCoverage%?}
197198
echo "CODE_COVERAGE=$codeCoverage" >> $GITHUB_ENV
199+
echo "✅ Total Code Coverage: $codeCoverage%"
198200
# - name: Check if code-coverage is greater than threshold
199201
# run: |
200202
# codeCoverage=${{ env.CODE_COVERAGE }}

‎.github/workflows/typos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: Checkout Code
1212
uses: actions/checkout@v4
1313
- name: typos-action
14-
uses: crate-ci/typos@v1.32.0
14+
uses: crate-ci/typos@v1.33.1

‎examples/using-add-filestore/go.mod

Lines changed: 59 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
module gofr.dev/examples/using-add-filestore
22

3-
go 1.23.0
3+
go 1.24
44

55
toolchain go1.24.1
66

77
require (
88
github.com/stretchr/testify v1.10.0
9-
go.uber.org/mock v0.5.0
10-
gofr.dev v1.29.0
9+
go.uber.org/mock v0.5.2
10+
gofr.dev v1.40.0
1111
gofr.dev/pkg/gofr/datasource/file/ftp v0.2.0
1212
)
1313

1414
require (
15-
cloud.google.com/go v0.118.0 // indirect
16-
cloud.google.com/go/auth v0.14.0 // indirect
17-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
18-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
19-
cloud.google.com/go/iam v1.3.1 // indirect
20-
cloud.google.com/go/pubsub v1.45.3 // indirect
15+
cloud.google.com/go v0.120.0 // indirect
16+
cloud.google.com/go/auth v0.16.1 // indirect
17+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
18+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
19+
cloud.google.com/go/iam v1.5.2 // indirect
20+
cloud.google.com/go/pubsub v1.49.0 // indirect
2121
filippo.io/edwards25519 v1.1.0 // indirect
2222
github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect
23-
github.com/XSAM/otelsql v0.36.0 // indirect
23+
github.com/XSAM/otelsql v0.38.0 // indirect
2424
github.com/beorn7/perks v1.0.1 // indirect
25-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
25+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
2626
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2727
github.com/davecgh/go-spew v1.1.1 // indirect
28+
github.com/dgraph-io/dgo/v210 v210.0.0-20230328113526-b66f8ae53a2d // indirect
2829
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
2930
github.com/dustin/go-humanize v1.0.1 // indirect
3031
github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
3132
github.com/felixge/httpsnoop v1.0.4 // indirect
3233
github.com/go-logr/logr v1.4.2 // indirect
3334
github.com/go-logr/stdr v1.2.2 // indirect
34-
github.com/go-sql-driver/mysql v1.8.1 // indirect
35+
github.com/go-sql-driver/mysql v1.9.2 // indirect
3536
github.com/gogo/protobuf v1.3.2 // indirect
3637
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
37-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
3838
github.com/google/s2a-go v0.1.9 // indirect
3939
github.com/google/uuid v1.6.0 // indirect
40-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
41-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
40+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
41+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
4242
github.com/gorilla/mux v1.8.1 // indirect
4343
github.com/gorilla/websocket v1.5.3 // indirect
4444
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
45-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
45+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
4646
github.com/hashicorp/errwrap v1.1.0 // indirect
4747
github.com/hashicorp/go-multierror v1.1.1 // indirect
4848
github.com/jlaffaye/ftp v0.2.0 // indirect
4949
github.com/joho/godotenv v1.5.1 // indirect
50-
github.com/klauspost/compress v1.17.11 // indirect
50+
github.com/klauspost/compress v1.18.0 // indirect
5151
github.com/lib/pq v1.10.9 // indirect
5252
github.com/mattn/go-isatty v0.0.20 // indirect
5353
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -56,48 +56,51 @@ require (
5656
github.com/pierrec/lz4/v4 v4.1.22 // indirect
5757
github.com/pkg/errors v0.9.1 // indirect
5858
github.com/pmezard/go-difflib v1.0.0 // indirect
59-
github.com/prometheus/client_golang v1.20.5 // indirect
60-
github.com/prometheus/client_model v0.6.1 // indirect
61-
github.com/prometheus/common v0.61.0 // indirect
62-
github.com/prometheus/procfs v0.15.1 // indirect
63-
github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0 // indirect
64-
github.com/redis/go-redis/extra/redisotel/v9 v9.7.0 // indirect
65-
github.com/redis/go-redis/v9 v9.7.3 // indirect
59+
github.com/prometheus/client_golang v1.22.0 // indirect
60+
github.com/prometheus/client_model v0.6.2 // indirect
61+
github.com/prometheus/common v0.64.0 // indirect
62+
github.com/prometheus/procfs v0.16.1 // indirect
63+
github.com/redis/go-redis/extra/rediscmd/v9 v9.8.0 // indirect
64+
github.com/redis/go-redis/extra/redisotel/v9 v9.8.0 // indirect
65+
github.com/redis/go-redis/v9 v9.8.0 // indirect
6666
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
67-
github.com/segmentio/kafka-go v0.4.47 // indirect
67+
github.com/segmentio/kafka-go v0.4.48 // indirect
68+
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
69+
github.com/xdg-go/scram v1.1.2 // indirect
70+
github.com/xdg-go/stringprep v1.0.4 // indirect
6871
go.opencensus.io v0.24.0 // indirect
6972
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
70-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
71-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.58.0 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
73-
go.opentelemetry.io/otel v1.34.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
76-
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
77-
go.opentelemetry.io/otel/exporters/zipkin v1.33.0 // indirect
78-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
79-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
80-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
82-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
83-
golang.org/x/crypto v0.36.0 // indirect
84-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
85-
golang.org/x/net v0.38.0 // indirect
86-
golang.org/x/oauth2 v0.25.0 // indirect
87-
golang.org/x/sync v0.12.0 // indirect
88-
golang.org/x/sys v0.31.0 // indirect
89-
golang.org/x/term v0.30.0 // indirect
90-
golang.org/x/text v0.23.0 // indirect
91-
golang.org/x/time v0.9.0 // indirect
92-
google.golang.org/api v0.217.0 // indirect
93-
google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422 // indirect
94-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
95-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
96-
google.golang.org/grpc v1.69.4 // indirect
97-
google.golang.org/protobuf v1.36.3 // indirect
73+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
75+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
76+
go.opentelemetry.io/otel v1.36.0 // indirect
77+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
79+
go.opentelemetry.io/otel/exporters/prometheus v0.58.0 // indirect
80+
go.opentelemetry.io/otel/exporters/zipkin v1.36.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
82+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
83+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
84+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
85+
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
86+
golang.org/x/crypto v0.38.0 // indirect
87+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
88+
golang.org/x/net v0.40.0 // indirect
89+
golang.org/x/oauth2 v0.30.0 // indirect
90+
golang.org/x/sync v0.14.0 // indirect
91+
golang.org/x/sys v0.33.0 // indirect
92+
golang.org/x/term v0.32.0 // indirect
93+
golang.org/x/text v0.25.0 // indirect
94+
golang.org/x/time v0.11.0 // indirect
95+
google.golang.org/api v0.234.0 // indirect
96+
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
99+
google.golang.org/grpc v1.72.1 // indirect
100+
google.golang.org/protobuf v1.36.6 // indirect
98101
gopkg.in/yaml.v3 v3.0.1 // indirect
99-
modernc.org/libc v1.61.7 // indirect
102+
modernc.org/libc v1.65.7 // indirect
100103
modernc.org/mathutil v1.7.1 // indirect
101-
modernc.org/memory v1.8.1 // indirect
102-
modernc.org/sqlite v1.34.5 // indirect
104+
modernc.org/memory v1.11.0 // indirect
105+
modernc.org/sqlite v1.37.1 // indirect
103106
)

0 commit comments

Comments
 (0)