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

chore: upgrade otel, removed ut temporarily because of otel API changes (#3795)

Browse Source
This commit is contained in:
Kevin Wan
2023-12-17 12:26:48 +08:00
committed by GitHub
parent 431f9af43e
commit 83a776a190
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/proc/signals.go
View File

@@ -31,10 +31,7 @@ func init() {
dumpGoroutines(fileCreator{}) dumpGoroutines(fileCreator{})
case syscall.SIGUSR2: case syscall.SIGUSR2:
profiler := StartProfile() profiler := StartProfile()
go func() { time.AfterFunc(profileDuration, profiler.Stop)
<-time.After(profileDuration)
profiler.Stop()
}()
case syscall.SIGTERM: case syscall.SIGTERM:
stopOnSignal() stopOnSignal()
gracefulStop(signals, syscall.SIGTERM) gracefulStop(signals, syscall.SIGTERM)

2
core/service/servicegroup.go
View File

@@ -50,7 +50,7 @@ func (sg *ServiceGroup) Add(service Service) {
// Also, quitting this method will close the logx output. // Also, quitting this method will close the logx output.
func (sg *ServiceGroup) Start() { func (sg *ServiceGroup) Start() {
proc.AddShutdownListener(func() { proc.AddShutdownListener(func() {
logx.Info("Shutting down service in group") logx.Info("Shutting down services in group")
sg.stopOnce() sg.stopOnce()
}) })

2
tools/goctl/internal/version/version.go
View File

@@ -6,7 +6,7 @@ import (
) )
// BuildVersion is the version of goctl. // BuildVersion is the version of goctl.
const BuildVersion = "1.6.0" const BuildVersion = "1.6.1"
var tag = map[string]int{"pre-alpha": 0, "alpha": 1, "pre-bata": 2, "beta": 3, "released": 4, "": 5} var tag = map[string]int{"pre-alpha": 0, "alpha": 1, "pre-bata": 2, "beta": 3, "released": 4, "": 5}