server-timing endpoint sequences

CHANGELOG.md

@@ -12,6 +12,7 @@ Unreleased changes are available as `avenga/couper:edge` container.
 * **Fixed**
   * Erroneously sending an empty [`Server-Timing` header](https://docs.couper.io/configuration/command-line#oberservation-options) ([#700](https://github.com/avenga/couper/pull/700))
   * `WWW-Authenticate` header `realm` param value for [`basic_auth`](https://docs.couper.io/configuration/block/basic_auth) ([#715](https://github.com/avenga/couper/pull/715))
+  * [`Server-Timing` header](https://docs.couper.io/configuration/block/settings) only reporting last requests/proxies of [endpoint sequences](https://docs.couper.io/configuration/block/endpoint#endpoint-sequence) ([#751](https://github.com/avenga/couper/pull/751))
 
 * **Dependencies**
   * build with go 1.20 ([#745](https://github.com/avenga/couper/pull/745))

handler/endpoint.go

@@ -248,23 +248,27 @@ func (e *Endpoint) newRedirect() *http.Response {
 	}
 }
 
-func newChannels(l sequence.List) (inputChannels, outputChannels map[string][]chan *producer.Result) {
+func newChannels(l sequence.List) (inputChannels, outputChannels map[string][]chan *producer.Result, resultChannels map[string]chan *producer.Result) {
 	inputChannels = make(map[string][]chan *producer.Result)
 	outputChannels = make(map[string][]chan *producer.Result)
+	resultChannels = make(map[string]chan *producer.Result)
 	for _, item := range l {
-		fillChannels(item, inputChannels, outputChannels)
-		ch := make(chan *producer.Result, 1)
-		outputChannels[item.Name] = []chan *producer.Result{ch}
+		fillChannels(item, inputChannels, outputChannels, resultChannels)
 	}
-	return inputChannels, outputChannels
+	return inputChannels, outputChannels, resultChannels
 }
 
-func fillChannels(item *sequence.Item, inputChannels, outputChannels map[string][]chan *producer.Result) {
+func fillChannels(item *sequence.Item, inputChannels, outputChannels map[string][]chan *producer.Result, resultChannels map[string]chan *producer.Result) {
 	for _, dep := range item.Deps() {
 		ch := make(chan *producer.Result, 1)
 		inputChannels[item.Name] = append(inputChannels[item.Name], ch)
 		outputChannels[dep.Name] = append(outputChannels[dep.Name], ch)
-		fillChannels(dep, inputChannels, outputChannels)
+		fillChannels(dep, inputChannels, outputChannels, resultChannels)
+	}
+	if _, ok := resultChannels[item.Name]; !ok {
+		ch := make(chan *producer.Result, 1)
+		outputChannels[item.Name] = append(outputChannels[item.Name], ch)
+		resultChannels[item.Name] = ch
 	}
 }
 
@@ -314,7 +318,7 @@ func (e *Endpoint) produce(req *http.Request) (producer.ResultMap, error) {
 
 	outreq := req.WithContext(context.WithValue(req.Context(), request.ResponseBlock, e.opts.Response != nil))
 
-	inputChannels, outputChannels := newChannels(e.opts.Items)
+	inputChannels, outputChannels, resultChannels := newChannels(e.opts.Items)
 	for name, prod := range e.opts.Producers {
 		go func(n string, rt producer.Roundtrip, intChs, outChs []chan *producer.Result) {
 			defer func() {
@@ -337,7 +341,7 @@ func (e *Endpoint) produce(req *http.Request) (producer.ResultMap, error) {
 			passToOutputChannels(res, outChs)
 		}(name, prod, inputChannels[name], outputChannels[name])
 	}
-	readResults(e.opts.Items, outputChannels, results)
+	readResults(resultChannels, results)
 
 	var err error // TODO: prefer default resp err
 	// TODO: additionally log all panic error types
@@ -351,12 +355,10 @@ func (e *Endpoint) produce(req *http.Request) (producer.ResultMap, error) {
 	return results, err
 }
 
-func readResults(items sequence.List, outputChannels map[string][]chan *producer.Result, beresps producer.ResultMap) {
-	for _, item := range items {
-		for _, outCh := range outputChannels[item.Name] {
-			res := <-outCh
-			beresps[item.Name] = res
-		}
+func readResults(resultChannels map[string]chan *producer.Result, beresps producer.ResultMap) {
+	for name, resultCh := range resultChannels {
+		res := <-resultCh
+		beresps[name] = res
 	}
 }
 

server/http_test.go

@@ -961,6 +961,37 @@ func TestHTTPServer_ServerTiming(t *testing.T) {
 		t.Errorf("Unexpected header from 'second' Couper: %s", s)
 	}
 
+	req, err = http.NewRequest(http.MethodGet, "http://anyserver:9090/seq", nil)
+	helper.Must(err)
+
+	res, err = client.Do(req)
+	helper.Must(err)
+
+	headers = res.Header.Values("Server-Timing")
+	if l := len(headers); l != 2 {
+		t.Fatalf("Unexpected number of headers: %d", 2)
+	}
+
+	dataCouper1 = strings.Split(headers[0], ", ")
+	dataCouper2 = strings.Split(headers[1], ", ")
+
+	sort.Strings(dataCouper1)
+	sort.Strings(dataCouper2)
+
+	if len(dataCouper1) != 2 || len(dataCouper2) != 5 {
+		t.Fatal("Unexpected number of metrics")
+	}
+
+	exp1 = regexp.MustCompile(`b1_total_[0-9a-f]{6};dur=\d+(.\d)* b1_ttfb_[0-9a-f]{6};dur=\d+(.\d)*`)
+	if s := strings.Join(dataCouper1, " "); !exp1.MatchString(s) {
+		t.Errorf("Unexpected header from 'first' Couper: %s", s)
+	}
+
+	exp2 = regexp.MustCompile(`b1_total;dur=\d+(.\d)* b1_ttfb;dur=\d+(.\d)* b2_REQ_tcp;dur=\d+(.\d)* b2_REQ_total;dur=\d+(.\d)* b2_REQ_ttfb;dur=\d+(.\d)*`)
+	if s := strings.Join(dataCouper2, " "); !exp2.MatchString(s) {
+		t.Errorf("Unexpected header from 'second' Couper: %s", s)
+	}
+
 	req, err = http.NewRequest(http.MethodGet, "http://anyserver:9090/empty", nil)
 	helper.Must(err)
 

server/testdata/integration/http/01_couper.hcl

@@ -7,6 +7,12 @@ server "first" {
     }
   }
 
+  endpoint "/seq" {
+    proxy {
+      backend = "b1"
+    }
+  }
+
   endpoint "/empty" {
     response {
       status = 204

server/testdata/integration/http/02_couper.hcl

@@ -4,6 +4,18 @@ server "second" {
       backend = "b1"
     }
 
+    request "REQ" {
+      backend = "b2"
+    }
+  }
+  endpoint "/seq" {
+    proxy {
+      backend = "b1"
+      set_request_headers = {
+        x-req = backend_responses.REQ.status
+      }
+    }
+
     request "REQ" {
       backend = "b2"
     }