From ceb290dd4964e8d0ccf11c12c7690bdd61456635 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Fri, 25 Mar 2022 15:57:25 +0800 Subject: [PATCH] refactor: rename ga package to sdk --- hrp/boomer.go | 8 ++++---- hrp/internal/har2case/core.go | 14 +++++++------- hrp/internal/scaffold/main.go | 4 ++-- hrp/internal/{ga => sdk}/client.go | 2 +- hrp/internal/{ga => sdk}/client_test.go | 2 +- hrp/internal/{ga => sdk}/events.go | 2 +- hrp/internal/{ga => sdk}/init.go | 3 ++- hrp/plugin.go | 7 ++++--- hrp/runner.go | 8 ++++---- 9 files changed, 26 insertions(+), 24 deletions(-) rename hrp/internal/{ga => sdk}/client.go (99%) rename hrp/internal/{ga => sdk}/client_test.go (97%) rename hrp/internal/{ga => sdk}/events.go (99%) rename hrp/internal/{ga => sdk}/init.go (97%) diff --git a/hrp/boomer.go b/hrp/boomer.go index 9dc96277..9d0cf667 100644 --- a/hrp/boomer.go +++ b/hrp/boomer.go @@ -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 { diff --git a/hrp/internal/har2case/core.go b/hrp/internal/har2case/core.go index bbbb14d9..684b445d 100644 --- a/hrp/internal/har2case/core.go +++ b/hrp/internal/har2case/core.go @@ -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 { diff --git a/hrp/internal/scaffold/main.go b/hrp/internal/scaffold/main.go index 3e8bab30..c567f28e 100644 --- a/hrp/internal/scaffold/main.go +++ b/hrp/internal/scaffold/main.go @@ -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", }) diff --git a/hrp/internal/ga/client.go b/hrp/internal/sdk/client.go similarity index 99% rename from hrp/internal/ga/client.go rename to hrp/internal/sdk/client.go index 923e8578..a2483703 100644 --- a/hrp/internal/ga/client.go +++ b/hrp/internal/sdk/client.go @@ -1,4 +1,4 @@ -package ga +package sdk import ( "fmt" diff --git a/hrp/internal/ga/client_test.go b/hrp/internal/sdk/client_test.go similarity index 97% rename from hrp/internal/ga/client_test.go rename to hrp/internal/sdk/client_test.go index d1c29a72..905b5d13 100644 --- a/hrp/internal/ga/client_test.go +++ b/hrp/internal/sdk/client_test.go @@ -1,4 +1,4 @@ -package ga +package sdk import ( "testing" diff --git a/hrp/internal/ga/events.go b/hrp/internal/sdk/events.go similarity index 99% rename from hrp/internal/ga/events.go rename to hrp/internal/sdk/events.go index 7661b17a..4d957455 100644 --- a/hrp/internal/ga/events.go +++ b/hrp/internal/sdk/events.go @@ -1,4 +1,4 @@ -package ga +package sdk import ( "fmt" diff --git a/hrp/internal/ga/init.go b/hrp/internal/sdk/init.go similarity index 97% rename from hrp/internal/ga/init.go rename to hrp/internal/sdk/init.go index 609466ed..7d36e710 100644 --- a/hrp/internal/ga/init.go +++ b/hrp/internal/sdk/init.go @@ -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() diff --git a/hrp/plugin.go b/hrp/plugin.go index f7e72900..12cc1156 100644 --- a/hrp/plugin.go +++ b/hrp/plugin.go @@ -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 } diff --git a/hrp/runner.go b/hrp/runner.go index 454e637a..7bb0de3d 100644 --- a/hrp/runner.go +++ b/hrp/runner.go @@ -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 {