Skip to content
This repository has been archived by the owner on Mar 28, 2022. It is now read-only.

Commit

Permalink
change: update models
Browse files Browse the repository at this point in the history
  • Loading branch information
debugtalk committed Dec 24, 2021
1 parent 5fc748e commit 54f9364
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion boomer.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task {
for name, transaction := range runner.transactions {
if len(transaction) == 1 {
// if transaction end time not exists, use testcase end time instead
duration := endTime.Sub(transaction[TransactionStart])
duration := endTime.Sub(transaction[transactionStart])
b.RecordTransaction(name, transactionSuccess, duration.Milliseconds(), 0)
}
}
Expand Down
8 changes: 4 additions & 4 deletions models.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ const (
stepTypeRendezvous stepType = "rendezvous"
)

type TransactionType string
type transactionType string

const (
TransactionStart TransactionType = "start"
TransactionEnd TransactionType = "end"
transactionStart transactionType = "start"
transactionEnd transactionType = "end"
)

type Transaction struct {
Name string `json:"name" yaml:"name"`
Type TransactionType `json:"type" yaml:"type"`
Type transactionType `json:"type" yaml:"type"`
}
type Rendezvous struct {
Name string `json:"name" yaml:"name"` // required
Expand Down
24 changes: 12 additions & 12 deletions runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func NewRunner(t *testing.T) *hrpRunner {
Timeout: 30 * time.Second,
},
sessionVariables: make(map[string]interface{}),
transactions: make(map[string]map[TransactionType]time.Time),
transactions: make(map[string]map[transactionType]time.Time),
}
}

Expand All @@ -55,15 +55,15 @@ type hrpRunner struct {
sessionVariables map[string]interface{}
// transactions stores transaction timing info.
// key is transaction name, value is map of transaction type and time, e.g. start time and end time.
transactions map[string]map[TransactionType]time.Time
transactions map[string]map[transactionType]time.Time
startTime time.Time // record start time of the testcase
}

// Reset clears runner session variables.
func (r *hrpRunner) Reset() *hrpRunner {
log.Info().Msg("[init] Reset session variables")
r.sessionVariables = make(map[string]interface{})
r.transactions = make(map[string]map[TransactionType]time.Time)
r.transactions = make(map[string]map[transactionType]time.Time)
r.startTime = time.Now()
return r
}
Expand Down Expand Up @@ -234,25 +234,25 @@ func (r *hrpRunner) runStepTransaction(transaction *Transaction) (stepResult *st

// create transaction if not exists
if _, ok := r.transactions[transaction.Name]; !ok {
r.transactions[transaction.Name] = make(map[TransactionType]time.Time)
r.transactions[transaction.Name] = make(map[transactionType]time.Time)
}

// record transaction start time, override if already exists
if transaction.Type == TransactionStart {
r.transactions[transaction.Name][TransactionStart] = time.Now()
if transaction.Type == transactionStart {
r.transactions[transaction.Name][transactionStart] = time.Now()
}
// record transaction end time, override if already exists
if transaction.Type == TransactionEnd {
r.transactions[transaction.Name][TransactionEnd] = time.Now()
if transaction.Type == transactionEnd {
r.transactions[transaction.Name][transactionEnd] = time.Now()

// if transaction start time not exists, use testcase start time instead
if _, ok := r.transactions[transaction.Name][TransactionStart]; !ok {
r.transactions[transaction.Name][TransactionStart] = r.startTime
if _, ok := r.transactions[transaction.Name][transactionStart]; !ok {
r.transactions[transaction.Name][transactionStart] = r.startTime
}

// calculate transaction duration
duration := r.transactions[transaction.Name][TransactionEnd].Sub(
r.transactions[transaction.Name][TransactionStart])
duration := r.transactions[transaction.Name][transactionEnd].Sub(
r.transactions[transaction.Name][transactionStart])
stepResult.elapsed = duration.Milliseconds()
log.Info().Str("name", transaction.Name).Dur("elapsed", duration).Msg("transaction")
}
Expand Down
4 changes: 2 additions & 2 deletions step.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (s *StepRequest) CallRefCase(tc *TestCase) *StepTestCaseWithOptionalArgs {
func (s *StepRequest) StartTransaction(name string) *StepTransaction {
s.step.Transaction = &Transaction{
Name: name,
Type: TransactionStart,
Type: transactionStart,
}
return &StepTransaction{
step: s.step,
Expand All @@ -189,7 +189,7 @@ func (s *StepRequest) StartTransaction(name string) *StepTransaction {
func (s *StepRequest) EndTransaction(name string) *StepTransaction {
s.step.Transaction = &Transaction{
Name: name,
Type: TransactionEnd,
Type: transactionEnd,
}
return &StepTransaction{
step: s.step,
Expand Down

0 comments on commit 54f9364

Please sign in to comment.