Skip to content

Commit

Permalink
Merge 2b272c2 into b34c787
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghostec
ghostec committed Sep 26, 2018
2 parents b34c787 + 2b272c2 commit 3466544
Show file tree
Hide file tree
Showing 26 changed files with 253 additions and 75 deletions.
7 changes: 6 additions & 1 deletion Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/response_time_middleware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (m *ResponseTimeMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reques
m.next.ServeHTTP(writerWrapper, r)

routeName, _ := mux.CurrentRoute(r).GetPathTemplate()
reporters.Report(reportersConstants.EventHTTPResponseTime, map[string]string{
reporters.Report(reportersConstants.EventHTTPResponseTime, map[string]interface{}{
reportersConstants.TagRoute: routeName,
reportersConstants.TagResponseTime: time.Now().Sub(start).String(),
reportersConstants.TagHTTPStatus: writerWrapper.Status(),
Expand Down
7 changes: 7 additions & 0 deletions api/scheduler_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"time"

maestroErrors "github.com/topfreegames/maestro/errors"
"github.com/topfreegames/maestro/reporters"
reportersConstants "github.com/topfreegames/maestro/reporters/constants"
yaml "gopkg.in/yaml.v2"

"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -182,6 +184,11 @@ func (g *SchedulerUpdateHandler) update(
"status": status,
}).Error("error updating scheduler config")
}
reporters.Report(reportersConstants.EventSchedulerUpdate, map[string]interface{}{
"name": configYaml.Name,
"game": configYaml.Game,
"error": err,
})
finishOpErr := mr.WithSegment(models.SegmentPipeExec, func() error {
return operationManager.Finish(status, description, err)
})
Expand Down
2 changes: 1 addition & 1 deletion eventforwarder/forward.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func reportRPCStatus(

game := scheduler.ConfigYAML.Game

status := map[string]string{
status := map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down
14 changes: 7 additions & 7 deletions eventforwarder/forward_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var _ = Describe("Forward", func() {
metadata,
).Return(int32(200), "success", nil)

mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]string{
mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
reportersConstants.TagGame: gameName,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down Expand Up @@ -75,7 +75,7 @@ var _ = Describe("Forward", func() {
metadata,
).Return(int32(200), "success", nil)

mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]string{
mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
reportersConstants.TagGame: gameName,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down Expand Up @@ -120,7 +120,7 @@ var _ = Describe("Forward", func() {
metadata,
).Return(int32(0), "", errors.New(errMsg))

mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]string{
mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
reportersConstants.TagGame: gameName,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down Expand Up @@ -230,7 +230,7 @@ game: game
metadata,
)

mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]string{
mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
reportersConstants.TagGame: gameName,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down Expand Up @@ -270,7 +270,7 @@ game: game
metadata,
).Return(int32(0), "", errors.New(errMsg))

mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]string{
mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
reportersConstants.TagGame: gameName,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down Expand Up @@ -309,7 +309,7 @@ game: game
metadata,
)

mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]string{
mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
reportersConstants.TagGame: gameName,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down Expand Up @@ -347,7 +347,7 @@ game: game

mockReporter.EXPECT().Report(reportersConstants.EventRPCDuration, gomock.Any())

mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]string{
mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
reportersConstants.TagGame: gameName,
reportersConstants.TagScheduler: schedulerName,
reportersConstants.TagHostname: Hostname(),
Expand Down
10 changes: 5 additions & 5 deletions migrations/migrations.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions models/dogstatsd_metrics_reporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (r *DogStatsdMetricsReporter) StartSegment(name string) map[string]interfac
func (r *DogStatsdMetricsReporter) EndSegment(data map[string]interface{}, name string) {
elapsedTime := time.Now().Sub(data["startTime"].(time.Time)).String()
segment := data["segment"].(string)
tags := map[string]string{
tags := map[string]interface{}{
reportersConstants.TagResponseTime: elapsedTime,
reportersConstants.TagScheduler: r.Scheduler,
reportersConstants.TagSegment: segment,
Expand Down Expand Up @@ -66,7 +66,7 @@ func (r *DogStatsdMetricsReporter) EndDatastoreSegment(data map[string]interface
datastore := data["datastore"].(string)
operation := data["operation"].(string)
table := data["table"].(string)
tags := map[string]string{
tags := map[string]interface{}{
reportersConstants.TagResponseTime: elapsedTime,
reportersConstants.TagScheduler: r.Scheduler,
reportersConstants.TagSegment: strings.ToLower(fmt.Sprintf("%s/%s", datastore, operation)),
Expand All @@ -91,7 +91,7 @@ func (r *DogStatsdMetricsReporter) StartExternalSegment(url string) map[string]i
//EndExternalSegment stops segment
func (r *DogStatsdMetricsReporter) EndExternalSegment(data map[string]interface{}) {
elapsedTime := time.Now().Sub(data["startTime"].(time.Time)).String()
tags := map[string]string{
tags := map[string]interface{}{
reportersConstants.TagResponseTime: elapsedTime,
reportersConstants.TagScheduler: r.Scheduler,
reportersConstants.TagSegment: data["segment"].(string),
Expand Down
26 changes: 13 additions & 13 deletions models/game_room_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ var _ = Describe("GameRoomManagement", func() {
mockRedisClient.EXPECT().HGetAll(gomock.Any()).Return(goredis.NewStringStringMapResult(map[string]string{
"not": "empty",
}, nil)).AnyTimes()
mr.EXPECT().Report("gru.status", map[string]string{
mr.EXPECT().Report("gru.status", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
"status": models.StatusCreating,
"gauge": "2",
})
mr.EXPECT().Report("gru.new", map[string]string{
mr.EXPECT().Report("gru.new", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
})
Expand Down Expand Up @@ -264,13 +264,13 @@ var _ = Describe("GameRoomManagement", func() {
mockRedisClient.EXPECT().HGetAll(gomock.Any()).Return(goredis.NewStringStringMapResult(map[string]string{
"not": "empty",
}, nil)).AnyTimes()
mr.EXPECT().Report("gru.status", map[string]string{
mr.EXPECT().Report("gru.status", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
"status": models.StatusCreating,
"gauge": "2",
})
mr.EXPECT().Report("gru.new", map[string]string{
mr.EXPECT().Report("gru.new", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
})
Expand All @@ -286,7 +286,7 @@ var _ = Describe("GameRoomManagement", func() {
)
Expect(err).NotTo(HaveOccurred())

mr.EXPECT().Report("gru.delete", map[string]string{
mr.EXPECT().Report("gru.delete", map[string]interface{}{
reportersConstants.TagGame: "pong",
reportersConstants.TagScheduler: "pong-free-for-all",
reportersConstants.TagReason: "deletion_reason",
Expand Down Expand Up @@ -327,13 +327,13 @@ var _ = Describe("GameRoomManagement", func() {
mockRedisClient.EXPECT().HGetAll(gomock.Any()).Return(goredis.NewStringStringMapResult(map[string]string{
"not": "empty",
}, nil)).AnyTimes()
mr.EXPECT().Report("gru.status", map[string]string{
mr.EXPECT().Report("gru.status", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
"status": models.StatusCreating,
"gauge": "2",
})
mr.EXPECT().Report("gru.new", map[string]string{
mr.EXPECT().Report("gru.new", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
})
Expand Down Expand Up @@ -436,17 +436,17 @@ var _ = Describe("GameRoomManagement", func() {
mockRedisClient.EXPECT().HGetAll(gomock.Any()).Return(goredis.NewStringStringMapResult(map[string]string{
"not": "empty",
}, nil)).AnyTimes()
mr.EXPECT().Report("gru.status", map[string]string{
mr.EXPECT().Report("gru.status", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
"status": models.StatusCreating,
"gauge": "2",
})
mr.EXPECT().Report("gru.new", map[string]string{
mr.EXPECT().Report("gru.new", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
})
mr.EXPECT().Report("gru.delete", map[string]string{
mr.EXPECT().Report("gru.delete", map[string]interface{}{
reportersConstants.TagGame: "pong",
reportersConstants.TagScheduler: "pong-free-for-all",
reportersConstants.TagReason: "failed_to_create_service_for_pod",
Expand Down Expand Up @@ -496,13 +496,13 @@ var _ = Describe("GameRoomManagement", func() {
mockRedisClient.EXPECT().HGetAll(gomock.Any()).Return(goredis.NewStringStringMapResult(map[string]string{
"not": "empty",
}, nil)).AnyTimes()
mr.EXPECT().Report("gru.status", map[string]string{
mr.EXPECT().Report("gru.status", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
"status": models.StatusCreating,
"gauge": "2",
})
mr.EXPECT().Report("gru.new", map[string]string{
mr.EXPECT().Report("gru.new", map[string]interface{}{
reportersConstants.TagGame: game,
reportersConstants.TagScheduler: namespace,
})
Expand All @@ -518,7 +518,7 @@ var _ = Describe("GameRoomManagement", func() {
)
Expect(err).NotTo(HaveOccurred())

mr.EXPECT().Report("gru.delete", map[string]string{
mr.EXPECT().Report("gru.delete", map[string]interface{}{
reportersConstants.TagGame: "pong",
reportersConstants.TagScheduler: "pong-free-for-all",
reportersConstants.TagReason: "deletion_reason",
Expand Down
2 changes: 1 addition & 1 deletion models/namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (n *Namespace) DeletePods(clientset kubernetes.Interface,
}

for range pods.Items {
reporters.Report(reportersConstants.EventGruDelete, map[string]string{
reporters.Report(reportersConstants.EventGruDelete, map[string]interface{}{
reportersConstants.TagGame: s.Game,
reportersConstants.TagScheduler: s.Name,
reportersConstants.TagReason: reportersConstants.ReasonNamespaceDeletion,
Expand Down
6 changes: 3 additions & 3 deletions models/pod.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func NewPod(
err := pod.configureHostPorts(configYaml, clientset, redisClient)

if err == nil {
reporters.Report(reportersConstants.EventGruNew, map[string]string{
reporters.Report(reportersConstants.EventGruNew, map[string]interface{}{
reportersConstants.TagGame: configYaml.Game,
reportersConstants.TagScheduler: configYaml.Name,
})
Expand All @@ -194,7 +194,7 @@ func NewPodWithContainers(
}
err := pod.configureHostPorts(configYaml, clientset, redisClient)
if err == nil {
reporters.Report(reportersConstants.EventGruNew, map[string]string{
reporters.Report(reportersConstants.EventGruNew, map[string]interface{}{
reportersConstants.TagGame: configYaml.Game,
reportersConstants.TagScheduler: configYaml.Name,
})
Expand Down Expand Up @@ -257,7 +257,7 @@ func (p *Pod) Delete(clientset kubernetes.Interface,
}

if err == nil {
reporters.Report(reportersConstants.EventGruDelete, map[string]string{
reporters.Report(reportersConstants.EventGruDelete, map[string]interface{}{
reportersConstants.TagGame: p.Game,
reportersConstants.TagScheduler: p.Namespace,
reportersConstants.TagReason: reason,
Expand Down
Loading

0 comments on commit 3466544

Please sign in to comment.