Merge pull request #171 from google/go_samples/http

working go samples/http

Author: kapv89

go/samples/http/.gitignore

@@ -0,0 +1,2 @@
+sqlcommenter-http
+docker-data/

go/samples/http/curls/delete.sh

@@ -0,0 +1,6 @@
+# usage: delete.sh <id>
+
+curl --header "Content-Type: application/json" \
+  --request DELETE \
+  http://localhost:8080/todos/$1
+echo

go/samples/http/curls/index.sh

@@ -0,0 +1,4 @@
+# usage: index.sh
+
+curl http://localhost:8080
+echo

go/samples/http/curls/insert.sh

@@ -0,0 +1,7 @@
+# usage: insert.sh <task>
+
+curl --header "Content-Type: application/json" \
+  --request POST \
+  --data '{"task":"'$1'"}' \
+  http://localhost:8080/todos
+echo

go/samples/http/curls/list.sh

@@ -0,0 +1,4 @@
+# usage: list.sh
+
+curl http://localhost:8080/todos?search=$1
+echo

go/samples/http/curls/update.sh

@@ -0,0 +1,7 @@
+# usage: update.sh <id> <task>
+
+curl --header "Content-Type: application/json" \
+  --request PUT \
+  --data '{"task":"'$2'"}' \
+  http://localhost:8080/todos/$1
+echo

go/samples/http/docker-compose.yml

@@ -0,0 +1,27 @@
+version: '3.8'
+services:
+  sqlcommenter_mysql_db:
+    container_name: sqlcommenter_mysql_db
+    image: mysql:8
+    command:
+      --general-log=TRUE
+      --general-log-file=/var/lib/mysql/mysql-log.log
+    ports:
+      - '3306:3306'
+    environment:
+      MYSQL_DATABASE: 'sqlcommenter_db'
+      MYSQL_ROOT_PASSWORD: 'password'
+    volumes:
+      - './docker-data/mysql:/var/lib/postgresql/data'
+  sqlcommenter_pg_db:
+    container_name: sqlcommenter_pg_db
+    image: postgres:14
+    command: postgres -c log_statement=all
+    ports:
+      - '5432:5432'
+    environment:
+      POSTGRES_USER: dev
+      POSTGRES_PASSWORD: dev
+      POSTGRES_DB: sqlcommenter_db
+    volumes:
+      - './docker-data/pg:/var/lib/postgresql/data'

go/samples/http/go.mod

@@ -8,7 +8,11 @@ require (
 	go.opentelemetry.io/otel/sdk v1.10.0
 )
 
-require go.opentelemetry.io/otel v1.10.0 // indirect
+require (
+	github.com/julienschmidt/httprouter v1.3.0 
+	github.com/lib/pq v1.10.7
+	go.opentelemetry.io/otel v1.10.0 // indirect
+)
 
 require (
 	github.com/go-logr/logr v1.2.3 // indirect

go/samples/http/go.sum

@@ -14,6 +14,10 @@ github.com/google/sqlcommenter/go/database/sql v0.0.1-beta h1:N680pEYaRwmOSrQWUd
 github.com/google/sqlcommenter/go/database/sql v0.0.1-beta/go.mod h1:VdswmF4SM0cbjJdD+3GyM5QuXpHhH6F5nSzcbikzCGY=
 github.com/google/sqlcommenter/go/net/http v0.0.1-beta h1:7XQ6poZv+ZJwwHWQHlesq9IMsRus3G6Z9n10qAkrGqE=
 github.com/google/sqlcommenter/go/net/http v0.0.1-beta/go.mod h1:tVUqM1YZ/K3eRTdGzeav1GSbw+BXNdTGzSAbLW9CxAc=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4=

go/samples/http/main.go

@@ -1,55 +1,118 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"log"
 	"net/http"
 
-	_ "github.com/go-sql-driver/mysql"
 	"github.com/google/sqlcommenter/go/core"
 	gosql "github.com/google/sqlcommenter/go/database/sql"
 	httpnet "github.com/google/sqlcommenter/go/net/http"
+	"github.com/julienschmidt/httprouter"
 	"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+
+	"sqlcommenter-http/mysqldb"
+	"sqlcommenter-http/pgdb"
+	"sqlcommenter-http/todos"
 )
 
-func Index(w http.ResponseWriter, r *http.Request) {
+func MakeIndexRoute(db *gosql.DB) func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+	return func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+		exp, _ := stdouttrace.New(stdouttrace.WithPrettyPrint())
+		bsp := sdktrace.NewSimpleSpanProcessor(exp) // You should use batch span processor in prod
+		tp := sdktrace.NewTracerProvider(
+			sdktrace.WithSampler(sdktrace.AlwaysSample()),
+			sdktrace.WithSpanProcessor(bsp),
+		)
 
-	connection := "root:root@/gotest"
-	exp, _ := stdouttrace.New(stdouttrace.WithPrettyPrint())
-	bsp := sdktrace.NewSimpleSpanProcessor(exp) // You should use batch span processor in prod
-	tp := sdktrace.NewTracerProvider(
-		sdktrace.WithSampler(sdktrace.AlwaysSample()),
-		sdktrace.WithSpanProcessor(bsp),
-	)
+		ctx, span := tp.Tracer("foo").Start(r.Context(), "parent-span-name")
+		defer span.End()
 
-	ctx, span := tp.Tracer("foo").Start(r.Context(), "parent-span-name")
-	defer span.End()
+		db.ExecContext(ctx, "Select 1")
+		db.Exec("Select 2")
 
-	db, err := gosql.Open("mysql", connection, core.CommenterOptions{EnableDBDriver: true, EnableRoute: true, EnableAction: true, EnableFramework: true, EnableTraceparent: true})
-	if err != nil {
-		fmt.Println(err)
-	} else {
-		db.ExecContext(ctx, "Select 11;")
-		db.Exec("Select 2;")
-		db.Prepare("Select 10")
-		db.PrepareContext(ctx, "Select 10")
+		stmt1, err := db.Prepare("Select 3")
+		if err != nil {
+			log.Fatal(err)
+		}
+		stmt1.QueryRow()
+
+		stmt2, err := db.PrepareContext(ctx, "Select 4")
+		if err != nil {
+			log.Fatal(err)
+		}
+		stmt2.QueryRow()
+
+		db.QueryContext(ctx, "Select 5")
+
+		fmt.Fprintf(w, "Hello World!\r\n")
 	}
-	fmt.Fprintf(w, "Hello World!")
 }
 
 // middleware is used to intercept incoming HTTP calls and apply general functions upon them.
-func middleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+func middleware(next httprouter.Handle) httprouter.Handle {
+	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
 		ctx := core.ContextInject(r.Context(), httpnet.NewHTTPRequestExtractor(r, next))
 		log.Printf("HTTP request sent to %s from %v", r.URL.Path, next)
-		next.ServeHTTP(w, r.WithContext(ctx))
-	})
+		next(w, r.WithContext(ctx), p)
+	}
+}
+
+func runApp(todosController *todos.TodosController) {
+	err := todosController.CreateTodosTableIfNotExists()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	router := httprouter.New()
+
+	index := MakeIndexRoute(todosController.DB)
+	router.GET("/", middleware(index))
+
+	router.GET("/todos", middleware(todosController.ActionList))
+	router.POST("/todos", middleware(todosController.ActionInsert))
+	router.PUT("/todos/:id", middleware(todosController.ActionUpdate))
+	router.DELETE("/todos/:id", middleware(todosController.ActionDelete))
+
+	http.ListenAndServe(":8080", router)
+}
+
+func runForMysql() *gosql.DB {
+	connection := "root:password@/sqlcommenter_db"
+	db := mysqldb.ConnectMySQL(connection)
+	todosController := &todos.TodosController{Engine: "mysql", DB: db, SQL: todos.MySQLQueries{}}
+	runApp(todosController)
+	return db
+}
+
+func runForPg() *gosql.DB {
+	connection := "postgres://dev:dev@localhost/sqlcommenter_db?sslmode=disable"
+	db := pgdb.ConnectPG(connection)
+	todosController := &todos.TodosController{Engine: "pg", DB: db, SQL: todos.PGQueries{}}
+	runApp(todosController)
+	return db
 }
 
 func main() {
-	mux := http.NewServeMux()
-	finalHandler := http.HandlerFunc(Index)
-	mux.Handle("/", middleware((finalHandler)))
-	log.Fatal(http.ListenAndServe(":8080", mux))
+	var engine string
+
+	flag.StringVar(&engine, "db_engine", "mysql", "db-engine to run the sample application on")
+	flag.Parse()
+
+	if engine != "mysql" && engine != "pg" {
+		log.Fatalf("invalid engine: %s", engine)
+	}
+
+	var db *gosql.DB
+
+	switch engine {
+	case "mysql":
+		db = runForMysql()
+	case "pg":
+		db = runForPg()
+	}
+
+	db.Close()
 }