Merge branch 'main' into mike/otlp

* main:
  Add /debug/trace/{traceID} endpoint (#204)

# Conflicts:
#	route/route_test.go

route/route.go

@@ -147,6 +147,7 @@ func (r *Router) LnS(incomingOrPeer string) {
 	muxxer.HandleFunc("/alive", r.alive).Name("local health")
 	muxxer.HandleFunc("/panic", r.panic).Name("intentional panic")
 	muxxer.HandleFunc("/version", r.version).Name("report version info")
+	muxxer.HandleFunc("/debug/trace/{traceID}", r.debugTrace).Name("get debug information for given trace ID")
 
 	// require an auth header for events and batches
 	authedMuxxer := muxxer.PathPrefix("/1/").Methods("POST").Subrouter()
@@ -245,6 +246,12 @@ func (r *Router) version(w http.ResponseWriter, req *http.Request) {
 	w.Write([]byte(fmt.Sprintf(`{"source":"refinery","version":"%s"}`, r.versionStr)))
 }
 
+func (r *Router) debugTrace(w http.ResponseWriter, req *http.Request) {
+	traceID := mux.Vars(req)["traceID"]
+	shard := r.Sharder.WhichShard(traceID)
+	w.Write([]byte(fmt.Sprintf(`{"traceID":"%s","node":"%s"}`, traceID, shard.GetAddress())))
+}
+
 // event is handler for /1/event/
 func (r *Router) event(w http.ResponseWriter, req *http.Request) {
 	r.Metrics.IncrementCounter(r.incomingOrPeer + "_router_event")

route/route_test.go

@@ -14,6 +14,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gorilla/mux"
+	"github.com/honeycombio/refinery/sharder"
 	"github.com/klauspost/compress/zstd"
 	"github.com/vmihailenco/msgpack/v4"
 	"google.golang.org/grpc/metadata"
@@ -236,6 +238,7 @@ func TestUnmarshal(t *testing.T) {
 	}
 }
 
+<<<<<<< HEAD
 func TestGetAPIKeyAndDatasetFromMetadataCaseInsensitive(t *testing.T) {
 	const (
 		apiKeyValue  = "test-apikey"
@@ -357,3 +360,35 @@ func TestGetSampleRateFromAttributes(t *testing.T) {
 		})
 	}
 }
+
+func TestDebugTrace(t *testing.T) {
+	req, _ := http.NewRequest("GET", "/debug/trace/123abcdef", nil)
+	req = mux.SetURLVars(req, map[string]string{"traceID": "123abcdef"})
+
+	rr := httptest.NewRecorder()
+	router := &Router{
+		Sharder: &TestSharder{},
+	}
+
+	router.debugTrace(rr, req)
+	if body := rr.Body.String(); body != `{"traceID":"123abcdef","node":"http://localhost:12345"}` {
+		t.Error(body)
+	}
+}
+
+type TestSharder struct{}
+
+func (s *TestSharder) MyShard() sharder.Shard { return nil }
+
+func (s *TestSharder) WhichShard(string) sharder.Shard {
+	return &TestShard{
+		addr: "http://localhost:12345",
+	}
+}
+
+type TestShard struct {
+	addr string
+}
+
+func (s *TestShard) Equals(other sharder.Shard) bool { return true }
+func (s *TestShard) GetAddress() string              { return s.addr }