wip

Author: kapv89

go/database/sql/go-sql.go

@@ -18,20 +18,24 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"runtime/debug"
 	"strings"
 
 	"github.com/google/sqlcommenter/go/core"
 )
 
+var attemptedToAutosetApplication = false
+
 type DB struct {
 	*sql.DB
-	driverName string
-	options    core.CommenterOptions
+	driverName  string
+	options     core.CommenterOptions
+	application string
 }
 
 func Open(driverName string, dataSourceName string, options core.CommenterOptions) (*DB, error) {
 	db, err := sql.Open(driverName, dataSourceName)
-	return &DB{DB: db, driverName: driverName, options: options}, err
+	return &DB{DB: db, driverName: driverName, options: options, application: options.Application}, err
 }
 
 // ***** Query Functions *****
@@ -91,6 +95,20 @@ func (db *DB) withComment(ctx context.Context, query string) string {
 		commentsMap[core.Route] = ctx.Value(core.Route).(string)
 	}
 
+	if db.options.EnableApplication {
+		if !attemptedToAutosetApplication && db.application == "" {
+			attemptedToAutosetApplication = true
+			bi, ok := debug.ReadBuildInfo()
+			if ok {
+				db.application = bi.Path
+			} else {
+				db.application = ""
+			}
+		}
+
+		commentsMap[core.Application] = db.application
+	}
+
 	if db.options.EnableTraceparent {
 		carrier := core.ExtractTraceparent(ctx)
 		if val, ok := carrier["traceparent"]; ok {

go/database/sql/go-sql_test.go

@@ -45,15 +45,15 @@ func TestHTTP_Net(t *testing.T) {
 		t.Fatalf("MockSQL failed with unexpected error: %s", err)
 	}
 
-	db := DB{DB: mockDB, driverName: "mocksql", options: core.CommenterOptions{EnableDBDriver: true, EnableRoute: true, EnableFramework: true}}
+	db := DB{DB: mockDB, driverName: "mocksql", options: core.CommenterOptions{EnableDBDriver: true, EnableRoute: true, EnableFramework: true, EnableApplication: true, Application: "app"}, application: "app"}
 	r, err := http.NewRequest("GET", "hello/1", nil)
 	if err != nil {
 		t.Errorf("http.NewRequest('GET', 'hello/1', nil) returned unexpected error: %v", err)
 	}
 
 	ctx := core.ContextInject(r.Context(), httpnet.NewHTTPRequestExtractor(r, nil))
 	got := db.withComment(ctx, "Select 1")
-	want := "Select 1/*driver=database%2Fsql%3Amocksql,framework=net%2Fhttp,route=hello%2F1*/"
+	want := "Select 1/*application=app,db_driver=database%2Fsql%3Amocksql,framework=net%2Fhttp,route=hello%2F1*/"
 	if got != want {
 		t.Errorf("db.withComment(ctx, 'Select 1') got %q, wanted %q", got, want)
 	}
@@ -67,7 +67,7 @@ func TestQueryWithSemicolon(t *testing.T) {
 
 	db := DB{DB: mockDB, driverName: "mocksql", options: core.CommenterOptions{EnableDBDriver: true}}
 	got := db.withComment(context.Background(), "Select 1;")
-	want := "Select 1/*driver=database%2Fsql%3Amocksql*/;"
+	want := "Select 1/*db_driver=database%2Fsql%3Amocksql*/;"
 	if got != want {
 		t.Errorf("db.withComment(context.Background(), 'Select 1;') got %q, wanted %q", got, want)
 	}

go/database/sql/go.mod

@@ -3,7 +3,7 @@ module github.com/google/sqlcommenter/go/database/sql
 go 1.19
 
 require (
-	github.com/google/sqlcommenter/go/core v0.0.1-beta
+	github.com/google/sqlcommenter/go/core v0.0.2-beta
 	go.opentelemetry.io/otel/sdk v1.10.0
 )
 
@@ -16,7 +16,7 @@ require (
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/google/sqlcommenter/go/net/http v0.0.1-beta
+	github.com/google/sqlcommenter/go/net/http v0.0.2-beta
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.10.0
 	go.opentelemetry.io/otel/trace v1.10.0 // indirect
 )