Skip to content

fix: fix trace middleware http writer #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 31, 2023
Merged

fix: fix trace middleware http writer #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0211c8a
improve trace middleware writer
pulak-opti Oct 26, 2023
1cf0cdf
fix failing acceptance test
pulak-opti Oct 26, 2023
a78adfb
fix bug
pulak-opti Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions pkg/middleware/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"net/http"
"sync"

"github.com/go-chi/chi/v5/middleware"
"github.com/optimizely/agent/config"
"github.com/rs/zerolog/log"
"go.opentelemetry.io/otel"
Expand Down Expand Up @@ -80,16 +81,6 @@ func (gen *traceIDGenerator) NewIDs(ctx context.Context) (trace.TraceID, trace.S
return tid, sid
}

type statusRecorder struct {
http.ResponseWriter
statusCode int
}

func (r *statusRecorder) WriteHeader(code int) {
r.statusCode = code
r.ResponseWriter.WriteHeader(code)
}

func AddTracing(conf config.TracingConfig, tracerName, spanName string) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
fn := func(w http.ResponseWriter, r *http.Request) {
Expand All @@ -107,15 +98,12 @@ func AddTracing(conf config.TracingConfig, tracerName, spanName string) func(htt
attribute.String(OptlySDKHeader, r.Header.Get(OptlySDKHeader)),
)

rec := &statusRecorder{
ResponseWriter: w,
statusCode: http.StatusOK,
}
respWriter := middleware.NewWrapResponseWriter(w, r.ProtoMajor)

next.ServeHTTP(rec, r.WithContext(ctx))
next.ServeHTTP(respWriter, r.WithContext(ctx))

span.SetAttributes(
semconv.HTTPStatusCodeKey.Int(rec.statusCode),
semconv.HTTPStatusCodeKey.Int(respWriter.Status()),
)
}
return http.HandlerFunc(fn)
Expand Down
3 changes: 2 additions & 1 deletion tests/acceptance/test_acceptance/test_odp_redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def test_redis_save(session_override_sdk_key_odp):
"""

expected_segments = ["atsbugbashsegmenthaspurchased", "atsbugbashsegmentdob"]
expected_segments_rev = ["atsbugbashsegmentdob", "atsbugbashsegmenthaspurchased"]
uId = "fs_user_id-$-matjaz-user-1"
r = redis.Redis(host='localhost', port=6379, db=0)
# clean redis before testing since several tests use same user_id
Expand All @@ -72,7 +73,7 @@ def test_redis_save(session_override_sdk_key_odp):
params=params)

# Check saved segments
assert json.loads(json.dumps(expected_segments)) == json.loads(r.get(uId))
assert json.loads(json.dumps(expected_segments)) == json.loads(r.get(uId)) or json.loads(json.dumps(expected_segments_rev)) == json.loads(r.get(uId))

assert json.loads(json.dumps(expected_redis_save)) == resp.json()
assert resp.status_code == 200, resp.text
Expand Down