Fix session timeout

Author: dlopes7

go.mod

@@ -3,8 +3,6 @@ module github.com/dlopes7/dynatrace-openkit-go
 go 1.15
 
 require (
-	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
-	github.com/sasha-s/go-deadlock v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.6.0
-	github.com/stretchr/testify v1.2.2 // indirect
+	github.com/stretchr/testify v1.2.2
 )

go.sum

@@ -2,12 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
-github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=
-github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=

openkitgo/configuration/server.go

@@ -14,11 +14,11 @@ type ServerConfiguration struct {
 	Multiplicity                  int
 	SendInterval                  time.Duration
 	MaxSessionDuration            time.Duration
-	SessionSplitBySessionDuration bool
+	sessionSplitBySessionDuration bool
 	MaxEventsPerSession           int
-	SessionSplitByEvents          bool
+	sessionSplitByEvents          bool
 	SessionTimeout                time.Duration
-	SessionSplitByIdleTimeout     bool
+	sessionSplitByIdleTimeout     bool
 	VisitStoreVersion             int
 	TrafficControlPercentage      int
 }
@@ -33,11 +33,11 @@ func NewServerConfiguration(attributes protocol.ResponseAttributes) *ServerConfi
 		Multiplicity:                  attributes.Multiplicity,
 		SendInterval:                  attributes.SendInterval,
 		MaxSessionDuration:            attributes.MaxSessionDuration,
-		SessionSplitBySessionDuration: attributes.MaxSessionDuration != 0,
+		sessionSplitBySessionDuration: attributes.MaxSessionDuration != 0,
 		MaxEventsPerSession:           attributes.MaxEventsPerSession,
-		SessionSplitByEvents:          attributes.MaxEventsPerSession != 0,
+		sessionSplitByEvents:          attributes.MaxEventsPerSession != 0,
 		SessionTimeout:                attributes.SessionTimeout,
-		SessionSplitByIdleTimeout:     attributes.SessionTimeout != 0,
+		sessionSplitByIdleTimeout:     attributes.SessionTimeout != 0,
 		VisitStoreVersion:             attributes.VisitStoreVersion,
 		TrafficControlPercentage:      attributes.TrafficControlPercentage,
 	}
@@ -55,3 +55,17 @@ func (c *ServerConfiguration) IsSendingErrorsAllowed() bool {
 	return c.IsSendingDataAllowed() && c.ErrorReporting
 
 }
+
+func (c *ServerConfiguration) IsSessionSplitByEventsEnabled() bool {
+	return c.sessionSplitByEvents && c.MaxEventsPerSession > 0
+}
+
+func (c *ServerConfiguration) IsSessionSplitBySessionDurationEnabled() bool {
+	return c.sessionSplitBySessionDuration && c.MaxSessionDuration > 0
+
+}
+
+func (c *ServerConfiguration) IsSessionSplitByIdleTimeoutEnabled() bool {
+	return c.sessionSplitByIdleTimeout && c.SessionTimeout > 0
+
+}

openkitgo/core/session_proxy.go

@@ -287,7 +287,7 @@ func (p *SessionProxy) closeChildObjects(timestamp time.Time) {
 
 func (p *SessionProxy) isSessionSplitByEventsRequired() bool {
 
-	if p.serverConfiguration == nil || !p.serverConfiguration.IsSendingDataAllowed() {
+	if p.serverConfiguration == nil || !p.serverConfiguration.IsSessionSplitByEventsEnabled() {
 		return false
 	}
 	return p.serverConfiguration.MaxEventsPerSession <= p.topLevelActionCount
@@ -320,7 +320,7 @@ func (p *SessionProxy) onServerConfigurationUpdate(serverConfiguration *configur
 		return
 	}
 
-	if p.serverConfiguration.SessionSplitByIdleTimeout || p.serverConfiguration.SessionSplitBySessionDuration {
+	if p.serverConfiguration.IsSessionSplitBySessionDurationEnabled() || p.serverConfiguration.IsSessionSplitByIdleTimeoutEnabled() {
 		p.sessionWatchdog.AddToSplitByTimeout(p)
 	}
 
@@ -378,8 +378,8 @@ func (p *SessionProxy) calculateNextSplitTime() time.Time {
 		return time.Time{}
 	}
 
-	splitByIdleTimeout := p.serverConfiguration.SessionSplitByIdleTimeout
-	splitBySessionDuration := p.serverConfiguration.SessionSplitBySessionDuration
+	splitByIdleTimeout := p.serverConfiguration.IsSessionSplitByIdleTimeoutEnabled()
+	splitBySessionDuration := p.serverConfiguration.IsSessionSplitBySessionDurationEnabled()
 
 	idleTimeOut := p.lastInteractionTime.Add(p.serverConfiguration.SessionTimeout)
 	sessionMaxTime := p.currentSession.beacon.sessionStartTime.Add(p.serverConfiguration.MaxSessionDuration)