From 53a0a0b974f9543770fc8bbc84ef90ca5d97a3b2 Mon Sep 17 00:00:00 2001
From: Gennady Karev <pendolf666@gmail.com>
Date: Sun, 26 Mar 2023 10:03:50 +0600
Subject: [PATCH] fix do not ignore the error as it might be useful for
 upstream middlewares (#2209)

---
 .../github.com/labstack/echo/otelecho/echo.go |  2 +-
 .../labstack/echo/otelecho/test/echo_test.go  | 93 +++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/instrumentation/github.com/labstack/echo/otelecho/echo.go b/instrumentation/github.com/labstack/echo/otelecho/echo.go
index fda5ecbdf69..9599e4fd40a 100644
--- a/instrumentation/github.com/labstack/echo/otelecho/echo.go
+++ b/instrumentation/github.com/labstack/echo/otelecho/echo.go
@@ -102,7 +102,7 @@ func Middleware(service string, opts ...Option) echo.MiddlewareFunc {
 				span.SetAttributes(semconv.HTTPStatusCode(status))
 			}
 
-			return nil
+			return err
 		}
 	}
 }
diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/echo_test.go b/instrumentation/github.com/labstack/echo/otelecho/test/echo_test.go
index e48e52eee09..a12c36e6dc4 100644
--- a/instrumentation/github.com/labstack/echo/otelecho/test/echo_test.go
+++ b/instrumentation/github.com/labstack/echo/otelecho/test/echo_test.go
@@ -137,3 +137,96 @@ func TestError(t *testing.T) {
 	// server errors set the status
 	assert.Equal(t, codes.Error, span.Status().Code)
 }
+
+func TestStatusError(t *testing.T) {
+	for _, tc := range []struct {
+		name       string
+		echoError  string
+		statusCode int
+		spanCode   codes.Code
+		handler    func(c echo.Context) error
+	}{
+		{
+			name:       "StandardError",
+			echoError:  "oh no",
+			statusCode: http.StatusInternalServerError,
+			spanCode:   codes.Error,
+			handler: func(c echo.Context) error {
+				return errors.New("oh no")
+			},
+		},
+		{
+			name:       "EchoHTTPServerError",
+			echoError:  "code=500, message=my error message",
+			statusCode: http.StatusInternalServerError,
+			spanCode:   codes.Error,
+			handler: func(c echo.Context) error {
+				return echo.NewHTTPError(http.StatusInternalServerError, "my error message")
+			},
+		},
+		{
+			name:       "EchoHTTPClientError",
+			echoError:  "code=400, message=my error message",
+			statusCode: http.StatusBadRequest,
+			spanCode:   codes.Unset,
+			handler: func(c echo.Context) error {
+				return echo.NewHTTPError(http.StatusBadRequest, "my error message")
+			},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			assert := assert.New(t)
+			sr := tracetest.NewSpanRecorder()
+			provider := trace.NewTracerProvider(trace.WithSpanProcessor(sr))
+
+			router := echo.New()
+			router.Use(otelecho.Middleware("foobar", otelecho.WithTracerProvider(provider)))
+			router.GET("/err", tc.handler)
+			r := httptest.NewRequest("GET", "/err", nil)
+			w := httptest.NewRecorder()
+			router.ServeHTTP(w, r)
+
+			spans := sr.Ended()
+			require.Len(t, spans, 1)
+			span := spans[0]
+			assert.Equal("/err", span.Name())
+			assert.Equal(tc.spanCode, span.Status().Code)
+
+			attrs := span.Attributes()
+			assert.Contains(attrs, attribute.String("net.host.name", "foobar"))
+			assert.Contains(attrs, attribute.String("http.route", "/err"))
+			assert.Contains(attrs, attribute.String("http.method", "GET"))
+			assert.Contains(attrs, attribute.Int("http.status_code", tc.statusCode))
+			assert.Contains(attrs, attribute.String("echo.error", tc.echoError))
+		})
+	}
+}
+
+func TestErrorNotSwallowedByMiddleware(t *testing.T) {
+	assert := assert.New(t)
+	e := echo.New()
+	r := httptest.NewRequest(http.MethodGet, "/err", nil)
+	w := httptest.NewRecorder()
+	c := e.NewContext(r, w)
+
+	sr := tracetest.NewSpanRecorder()
+	provider := trace.NewTracerProvider(trace.WithSpanProcessor(sr))
+	opts := otelecho.WithTracerProvider(provider)
+	h := otelecho.Middleware("foobar", opts)(echo.HandlerFunc(func(c echo.Context) error {
+		return errors.New("oh no")
+	}))
+
+	err := h(c)
+	assert.Equal(http.StatusInternalServerError, w.Result().StatusCode)
+	assert.EqualError(err, "oh no")
+
+	spans := sr.Ended()
+	require.Len(t, spans, 1)
+	span := spans[0]
+	assert.Equal(codes.Error, span.Status().Code)
+
+	attrs := span.Attributes()
+	assert.Contains(attrs, attribute.String("net.host.name", "foobar"))
+	assert.Contains(attrs, attribute.Int("http.status_code", http.StatusInternalServerError))
+	assert.Contains(attrs, attribute.String("echo.error", "oh no"))
+}