GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-13 08:59:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename ga package to sdk

Browse Source
This commit is contained in:
debugtalk
2022-03-25 15:57:25 +08:00
parent 3eab7d470f
commit ceb290dd49
9 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hrp/boomer.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/httprunner/funplugin"
"github.com/httprunner/httprunner/hrp/internal/boomer"
"github.com/httprunner/httprunner/hrp/internal/ga"
"github.com/httprunner/httprunner/hrp/internal/sdk"
)
func NewBoomer(spawnCount int, spawnRate float64) *HRPBoomer {
@@ -28,14 +28,14 @@ type HRPBoomer struct {
// Run starts to run load test for one or multiple testcases.
func (b *HRPBoomer) Run(testcases ...ITestCase) {
event := ga.EventTracking{
event := sdk.EventTracking{
Category: "RunLoadTests",
Action: "hrp boom",
}
// report start event
go ga.SendEvent(event)
go sdk.SendEvent(event)
// report execution timing event
defer ga.SendEvent(event.StartTiming("execution"))
defer sdk.SendEvent(event.StartTiming("execution"))
var taskSlice []*boomer.Task
for _, iTestCase := range testcases {

14
hrp/internal/har2case/core.go
View File

@@ -15,8 +15,8 @@ import (
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/ga"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/hrp/internal/sdk"
)
const (
@@ -42,14 +42,14 @@ func (h *har) SetOutputDir(dir string) {
}
func (h *har) GenJSON() (jsonPath string, err error) {
event := ga.EventTracking{
event := sdk.EventTracking{
Category: "ConvertTests",
Action: "hrp har2case --to-json",
}
// report start event
go ga.SendEvent(event)
go sdk.SendEvent(event)
// report running timing event
defer ga.SendEvent(event.StartTiming("execution"))
defer sdk.SendEvent(event.StartTiming("execution"))
tCase, err := h.makeTestCase()
if err != nil {
@@ -61,14 +61,14 @@ func (h *har) GenJSON() (jsonPath string, err error) {
}
func (h *har) GenYAML() (yamlPath string, err error) {
event := ga.EventTracking{
event := sdk.EventTracking{
Category: "ConvertTests",
Action: "hrp har2case --to-yaml",
}
// report start event
go ga.SendEvent(event)
go sdk.SendEvent(event)
// report running timing event
defer ga.SendEvent(event.StartTiming("execution"))
defer sdk.SendEvent(event.StartTiming("execution"))
tCase, err := h.makeTestCase()
if err != nil {

4
hrp/internal/scaffold/main.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/httprunner/funplugin/shared"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/ga"
"github.com/httprunner/httprunner/hrp/internal/sdk"
)
type PluginType string
@@ -25,7 +25,7 @@ const (
func CreateScaffold(projectName string, pluginType PluginType) error {
// report event
ga.SendEvent(ga.EventTracking{
sdk.SendEvent(sdk.EventTracking{
Category: "Scaffold",
Action: "hrp startproject",
})

2
hrp/internal/ga/client.go → hrp/internal/sdk/client.go
View File

@@ -1,4 +1,4 @@
package ga
package sdk
import (
"fmt"

2
hrp/internal/ga/client_test.go → hrp/internal/sdk/client_test.go
View File

@@ -1,4 +1,4 @@
package ga
package sdk
import (
"testing"

2
hrp/internal/ga/events.go → hrp/internal/sdk/events.go
View File

@@ -1,4 +1,4 @@
package ga
package sdk
import (
"fmt"

3
hrp/internal/ga/init.go → hrp/internal/sdk/init.go
View File

@@ -1,4 +1,4 @@
package ga
package sdk
import (
"fmt"
@@ -19,6 +19,7 @@ const (
var gaClient *GAClient
func init() {
// init GA client
clientID, err := machineid.ProtectedID("hrp")
if err != nil {
nodeUUID, _ := uuid.NewUUID()

7
hrp/plugin.go
View File

@@ -8,8 +8,9 @@ import (
"syscall"
"github.com/httprunner/funplugin"
"github.com/httprunner/httprunner/hrp/internal/ga"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp/internal/sdk"
)
const (
@@ -44,7 +45,7 @@ func initPlugin(path string, logOn bool) (plugin funplugin.IPlugin, err error) {
}()
// report event for initializing plugin
event := ga.EventTracking{
event := sdk.EventTracking{
Category: "InitPlugin",
Action: fmt.Sprintf("Init %s plugin", plugin.Type()),
Value: 0, // success
@@ -52,7 +53,7 @@ func initPlugin(path string, logOn bool) (plugin funplugin.IPlugin, err error) {
if err != nil {
event.Value = 1 // failed
}
go ga.SendEvent(event)
go sdk.SendEvent(event)
return
}

8
hrp/runner.go
View File

@@ -29,8 +29,8 @@ import (
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/ga"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/hrp/internal/sdk"
)
const (
@@ -138,14 +138,14 @@ func (r *HRPRunner) GenHTMLReport() *HRPRunner {
// Run starts to execute one or multiple testcases.
func (r *HRPRunner) Run(testcases ...ITestCase) error {
event := ga.EventTracking{
event := sdk.EventTracking{
Category: "RunAPITests",
Action: "hrp run",
}
// report start event
go ga.SendEvent(event)
go sdk.SendEvent(event)
// report execution timing event
defer ga.SendEvent(event.StartTiming("execution"))
defer sdk.SendEvent(event.StartTiming("execution"))
// record execution data to summary
s := newOutSummary()
for _, iTestCase := range testcases {