diff --git a/cmd/layotto/main.go b/cmd/layotto/main.go index 1ef8f39a18..5add5a8de4 100644 --- a/cmd/layotto/main.go +++ b/cmd/layotto/main.go @@ -22,6 +22,8 @@ import ( "strconv" "time" + mosn_jaeger "mosn.io/mosn/pkg/trace/jaeger" + "github.com/dapr/components-contrib/secretstores" "github.com/dapr/components-contrib/secretstores/aws/parameterstore" "github.com/dapr/components-contrib/secretstores/aws/secretmanager" @@ -516,7 +518,7 @@ func ExtensionsRegister(_ *cli.Context) { trace.RegisterTracerBuilder("SOFATracer", protocol.HTTP1, tracehttp.NewTracer) trace.RegisterTracerBuilder("SOFATracer", lprotocol.Layotto, diagnostics.NewTracer) trace.RegisterTracerBuilder(skywalking.SkyDriverName, lprotocol.Layotto, lsky.NewGrpcSkyTracer) - trace.RegisterTracerBuilder("Jaeger", lprotocol.Layotto, jaeger.NewGrpcJaegerTracer) + trace.RegisterTracerBuilder(mosn_jaeger.DriverName, lprotocol.Layotto, jaeger.NewGrpcJaegerTracer) } func main() { diff --git a/cmd/layotto_multiple_api/main.go b/cmd/layotto_multiple_api/main.go index 79f6cdbf99..696d73a9a3 100644 --- a/cmd/layotto_multiple_api/main.go +++ b/cmd/layotto_multiple_api/main.go @@ -31,6 +31,7 @@ import ( sercetstores_kubernetes "github.com/dapr/components-contrib/secretstores/kubernetes" secretstore_env "github.com/dapr/components-contrib/secretstores/local/env" secretstore_file "github.com/dapr/components-contrib/secretstores/local/file" + mosn_jaeger "mosn.io/mosn/pkg/trace/jaeger" secretstores_loader "mosn.io/layotto/pkg/runtime/secretstores" @@ -529,8 +530,7 @@ func ExtensionsRegister(_ *cli.Context) { trace.RegisterTracerBuilder("SOFATracer", protocol.HTTP1, tracehttp.NewTracer) trace.RegisterTracerBuilder("SOFATracer", "layotto", diagnostics.NewTracer) trace.RegisterTracerBuilder(skywalking.SkyDriverName, lprotocol.Layotto, lsky.NewGrpcSkyTracer) - trace.RegisterTracerBuilder("Jaeger", lprotocol.Layotto, jaeger.NewGrpcJaegerTracer) - + trace.RegisterTracerBuilder(mosn_jaeger.DriverName, lprotocol.Layotto, jaeger.NewGrpcJaegerTracer) } func main() { diff --git a/etc/script/test-quickstart.sh b/etc/script/test-quickstart.sh index 0bfb3818f2..63d54142c3 100755 --- a/etc/script/test-quickstart.sh +++ b/etc/script/test-quickstart.sh @@ -66,9 +66,9 @@ release_resource() { # remove containers keywords="redis skywalking hangzhouzk minio" for key in ${keywords}; do - if [ $(docker container ls | grep $key | wc -l) -gt 0 ]; then + if [ $(docker container ls -a | grep $key | wc -l) -gt 0 ]; then echo "Deleting containers of $key : " $to_delete - docker rm -f $(docker container ls | grep $key | awk '{ print $1 }') + docker rm -f $(docker container ls -a | grep $key | awk '{ print $1 }') fi done }