Merge branch 'development' into tests/auth-middleware

Author: gizmo-rt

.github/workflows/go.yml

@@ -39,7 +39,7 @@ jobs:
     services:
       # Kafka service
       kafka:
-        image: bitnami/kafka:3.4.1
+        image: bitnamilegacy/kafka:3.4.1
         ports:
           - "9092:9092"
         env:

.github/workflows/typos.yml

@@ -11,4 +11,4 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v5
       - name: typos-action
-        uses: crate-ci/[email protected].2
+        uses: crate-ci/[email protected].3

.golangci.yml

@@ -44,7 +44,7 @@ linters:
     - usestdlibvars
     - usetesting
     - whitespace
-    - wsl
+    - wsl_v5
 
     # don't enable:
     # - godox  # Disabling because we need TODO lines at this stage of project.

docs/advanced-guide/using-publisher-subscriber/page.md

@@ -344,7 +344,7 @@ Azure Event Hub is supported as an external PubSub provider such that if you are
 Import the external driver for `eventhub` using the following command.
 
 ```bash
-go get gofr.dev/pkg/gofr/datasources/pubsub/eventhub
+go get gofr.dev/pkg/gofr/datasource/pubsub/eventhub
 ```
 
 Use the `AddPubSub` method of GoFr's app to connect
@@ -359,6 +359,7 @@ app := gofr.New()
        StorageServiceURL:         "https://gofrdev.windows.net/",
        StorageContainerName:      "test",
        EventhubName:              "test1",
+       ConsumerGroup:             "$Default",
     }))
 ```
 

examples/http-server/Dockerfile

@@ -1,16 +1,25 @@
 # Build stage
-FROM golang:1.24 AS build
+FROM golang:1.25-alpine AS build
+RUN apk add --no-cache build-base
 
 WORKDIR /src
+
+# Copy go.mod + go.sum first for better caching
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Copy the rest of the source code
 COPY . .
-RUN go get ./...
-RUN go build -ldflags "-linkmode external -extldflags -static" -a -o /app/main main.go
+
+# Move into http-server folder and build the package (not main.go)
+WORKDIR /src/examples/http-server
+RUN CGO_ENABLED=0 go build -a -o /app/main .
 
 # Final stage
 FROM alpine:3.14
 RUN apk add --no-cache tzdata ca-certificates
 COPY --from=build /app/main /main
-COPY --from=build /src/configs /configs
+COPY --from=build /src/examples/http-server/configs /configs
 EXPOSE 9000
 
-CMD ["/main"]
+CMD ["/main"]

examples/http-server/README.md

@@ -2,16 +2,56 @@
 
 This GoFr example demonstrates a simple HTTP server which supports Redis and MySQL as datasources.
 
-### To run the example follow the steps below:
+### To run the example, follow the steps below:
+
+#### 1. Run with Docker Compose (recommended)
+
+From the project root (`/gofr`):
+
+```console
+docker compose -f examples/http-server/docker/docker-compose.yml up -d
+```
+
+* Explanation:
+
+    * `-f examples/http-server/docker/docker-compose.yml` → path to the docker-compose file
+    * `up -d` → builds (if needed) and runs services in detached mode
+
+---
+
+#### 2. Build & Run Manually (without docker-compose)
+
+##### Build the Docker image
+
+From the project root (`/gofr`):
+
+```console
+docker build -f examples/http-server/Dockerfile -t http-server:latest .
+```
+
+* Explanation:
+
+    * `-f examples/http-server/Dockerfile` → path to the Dockerfile
+    * `-t http-server:latest` → tag for the Docker image
+    * `.` → build context (project root; needed for `go.mod` and `go.sum`)
+
+##### Run the Docker container
 
-- Run the docker image of the application
 ```console
-docker-compose up -d
+docker run -p 9000:9000 --name http-server http-server:latest
 ```
 
+* Explanation:
+    * `-p 9000:9000` → maps container port 9000 to host port 9000
+    * `--name http-server` → optional, gives your container a name
+
+* Use **Compose** when you want the whole stack (app + Redis + MySQL + Grafana + Prometheus).
+* Use **Docker build/run** when you just want to run the app container alone.
+
 To test the example, follow these steps:
 
 1. Open your browser and navigate to `http://localhost:9000/hello`.
 2. To view the GoFr trace, open `https://tracer.gofr.dev` and paste the traceid.
-3. To view the Grafana Dashboard open `http://localhost:3000`
-
+3. To access the Grafana Dashboard, open `http://localhost:3000`. The dashboard UI will be displayed. Use the default admin credentials to log in:
+    - Username: `admin`
+    - Password: `password`

examples/http-server/docker/docker-compose.yaml

@@ -3,19 +3,19 @@ version: '3.8'
 services:
   gofr-http-server:
     build:
-      context: ../.
-      dockerfile: Dockerfile
+      context: ../../../           # project root (so go.mod and go.sum are included)
+      dockerfile: examples/http-server/Dockerfile
     environment:
-      - TRACE_EXPORTER=gofr
-      - TRACER_RATIO=0.1
-      - REDIS_HOST=redisdb
-      - REDIS_PORT=6379
-      - DB_HOST=mysqldb
-      - DB_USER=root
-      - DB_PASSWORD=password
-      - DB_NAME=test
-      - DB_PORT=3306
-      - DB_DIALECT=mysql
+      TRACE_EXPORTER: gofr
+      TRACER_RATIO: 0.1
+      REDIS_HOST: redisdb
+      REDIS_PORT: 6379
+      DB_HOST: mysqldb
+      DB_USER: root
+      DB_PASSWORD: password
+      DB_NAME: test
+      DB_PORT: 3306
+      DB_DIALECT: mysql
     ports:
       - "9000:9000"
       - "2121:2121"
@@ -49,8 +49,8 @@ services:
     ports:
       - "3000:3000"
     environment:
-      - GF_SECURITY_ADMIN_USER=admin
-      - GF_SECURITY_ADMIN_PASSWORD=password
+      GF_SECURITY_ADMIN_USER: admin
+      GF_SECURITY_ADMIN_PASSWORD: password
     volumes:
       - ./provisioning:/etc/grafana/provisioning
     networks:

examples/using-add-filestore/go.mod

@@ -5,7 +5,7 @@ go 1.25
 require (
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/mock v0.6.0
-	gofr.dev v1.45.0
+	gofr.dev v1.46.0
 	gofr.dev/pkg/gofr/datasource/file/ftp v0.2.1
 )
 
@@ -18,15 +18,15 @@ require (
 	cloud.google.com/go/pubsub v1.49.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect
-	github.com/XSAM/otelsql v0.39.0 // indirect
+	github.com/XSAM/otelsql v0.40.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgraph-io/dgo/v210 v210.0.0-20230328113526-b66f8ae53a2d // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
+	github.com/eclipse/paho.mqtt.golang v1.5.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -41,7 +41,7 @@ require (
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jlaffaye/ftp v0.2.0 // indirect
@@ -54,15 +54,15 @@ require (
 	github.com/openzipkin/zipkin-go v0.4.3 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.23.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.65.0 // indirect
-	github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/otlptranslator v0.0.2 // indirect
 	github.com/prometheus/procfs v0.17.0 // indirect
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.12.1 // indirect
-	github.com/redis/go-redis/extra/redisotel/v9 v9.12.1 // indirect
-	github.com/redis/go-redis/v9 v9.12.1 // indirect
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.14.0 // indirect
+	github.com/redis/go-redis/extra/redisotel/v9 v9.14.0 // indirect
+	github.com/redis/go-redis/v9 v9.14.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/segmentio/kafka-go v0.4.49 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -71,36 +71,37 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.62.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.59.1 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.60.0 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.38.0 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/crypto v0.42.0 // indirect
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
-	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/net v0.44.0 // indirect
 	golang.org/x/oauth2 v0.31.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/term v0.34.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/term v0.35.0 // indirect
 	golang.org/x/text v0.29.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	google.golang.org/api v0.249.0 // indirect
 	google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
-	google.golang.org/grpc v1.75.0 // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
+	google.golang.org/grpc v1.75.1 // indirect
+	google.golang.org/protobuf v1.36.9 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.66.3 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.38.2 // indirect
+	modernc.org/sqlite v1.39.0 // indirect
 )