Add metric counter for storage OCC rejections. (71fa2b53) · Commits · public-projects / Nakama

main.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ func main() {
		statusHandler := server.NewLocalStatusHandler(logger, sessionRegistry, matchRegistry, tracker, metrics, config.GetName())

		apiServer := server.StartApiServer(logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, socialClient, leaderboardCache, leaderboardRankCache, sessionRegistry, sessionCache, statusRegistry, matchRegistry, matchmaker, tracker, router, streamManager, metrics, pipeline, runtime)
		consoleServer := server.StartConsoleServer(logger, startupLogger, db, config, tracker, router, streamManager, sessionCache, consoleSessionCache, loginAttemptCache, statusRegistry, statusHandler, runtimeInfo, matchRegistry, configWarnings, semver, leaderboardCache, leaderboardRankCache, apiServer, cookie)
		consoleServer := server.StartConsoleServer(logger, startupLogger, db, config, tracker, router, streamManager, metrics, sessionCache, consoleSessionCache, loginAttemptCache, statusRegistry, statusHandler, runtimeInfo, matchRegistry, configWarnings, semver, leaderboardCache, leaderboardRankCache, apiServer, cookie)

		gaenabled := len(os.Getenv("NAKAMA_TELEMETRY")) < 1
		console.UIFS.Nt = !gaenabled

server/api_storage.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ func (s ApiServer) WriteStorageObjects(ctx context.Context, in api.WriteStorag
		})
		}

		acks, code, err := StorageWriteObjects(ctx, s.logger, s.db, false, ops)
		acks, code, err := StorageWriteObjects(ctx, s.logger, s.db, s.metrics, false, ops)
		if err != nil {
		if code == codes.Internal {
		return nil, status.Error(codes.Internal, "Error writing storage objects.")

server/config.go

+0 −11

Original line number	Diff line number	Diff line
		@@ -588,7 +588,6 @@ type LoggerConfig struct {
		Format string `yaml:"format" json:"format" usage:"Set logging output format. Can either be 'JSON' or 'Stackdriver'. Default is 'JSON'."`
		}

		// NewLoggerConfig creates a new LoggerConfig struct.
		func NewLoggerConfig() *LoggerConfig {
		return &LoggerConfig{
		Level: "info",
		@@ -613,7 +612,6 @@ type MetricsConfig struct {
		CustomPrefix string `yaml:"custom_prefix" json:"custom_prefix" usage:"Prefix for custom runtime metric names. Default is 'custom', empty string '' disables the prefix."`
		}

		// NewMetricsConfig creates a new MatricsConfig struct.
		func NewMetricsConfig() *MetricsConfig {
		return &MetricsConfig{
		ReportingFreqSec: 60,
		@@ -634,7 +632,6 @@ type SessionConfig struct {
		SingleMatch bool `yaml:"single_match" json:"single_match" usage:"Only allow one match per user. Older matches receive a leave. Requires single socket to enable. Default false."`
		}

		// NewSessionConfig creates a new SessionConfig struct.
		func NewSessionConfig() *SessionConfig {
		return &SessionConfig{
		EncryptionKey: "defaultencryptionkey",
		@@ -669,7 +666,6 @@ type SocketConfig struct {
		TLSCert []tls.Certificate `yaml:"-" json:"-"` // Created by processing CertPEMBlock and KeyPEMBlock, not set from input args directly.
		}

		// NewTransportConfig creates a new TransportConfig struct.
		func NewSocketConfig() *SocketConfig {
		return &SocketConfig{
		ServerKey: "defaultkey",
		@@ -702,7 +698,6 @@ type DatabaseConfig struct {
		DnsScanIntervalSec int `yaml:"dns_scan_interval_sec" json:"dns_scan_interval_sec" usage:"Number of seconds between scans looking for DNS resolution changes for the database hostname. Default 60."`
		}

		// NewDatabaseConfig creates a new DatabaseConfig struct.
		func NewDatabaseConfig() *DatabaseConfig {
		return &DatabaseConfig{
		Addresses: []string{"root@localhost:26257"},
		@@ -742,7 +737,6 @@ type SocialConfigApple struct {
		BundleId string `yaml:"bundle_id" json:"bundle_id" usage:"Apple Sign In bundle ID."`
		}

		// NewSocialConfig creates a new SocialConfig struct.
		func NewSocialConfig() *SocialConfig {
		return &SocialConfig{
		Steam: &SocialConfigSteam{
		@@ -826,7 +820,6 @@ func (r *RuntimeConfig) GetLuaReadOnlyGlobals() bool {
		return r.LuaReadOnlyGlobals
		}

		// NewRuntimeConfig creates a new RuntimeConfig struct.
		func NewRuntimeConfig() *RuntimeConfig {
		return &RuntimeConfig{
		Environment: make(map[string]string, 0),
		@@ -860,7 +853,6 @@ type MatchConfig struct {
		LabelUpdateIntervalMs int `yaml:"label_update_interval_ms" json:"label_update_interval_ms" usage:"Time in milliseconds between match label update batch processes. Default 1000."`
		}

		// NewMatchConfig creates a new MatchConfig struct.
		func NewMatchConfig() *MatchConfig {
		return &MatchConfig{
		InputQueueSize: 128,
		@@ -879,7 +871,6 @@ type TrackerConfig struct {
		EventQueueSize int `yaml:"event_queue_size" json:"event_queue_size" usage:"Size of the tracker presence event buffer. Increase if the server is expected to generate a large number of presence events in a short time. Default 1024."`
		}

		// NewTrackerConfig creates a new TrackerConfig struct.
		func NewTrackerConfig() *TrackerConfig {
		return &TrackerConfig{
		EventQueueSize: 1024,
		@@ -900,7 +891,6 @@ type ConsoleConfig struct {
		SigningKey string `yaml:"signing_key" json:"signing_key" usage:"Key used to sign console session tokens."`
		}

		// NewConsoleConfig creates a new ConsoleConfig struct.
		func NewConsoleConfig() *ConsoleConfig {
		return &ConsoleConfig{
		Port: 7351,
		@@ -922,7 +912,6 @@ type LeaderboardConfig struct {
		CallbackQueueWorkers int `yaml:"callback_queue_workers" json:"callback_queue_workers" usage:"Number of workers to use for concurrent processing of leaderboard and tournament callbacks. Default 8."`
		}

		// NewLeaderboardConfig creates a new LeaderboardConfig struct.
		func NewLeaderboardConfig() *LeaderboardConfig {
		return &LeaderboardConfig{
		BlacklistRankCache: []string{},

server/console.go

+5 −3

Original line number	Diff line number	Diff line
		@@ -139,7 +139,8 @@ type ConsoleServer struct {
		config Config
		tracker Tracker
		router MessageRouter
		StreamManager StreamManager
		streamManager StreamManager
		metrics Metrics
		sessionCache SessionCache
		consoleSessionCache SessionCache
		loginAttemptCache LoginAttemptCache
		@@ -160,7 +161,7 @@ type ConsoleServer struct {
		httpClient *http.Client
		}

		func StartConsoleServer(logger zap.Logger, startupLogger zap.Logger, db sql.DB, config Config, tracker Tracker, router MessageRouter, streamManager StreamManager, sessionCache SessionCache, consoleSessionCache SessionCache, loginAttemptCache LoginAttemptCache, statusRegistry StatusRegistry, statusHandler StatusHandler, runtimeInfo RuntimeInfo, matchRegistry MatchRegistry, configWarnings map[string]string, serverVersion string, leaderboardCache LeaderboardCache, leaderboardRankCache LeaderboardRankCache, api ApiServer, cookie string) *ConsoleServer {
		func StartConsoleServer(logger zap.Logger, startupLogger zap.Logger, db sql.DB, config Config, tracker Tracker, router MessageRouter, streamManager StreamManager, metrics Metrics, sessionCache SessionCache, consoleSessionCache SessionCache, loginAttemptCache LoginAttemptCache, statusRegistry StatusRegistry, statusHandler StatusHandler, runtimeInfo RuntimeInfo, matchRegistry MatchRegistry, configWarnings map[string]string, serverVersion string, leaderboardCache LeaderboardCache, leaderboardRankCache LeaderboardRankCache, api ApiServer, cookie string) *ConsoleServer {
		var gatewayContextTimeoutMs string
		if config.GetConsole().IdleTimeoutMs > 500 {
		// Ensure the GRPC Gateway timeout is just under the idle timeout (if possible) to ensure it has priority.
		@@ -184,7 +185,8 @@ func StartConsoleServer(logger zap.Logger, startupLogger zap.Logger, db *sql.D
		config: config,
		tracker: tracker,
		router: router,
		StreamManager: streamManager,
		streamManager: streamManager,
		metrics: metrics,
		sessionCache: sessionCache,
		consoleSessionCache: consoleSessionCache,
		loginAttemptCache: loginAttemptCache,

server/console_account.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ func (s ConsoleServer) DeleteGroupUser(ctx context.Context, in console.DeleteG
		return nil, status.Error(codes.InvalidArgument, "Requires a valid group ID.")
		}

		if err = KickGroupUsers(ctx, s.logger, s.db, s.tracker, s.router, s.StreamManager, uuid.Nil, groupID, []uuid.UUID{userID}); err != nil {
		if err = KickGroupUsers(ctx, s.logger, s.db, s.tracker, s.router, s.streamManager, uuid.Nil, groupID, []uuid.UUID{userID}); err != nil {
		// Error already logged in function above.
		if err == ErrEmptyMemberKick {
		return nil, status.Error(codes.FailedPrecondition, "Cannot kick user from group.")