otelecho: config option to skip global error handler call

instrumentation/github.com/labstack/echo/otelecho/config.go

@@ -26,6 +26,7 @@ type config struct {
 	TracerProvider oteltrace.TracerProvider
 	Propagators    propagation.TextMapPropagator
 	Skipper        middleware.Skipper
+	HandleError    bool
 }
 
 // Option specifies instrumentation configuration options.
@@ -66,3 +67,10 @@ func WithSkipper(skipper middleware.Skipper) Option {
 		cfg.Skipper = skipper
 	})
 }
+
+// WithoutHandleError instructs middleware to not call global error handler when next middleware/handler returns an error.
+func WithoutHandleError() Option {
+	return optionFunc(func(cfg *config) {
+		cfg.HandleError = false
+	})
+}

instrumentation/github.com/labstack/echo/otelecho/echo.go

@@ -36,7 +36,9 @@ const (
 
 // Middleware returns echo middleware which will trace incoming requests.
 func Middleware(service string, opts ...Option) echo.MiddlewareFunc {
-	cfg := config{}
+	cfg := config{
+		HandleError: true,
+	}
 	for _, opt := range opts {
 		opt.apply(&cfg)
 	}
@@ -92,8 +94,10 @@ func Middleware(service string, opts ...Option) echo.MiddlewareFunc {
 			err := next(c)
 			if err != nil {
 				span.SetAttributes(attribute.String("echo.error", err.Error()))
-				// invokes the registered HTTP error handler
-				c.Error(err)
+				if cfg.HandleError {
+					// invokes the registered HTTP error handler
+					c.Error(err)
+				}
 			}
 
 			status := c.Response().Status

instrumentation/github.com/labstack/echo/otelecho/echo_test.go

@@ -128,3 +128,47 @@ func TestSkipper(t *testing.T) {
 	router.ServeHTTP(w, r)
 	assert.Equal(t, http.StatusOK, w.Result().StatusCode, "should call the 'ping' handler")
 }
+
+func TestHandleErrorDefault(t *testing.T) {
+	r := httptest.NewRequest("GET", "/ping", nil)
+	w := httptest.NewRecorder()
+
+	router := echo.New()
+	router.Use(Middleware("foobar"))
+	router.GET("/ping", func(c echo.Context) error {
+		return assert.AnError
+	})
+
+	handlerCalled := 0
+	router.HTTPErrorHandler = func(err error, c echo.Context) {
+		handlerCalled++
+		assert.ErrorIs(t, err, assert.AnError, "test error is expected in error handler")
+		assert.NoError(t, c.NoContent(http.StatusTeapot))
+	}
+
+	router.ServeHTTP(w, r)
+	assert.Equal(t, http.StatusTeapot, w.Result().StatusCode, "should call the 'ping' handler")
+	assert.Equal(t, 2, handlerCalled, "global error handler is called twice")
+}
+
+func TestWithoutHandleError(t *testing.T) {
+	r := httptest.NewRequest("GET", "/ping", nil)
+	w := httptest.NewRecorder()
+
+	router := echo.New()
+	router.Use(Middleware("foobar", WithoutHandleError()))
+	router.GET("/ping", func(c echo.Context) error {
+		return assert.AnError
+	})
+
+	handlerCalled := 0
+	router.HTTPErrorHandler = func(err error, c echo.Context) {
+		handlerCalled++
+		assert.ErrorIs(t, err, assert.AnError, "test error is expected in error handler")
+		assert.NoError(t, c.NoContent(http.StatusTeapot))
+	}
+
+	router.ServeHTTP(w, r)
+	assert.Equal(t, http.StatusTeapot, w.Result().StatusCode, "should call the 'ping' handler")
+	assert.Equal(t, 1, handlerCalled, "global error handler is called once")
+}