Skip to content

Commit efd78ac

Browse files
authored
Merge branch 'main' into issue-1693-filter-span
2 parents 4d4a87d + 3b9d93b commit efd78ac

6 files changed

Lines changed: 28 additions & 4 deletions

File tree

.github/workflows/ci-pr-checks.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ jobs:
363363
E2E_LABEL_FILTER: ${{ matrix.suite.label-filter }}
364364
PULL_SIDECAR_IMAGE: "false"
365365
PULL_VLLM_RENDER_IMAGE: "false"
366+
HF_TOKEN: ${{ secrets.HF_TOKEN }}
366367
run: make test-e2e-gaie-run
367368

368369
e2e-router:
@@ -450,4 +451,5 @@ jobs:
450451
E2E_LABEL_FILTER: ${{ matrix.suite.label-filter }}
451452
LOAD_VLLM_RENDER_IMAGE: ${{ matrix.suite.needs-renderer }}
452453
PULL_VLLM_RENDER_IMAGE: "false"
454+
HF_TOKEN: ${{ secrets.HF_TOKEN }}
453455
run: make test-e2e-router-run

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ endif
122122
# Should we pass ALL env vars here?
123123
E2E_ENV_VARS = EPP_IMAGE VLLM_IMAGE SIDECAR_IMAGE VLLM_RENDER_IMAGE \
124124
E2E_KEEP_CLUSTER_ON_FAILURE E2E_PORT E2E_METRICS_PORT K8S_CONTEXT READY_TIMEOUT \
125-
E2E_LABEL_FILTER LOAD_VLLM_RENDER_IMAGE
125+
E2E_LABEL_FILTER LOAD_VLLM_RENDER_IMAGE HF_TOKEN
126126
BUILDER_E2E_ENV_FLAGS = $(foreach v,$(E2E_ENV_VARS),$(if $($(v)),-e '$(v)=$($(v))'))
127127
ifneq ($(filter command line environment,$(origin NAMESPACE)),)
128128
BUILDER_E2E_ENV_FLAGS += -e NAMESPACE=$(NAMESPACE)

release-notes.d/unreleased/1616.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
pr: 1616
3+
url: https://github.com/llm-d/llm-d-router/pull/1616
4+
author: jtechapps
5+
date: 2026-06-18
6+
---
7+
Added EPP operations guide.

release-notes.d/unreleased/1667.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
pr: 1667
3+
url: https://github.com/llm-d/llm-d-router/pull/1667
4+
author: gyliu513
5+
date: 2026-06-18
6+
---
7+
Fix P/D sidecar trace propagation so prefill, decode, and encoder requests inject W3C trace context, keeping EPP, routing-proxy, and vLLM spans in a single trace

test/e2e/setup_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"io"
66
"net/http"
7+
"os"
78
"strconv"
89
"time"
910

@@ -31,7 +32,7 @@ func createModelServersFromKustomize(kustomizeDir string, extra map[string]strin
3132
"${DECODE_ROLE}": "",
3233
"${EPP_NAME}": "e2e-epp",
3334
"${NAMESPACE}": nsName,
34-
"${HF_TOKEN}": "",
35+
"${HF_TOKEN}": os.Getenv("HF_TOKEN"),
3536
"${VLLM_EXTRA_ARGS_E}": "",
3637
"${VLLM_EXTRA_ARGS_P}": "",
3738
"${VLLM_EXTRA_ARGS_D}": "",

test/e2e/utils_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"fmt"
77
"io"
88
"net/http"
9+
"os"
910
"os/exec"
1011
"strconv"
1112
"strings"
@@ -193,9 +194,15 @@ func removeEmptyLabels(inputs []string) []string {
193194
}
194195

195196
func isModelReal(modelName string) bool {
196-
url := "https://huggingface.co/api/models/" + modelName
197+
req, err := http.NewRequest("GET", "https://huggingface.co/api/models/"+modelName, nil)
198+
if err != nil {
199+
return false
200+
}
201+
if token := os.Getenv("HF_TOKEN"); token != "" {
202+
req.Header.Set("Authorization", "Bearer "+token)
203+
}
197204

198-
resp, err := http.Get(url)
205+
resp, err := http.DefaultClient.Do(req)
199206
if err != nil {
200207
return false
201208
}

0 commit comments

Comments
 (0)