Skip to content

Commit

Permalink
fix: [2.4] Pass otlpSecure config when setup segcore tracing (milvu…
Browse files Browse the repository at this point in the history
…s-io#34193) (milvus-io#34210)

Cherry-pick from master
pr: milvus-io#34193
See also milvus-io#34192

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
  • Loading branch information
congqixia committed Jun 27, 2024
1 parent f741bb7 commit 88766bb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions internal/util/initcore/init_core.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ func InitTraceConfig(params *paramtable.ComponentParam) {
exporter := C.CString(params.TraceCfg.Exporter.GetValue())
jaegerURL := C.CString(params.TraceCfg.JaegerURL.GetValue())
endpoint := C.CString(params.TraceCfg.OtlpEndpoint.GetValue())
otlpSecure := params.TraceCfg.OtlpSecure.GetAsBool()
defer C.free(unsafe.Pointer(exporter))
defer C.free(unsafe.Pointer(jaegerURL))
defer C.free(unsafe.Pointer(endpoint))
Expand All @@ -61,6 +62,7 @@ func InitTraceConfig(params *paramtable.ComponentParam) {
sampleFraction: sampleFraction,
jaegerURL: jaegerURL,
otlpEndpoint: endpoint,
oltpSecure: (C.bool)(otlpSecure),
nodeID: nodeID,
}
// oltp grpc may hangs forever, add timeout logic at go side
Expand All @@ -78,6 +80,7 @@ func ResetTraceConfig(params *paramtable.ComponentParam) {
exporter := C.CString(params.TraceCfg.Exporter.GetValue())
jaegerURL := C.CString(params.TraceCfg.JaegerURL.GetValue())
endpoint := C.CString(params.TraceCfg.OtlpEndpoint.GetValue())
otlpSecure := params.TraceCfg.OtlpSecure.GetAsBool()
defer C.free(unsafe.Pointer(exporter))
defer C.free(unsafe.Pointer(jaegerURL))
defer C.free(unsafe.Pointer(endpoint))
Expand All @@ -87,6 +90,7 @@ func ResetTraceConfig(params *paramtable.ComponentParam) {
sampleFraction: sampleFraction,
jaegerURL: jaegerURL,
otlpEndpoint: endpoint,
oltpSecure: (C.bool)(otlpSecure),
nodeID: nodeID,
}

Expand Down

0 comments on commit 88766bb

Please sign in to comment.