Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gateway/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (tr TraceMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Request,

span := otel.SpanFromContext(r.Context())
err, i := tr.TykMiddleware.ProcessRequest(w, r, conf)
if err != nil && span != nil {
if err != nil && span != nil && !errors.Is(err, ErrResponseSucceed) {
span.SetStatus(otel.SPAN_STATUS_ERROR, err.Error())
}

Expand Down
75 changes: 75 additions & 0 deletions gateway/middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package gateway
import (
"context"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net/http"
Expand All @@ -16,6 +17,9 @@ import (
logrustest "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/otel/codes"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"go.uber.org/mock/gomock"

"github.com/TykTechnologies/opentelemetry/metric/metrictest"
Expand Down Expand Up @@ -51,6 +55,20 @@ type requestConditionalMiddleware struct {
calls int
}

type traceStatusMiddleware struct {
*BaseMiddleware
err error
}

func (m *traceStatusMiddleware) Name() string {
return "traceStatusMiddleware"
}

//nolint:staticcheck // ST1008: middleware interface requires (error, int).
func (m *traceStatusMiddleware) ProcessRequest(http.ResponseWriter, *http.Request, interface{}) (error, int) {
return m.err, http.StatusOK
}

func (m *requestConditionalMiddleware) Name() string {
return "requestConditionalMiddleware"
}
Expand All @@ -61,6 +79,63 @@ func (m *requestConditionalMiddleware) ProcessRequest(http.ResponseWriter, *http
return nil, http.StatusOK
}

func TestTraceMiddlewareProcessRequestSpanStatus(t *testing.T) {
tests := []struct {
name string
err error
wantStatus codes.Code
}{
{
name: "successful response sentinel",
err: ErrResponseSucceed,
wantStatus: codes.Unset,
},
{
name: "wrapped successful response sentinel",
err: fmt.Errorf("plugin response: %w", ErrResponseSucceed),
wantStatus: codes.Unset,
},
{
name: "plugin error response sentinel",
err: fmt.Errorf("%w: status 400", ErrResponseErrorSent),
wantStatus: codes.Error,
},
{
name: "regular error",
err: errors.New("middleware failed"),
wantStatus: codes.Error,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
recorder := tracetest.NewSpanRecorder()
tracerProvider := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(recorder))
t.Cleanup(func() {
require.NoError(t, tracerProvider.Shutdown(context.Background()))
})

ctx, span := tracerProvider.Tracer("test").Start(t.Context(), "request")
conf := config.Config{}
conf.OpenTelemetry.Enabled = true
gw := NewGateway(conf, t.Context())
mw := TraceMiddleware{TykMiddleware: &traceStatusMiddleware{
BaseMiddleware: &BaseMiddleware{Gw: gw},
err: tt.err,
}}

req := httptest.NewRequest(http.MethodGet, "/", nil).WithContext(ctx)
gotErr, _ := mw.ProcessRequest(httptest.NewRecorder(), req, nil)
require.ErrorIs(t, gotErr, tt.err)
span.End()

ended := recorder.Ended()
require.Len(t, ended, 1)
assert.Equal(t, tt.wantStatus, ended[0].Status().Code)
})
}
}

func (m mockStore) SessionDetail(orgID string, keyName string, hashed bool) (user.SessionState, bool) {
return sess.Clone(), !m.DetailNotFound
}
Expand Down