Updating uninstrumented example

Author: lightsta1ker

examples/dice/uninstrumented/main.go

@@ -7,11 +7,13 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"log"
 	"net"
 	"net/http"
 	"os"
 	"os/signal"
+	"strconv"
 	"time"
 )
 
@@ -27,8 +29,13 @@ func run() (err error) {
 	defer stop()
 
 	// Start HTTP server.
+	port := os.Getenv("APPLICATION_PORT")
+	if port == "" {
+		port = "8080"
+	}
+
 	srv := &http.Server{
-		Addr:         ":8080",
+		Addr:         ":" + port,
 		BaseContext:  func(net.Listener) context.Context { return ctx },
 		ReadTimeout:  time.Second,
 		WriteTimeout: 10 * time.Second,
@@ -60,8 +67,52 @@ func newHTTPHandler() http.Handler {
 	mux := http.NewServeMux()
 
 	// Register handlers.
-	mux.HandleFunc("/rolldice/", rolldice)
-	mux.HandleFunc("/rolldice/{player}", rolldice)
-
+	mux.HandleFunc("/rolldice", handleRollDice)
 	return mux
 }
+
+func handleRollDice(w http.ResponseWriter, r *http.Request) {
+	// Parse query parameters
+	rollsParam := r.URL.Query().Get("rolls")
+	player := r.URL.Query().Get("player")
+
+	// Default rolls = 1 if not defined
+	if rollsParam == "" {
+		rollsParam = "1"
+	}
+
+	// Check if rolls is a number
+	rolls, err := strconv.Atoi(rollsParam)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		msg := "Parameter rolls must be a positive integer"
+		_ = json.NewEncoder(w).Encode(map[string]string{
+			"status":  "error",
+			"message": msg,
+		})
+		log.Printf("WARN: %s", msg)
+		return
+	}
+
+	results, err := rolldice(rolls)
+	if err != nil {
+		// Library signals invalid input (<=0)
+		w.WriteHeader(http.StatusInternalServerError)
+		log.Printf("ERROR: %v", err)
+		return
+	}
+
+	if player == "" {
+		log.Printf("DEBUG: anonymous player rolled %v", results)
+	} else {
+		log.Printf("DEBUG: player=%s rolled %v", player, results)
+	}
+	log.Printf("INFO: %s %s -> 200 OK", r.Method, r.URL.String())
+
+	w.Header().Set("Content-Type", "application/json")
+	if len(results) == 1 {
+		json.NewEncoder(w).Encode(results[0])
+	} else {
+		json.NewEncoder(w).Encode(results)
+	}
+}

examples/dice/uninstrumented/rolldice.go

@@ -4,26 +4,28 @@
 package main
 
 import (
-	"io"
-	"log"
+	"errors"
 	"math/rand"
-	"net/http"
-	"strconv"
 )
 
-func rolldice(w http.ResponseWriter, r *http.Request) {
-	roll := 1 + rand.Intn(6) //nolint:gosec // G404: Use of weak random number generator (math/rand instead of crypto/rand) is ignored as this is not security-sensitive.
+func rolldice(rolls int) ([]int, error) {
+	if rolls <= 0 {
+		return nil, errors.New("rolls must be positive")
+	}
 
-	var msg string
-	if player := r.PathValue("player"); player != "" {
-		msg = player + " is rolling the dice"
-	} else {
-		msg = "Anonymous player is rolling the dice"
+	if rolls == 1 {
+		return []int{rollOnce()}, nil
 	}
-	log.Printf("%s, result: %d", msg, roll)
 
-	resp := strconv.Itoa(roll) + "\n"
-	if _, err := io.WriteString(w, resp); err != nil {
-		log.Printf("Write failed: %v", err)
+	results := make([]int, rolls)
+	for i := 0; i < rolls; i++ {
+		results[i] = rollOnce()
 	}
+	return results, nil
+}
+
+// rollOnce is the inner function — returns a random number 1–6.
+func rollOnce() int {
+	roll := 1 + rand.Intn(6) //nolint:gosec // G404: Use of weak random number generator (math/rand instead of crypto/rand) is ignored as this is not security-sensitive.
+	return roll
 }