diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index ec552fb9ca..71f2127da1 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -38,11 +38,12 @@ class MilvusConan(ConanFile): "prometheus-cpp/1.1.0", "re2/20230301", "folly/2023.10.30.08@milvus/dev", - "google-cloud-cpp/2.5.0@milvus/dev", - "opentelemetry-cpp/1.8.1.1@milvus/dev", + "google-cloud-cpp/2.5.0@milvus/2.4#b8dda0943d40adee69d7adc5fafc317d", + "opentelemetry-cpp/1.8.3@milvus/2.4#3b8139532791a163c8ff2819c55eb4ac", "librdkafka/1.9.1", "abseil/20230125.3", "roaring/3.0.0", + "grpc/1.54.3@milvus/dev#5dfb5e1477b22c6d1e6d6b90ab5501d8", ) generators = ("cmake", "cmake_find_package") default_options = { @@ -76,6 +77,7 @@ class MilvusConan(ConanFile): "fmt:header_only": True, "onetbb:tbbmalloc": False, "onetbb:tbbproxy": False, + "grpc:shared": True, } def configure(self): diff --git a/internal/util/initcore/init_core_test.go b/internal/util/initcore/init_core_test.go index 15d1b089a8..57f6f45bd9 100644 --- a/internal/util/initcore/init_core_test.go +++ b/internal/util/initcore/init_core_test.go @@ -41,7 +41,7 @@ func TestOtlpHang(t *testing.T) { defer paramtable.Get().Reset(paramtable.Get().TraceCfg.Exporter.Key) defer paramtable.Get().Reset(paramtable.Get().TraceCfg.InitTimeoutSeconds.Key) - assert.Panics(t, func() { + assert.NotPanics(t, func() { ResetTraceConfig(paramtable.Get()) }) }