Merge branch 'development' into add-oidc-middleware

Author: Umang01-hash

.github/workflows/go.yml

@@ -279,6 +279,10 @@ jobs:
   upload_coverage:
     name: Upload Coverage📊
     runs-on: ubuntu-latest
+    env:
+      QLTY_TOKEN: ${{ secrets.QLTY_TOKEN }}
+      QLTY_COVERAGE_TOKEN: ${{ secrets.QLTY_TOKEN }}
+
     # This job only needs example and pkg test results, not submodules
     needs: [Example-Unit-Testing, PKG-Unit-Testing]
     # Only run this job on pushes to the development branch
@@ -288,7 +292,9 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install qlty CLI
-        run: curl -s https://qlty.sh/install | bash
+        run: |
+          curl https://qlty.sh | sh
+          echo "$HOME/.qlty/bin" >> $GITHUB_PATH
 
       # Download coverage artifacts
       - name: Download Coverage Report
@@ -311,7 +317,8 @@ jobs:
 
       # Upload merged coverage to CodeClimate for analysis
       - name: Upload
-        run: qlty coverage publish --input merged_profile.cov
+        working-directory: artifacts
+        run: qlty coverage publish merged_profile.cov --format=coverprofile --strip-prefix="gofr.dev/" --add-prefix="${GITHUB_WORKSPACE}/"
         env:
           QLTY_TOKEN: ${{ secrets.QLTY_TOKEN }}
 

README.md

@@ -9,8 +9,8 @@
 </p>
 <a href="https://pkg.go.dev/gofr.dev"><img src="https://img.shields.io/badge/GoDoc-Read%20Documentation-blue?style=for-the-badge" alt="godoc"></a>
 <a href="https://gofr.dev/docs"><img src="https://img.shields.io/badge/GoFr-Docs-orange?style=for-the-badge" alt="gofr-docs"></a>
-<a href="https://codeclimate.com/github/gofr-dev/gofr/maintainability"><img src="https://img.shields.io/codeclimate/maintainability/gofr-dev/gofr?style=for-the-badge" alt="maintainability"></a>
-<a href="https://codeclimate.com/github/gofr-dev/gofr/test_coverage"><img src="https://img.shields.io/codeclimate/coverage/gofr-dev/gofr?style=for-the-badge" alt="test-coverage"></a>
+<a href="https://qlty.sh/gh/gofr-dev/projects/gofr"><img src="https://qlty.sh/gh/gofr-dev/projects/gofr/maintainability.svg" alt="Maintainability" /></a>
+<a href="https://qlty.sh/gh/gofr-dev/projects/gofr"><img src="https://qlty.sh/gh/gofr-dev/projects/gofr/coverage.svg" alt="Code Coverage" /></a>
 <a href="https://goreportcard.com/report/gofr.dev"><img src="https://goreportcard.com/badge/gofr.dev?style=for-the-badge" alt="Go Report Card"></a>
 <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-blue?style=for-the-badge" alt="Apache 2.0 License"></a>
 <a href="https://discord.gg/wsaSkQTdgq"><img src="https://img.shields.io/badge/discord-join-us?style=for-the-badge&logo=discord&color=7289DA" alt="discord" /></a>

pkg/gofr/context.go

@@ -177,3 +177,7 @@ func newCMDContext(w Responder, r Request, c *container.Container, out terminal.
 		ContextLogger: *logging.NewContextLogger(r.Context(), c.Logger),
 	}
 }
+
+func (c *Context) GetCorrelationID() string {
+	return trace.SpanFromContext(c).SpanContext().TraceID().String()
+}

pkg/gofr/context_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/sdk/trace"
+	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 
 	"gofr.dev/pkg/gofr/config"
 	"gofr.dev/pkg/gofr/container"
@@ -234,3 +235,30 @@ func TestGetAuthInfo_JWTClaims(t *testing.T) {
 
 	assert.Equal(t, claims, res)
 }
+
+func TestContext_GetCorrelationID(t *testing.T) {
+	// Setup OpenTelemetry tracer
+	exporter := tracetest.NewInMemoryExporter()
+	tp := trace.NewTracerProvider(trace.WithSyncer(exporter))
+	otel.SetTracerProvider(tp)
+	tracer := tp.Tracer("test")
+
+	t.Run("with span", func(t *testing.T) {
+		ctx, span := tracer.Start(t.Context(), "test-span")
+		defer span.End()
+
+		gofCtx := &Context{Context: ctx}
+		correlationID := gofCtx.GetCorrelationID()
+
+		assert.Len(t, correlationID, 32, "Expected correlation ID length 32, got %d", len(correlationID))
+		assert.NotEqual(t, "00000000000000000000000000000000", correlationID, "Expected non-empty correlation ID")
+	})
+
+	t.Run("without span", func(t *testing.T) {
+		gofCtx := &Context{Context: t.Context()}
+		correlationID := gofCtx.GetCorrelationID()
+
+		expected := "00000000000000000000000000000000"
+		assert.Equal(t, expected, correlationID, "Expected empty TraceID when no span present")
+	})
+}

pkg/gofr/datasource/sql/db.go

@@ -45,7 +45,7 @@ func clean(query string) string {
 }
 
 func (d *DB) sendOperationStats(start time.Time, queryType, query string, args ...any) {
-	duration := time.Since(start).Microseconds()
+	duration := time.Since(start).Milliseconds()
 
 	d.logger.Debug(&Log{
 		Type:     queryType,
@@ -129,7 +129,7 @@ type Tx struct {
 }
 
 func (t *Tx) sendOperationStats(start time.Time, queryType, query string, args ...any) {
-	duration := time.Since(start).Microseconds()
+	duration := time.Since(start).Milliseconds()
 
 	t.logger.Debug(&Log{
 		Type:     queryType,

pkg/gofr/datasource/sql/db_test.go

@@ -1227,3 +1227,27 @@ func TestDB_Begin_Error(t *testing.T) {
 	require.Error(t, err)
 	assert.Nil(t, tx)
 }
+
+func TestDB_sendOperationStats_RecordsMilliseconds(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockMetrics := NewMockMetrics(ctrl)
+
+	db := &DB{
+		logger:  logging.NewMockLogger(logging.DEBUG),
+		config:  &DBConfig{HostName: "host", Database: "db"},
+		metrics: mockMetrics,
+	}
+
+	start := time.Now().Add(-1500 * time.Millisecond) // 1.5 seconds ago
+
+	// Expect RecordHistogram to be called with duration 1500 (milliseconds)
+	mockMetrics.EXPECT().RecordHistogram(
+		gomock.Any(), "app_sql_stats", float64(1500),
+		"hostname", "host", "database", "db", "type", "SELECT",
+	)
+
+	db.sendOperationStats(start, "SELECT", "SELECT * FROM users")
+
+	duration := time.Since(start).Milliseconds()
+	assert.Equal(t, int64(1500), duration)
+}