Merge branch 'master' into lua_upgrade

krakend · Oct 30, 2024 · d0f25cb · d0f25cb
2 parents 2723911 + 98eaf8e
commit d0f25cb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/executor.go b/executor.go
@@ -200,6 +200,10 @@ func (e *ExecutorBuilder) NewCmdExecutor(ctx context.Context) cmd.Executor {
 
 		bpf := e.BackendFactory.NewBackendFactory(ctx, logger, metricCollector)
 		pf := e.ProxyFactory.NewProxyFactory(logger, bpf, metricCollector)
+		// we move the proxy factory out of the default proxy factory to make
+		// sure that is always the outer middleware and that wraps any internal
+		// proxy layer middleware:
+		pf = otellura.ProxyFactory(pf)
 
 		agentPing := make(chan string, len(cfg.AsyncAgents))
 

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.22
 require (
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-contrib/uuid v1.2.0
-	github.com/krakend/krakend-otel v0.6.1
+	github.com/krakend/krakend-otel v0.6.2
 	github.com/krakendio/bloomfilter/v2 v2.0.4
 	github.com/krakendio/krakend-amqp/v2 v2.1.0
 	github.com/krakendio/krakend-audit v0.0.7

diff --git a/go.sum b/go.sum
@@ -465,10 +465,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/krakend/go-auth0/v2 v2.0.1 h1:Ve73eo/rUo1NK/GrzOeWSuVdweGHY2sGU52NYdp73iU=
 github.com/krakend/go-auth0/v2 v2.0.1/go.mod h1:jaMs1/YcOmZYRUPBvk/nrhABJv/XkrUJGA2eywOUFRA=
-github.com/krakend/krakend-otel v0.6.1 h1:0+F/2aq/BATDUiMTSPGAJ6CwRX/xnn0OLu1V1WQfRF4=
-github.com/krakend/krakend-otel v0.6.1/go.mod h1:8Q6FfeY1S6RHMO/5/s0B+JJ1AEGDTJZHYtpmF1a+USA=
 github.com/krakendio/binder v0.0.0-20241024141510-eeb24543bdb1 h1:hurbmtCzGrwV98WPHXR+D/pzHOkyYy+n4GEpKKA2MG0=
 github.com/krakendio/binder v0.0.0-20241024141510-eeb24543bdb1/go.mod h1:CYIubvHjRQrAM2JZn4pv/Whrmo57K2cHOv2jLVQk4aI=
+github.com/krakend/krakend-otel v0.6.2 h1:jvSxVMo7ckPgNUQUNjOVT/+GKnw7I6QXwwWLvzFcbLQ=
+github.com/krakend/krakend-otel v0.6.2/go.mod h1:8Q6FfeY1S6RHMO/5/s0B+JJ1AEGDTJZHYtpmF1a+USA=
 github.com/krakendio/bloomfilter/v2 v2.0.4 h1:+FCe52Izx4mZgFevvifOMF+3WbbhmZT0xZnrnUE4C0U=
 github.com/krakendio/bloomfilter/v2 v2.0.4/go.mod h1:BH9pmOLLllSAvtjuwA2Ythd7RE3lQdNr1sHK3f2dJok=
 github.com/krakendio/flatmap v1.1.1 h1:rGBNVpBY0pMk6cLOwerVzoKY4HELnpu0xvqB231lOCQ=

diff --git a/proxy_factory.go b/proxy_factory.go
@@ -3,7 +3,6 @@ package krakend
 import (
 	"fmt"
 
-	otellura "github.com/krakend/krakend-otel/lura"
 	cel "github.com/krakendio/krakend-cel/v2"
 	jsonschema "github.com/krakendio/krakend-jsonschema/v2"
 	lua "github.com/krakendio/krakend-lua/v2/proxy"
@@ -24,7 +23,6 @@ func internalNewProxyFactory(logger logging.Logger, backendFactory proxy.Backend
 	proxyFactory = lua.ProxyFactory(logger, proxyFactory)
 	proxyFactory = metricCollector.ProxyFactory("pipe", proxyFactory)
 	proxyFactory = opencensus.ProxyFactory(proxyFactory)
-	proxyFactory = otellura.ProxyFactory(proxyFactory)
 	return proxyFactory
 }