MM-23574: Remove Segment. (#14712)
* MM-23574: Eliminate Segment. * Update dependencies. * Fix review suggestions.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
6158e91308
Коммит
e5addef19b
@@ -24,7 +24,6 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
"github.com/rs/cors"
|
||||
rudder "github.com/rudderlabs/analytics-go"
|
||||
analytics "github.com/segmentio/analytics-go"
|
||||
|
||||
"github.com/throttled/throttled"
|
||||
"golang.org/x/crypto/acme/autocert"
|
||||
@@ -132,9 +131,8 @@ type Server struct {
|
||||
clientConfigHash atomic.Value
|
||||
limitedClientConfig atomic.Value
|
||||
|
||||
diagnosticId string
|
||||
diagnosticClient analytics.Client
|
||||
rudderClient rudder.Client
|
||||
diagnosticId string
|
||||
rudderClient rudder.Client
|
||||
|
||||
phase2PermissionsMigrationComplete bool
|
||||
|
||||
@@ -1158,26 +1156,8 @@ func (s *Server) stopSearchEngine() {
|
||||
}
|
||||
}
|
||||
|
||||
// initDiagnostics initialises the Rudder client for the diagnostics system.
|
||||
func (s *Server) initDiagnostics(endpoint string) {
|
||||
if s.diagnosticClient == nil {
|
||||
config := analytics.Config{}
|
||||
config.Logger = analytics.StdLogger(s.Log.StdLog(mlog.String("source", "segment")))
|
||||
// For testing
|
||||
if endpoint != "" {
|
||||
config.Endpoint = endpoint
|
||||
config.Verbose = true
|
||||
config.BatchSize = 1
|
||||
}
|
||||
client, _ := analytics.NewWithConfig(SEGMENT_KEY, config)
|
||||
client.Enqueue(analytics.Identify{
|
||||
UserId: s.diagnosticId,
|
||||
})
|
||||
|
||||
s.diagnosticClient = client
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) initRudder(endpoint string) {
|
||||
if s.rudderClient == nil {
|
||||
config := rudder.Config{}
|
||||
config.Logger = rudder.StdLogger(s.Log.StdLog(mlog.String("source", "rudder")))
|
||||
@@ -1200,24 +1180,13 @@ func (s *Server) initRudder(endpoint string) {
|
||||
}
|
||||
}
|
||||
|
||||
// shutdownDiagnostics closes the diagnostic client.
|
||||
// shutdownDiagnostics closes the diagnostics system Rudder client.
|
||||
func (s *Server) shutdownDiagnostics() error {
|
||||
var segmentErr, rudderErr error
|
||||
if s.diagnosticClient != nil {
|
||||
segmentErr = s.diagnosticClient.Close()
|
||||
}
|
||||
|
||||
if s.rudderClient != nil {
|
||||
rudderErr = s.rudderClient.Close()
|
||||
return s.rudderClient.Close()
|
||||
}
|
||||
|
||||
if segmentErr != nil && rudderErr != nil {
|
||||
return errors.New(fmt.Sprintf("%s, %s", segmentErr.Error(), rudderErr.Error()))
|
||||
} else if segmentErr != nil {
|
||||
return segmentErr
|
||||
}
|
||||
|
||||
return rudderErr
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetHubs returns the list of hubs. This method is safe
|
||||
|
||||
Ссылка в новой задаче
Block a user