zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use sdktrace instead of trace for opentelemetry to avoid conflicts (#1005)

Browse Source 
* use sdktrace instead of trace for opentelemetry to avoid conflicts

* disable opentelemetry for right now
This commit is contained in:
Kevin Wan
2021-09-07 12:02:41 +08:00
committed by GitHub
parent bc92b57bdb
commit bdec5f2349
6 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/service/serviceconf.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/tal-tech/go-zero/core/logx"
"github.com/tal-tech/go-zero/core/prometheus"
"github.com/tal-tech/go-zero/core/stat"
"github.com/tal-tech/go-zero/core/trace/opentelemetry"
)
const (
@@ -27,10 +26,11 @@ const (
type ServiceConf struct {
Name string
Log logx.LogConf
Mode string `json:",default=pro,options=dev|test|rt|pre|pro"`
MetricsUrl string `json:",optional"`
Prometheus prometheus.Config `json:",optional"`
Telemetry opentelemetry.Config `json:",optional"`
Mode string `json:",default=pro,options=dev|test|rt|pre|pro"`
MetricsUrl string `json:",optional"`
Prometheus prometheus.Config `json:",optional"`
// TODO: enable it in v1.2.1
// Telemetry opentelemetry.Config `json:",optional"`
}
// MustSetUp sets up the service, exits on error.
@@ -45,16 +45,18 @@ func (sc ServiceConf) SetUp() error {
if len(sc.Log.ServiceName) == 0 {
sc.Log.ServiceName = sc.Name
}
if len(sc.Telemetry.Name) == 0 {
sc.Telemetry.Name = sc.Name
}
if err := logx.SetUp(sc.Log); err != nil {
return err
}
sc.initMode()
prometheus.StartAgent(sc.Prometheus)
opentelemetry.StartAgent(sc.Telemetry)
// TODO: enable it in v1.2.1
// if len(sc.Telemetry.Name) == 0 {
// sc.Telemetry.Name = sc.Name
// }
// opentelemetry.StartAgent(sc.Telemetry)
if len(sc.MetricsUrl) > 0 {
stat.SetReportWriter(stat.NewRemoteWriter(sc.MetricsUrl))