fixed: remove useless code

PaloAltoNetworks · Mar 1, 2018 · c0589d1 · c0589d1
1 parent f155c26
commit c0589d1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 36 deletions.
diff --git a/request.go b/request.go
@@ -10,34 +10,31 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/opentracing/opentracing-go"
-
 	uuid "github.com/satori/go.uuid"
 )
 
 // A Request represents an abstract request on an elemental model.
 type Request struct {
-	RequestID            string                     `json:"rid"`
-	Namespace            string                     `json:"namespace"`
-	Recursive            bool                       `json:"recursive"`
-	Operation            Operation                  `json:"operation"`
-	Identity             Identity                   `json:"identity"`
-	Order                []string                   `json:"order"`
-	ObjectID             string                     `json:"objectID"`
-	ParentIdentity       Identity                   `json:"parentIdentity"`
-	ParentID             string                     `json:"parentID"`
-	Data                 json.RawMessage            `json:"data,omitempty"`
-	Parameters           url.Values                 `json:"parameters,omitempty"`
-	Headers              http.Header                `json:"headers,omitempty"`
-	Username             string                     `json:"username,omitempty"`
-	Password             string                     `json:"password,omitempty"`
-	Page                 int                        `json:"page,omitempty"`
-	PageSize             int                        `json:"pageSize,omitempty"`
-	OverrideProtection   bool                       `json:"overrideProtection,omitempty"`
-	Version              int                        `json:"version,omitempty"`
-	TrackingData         opentracing.TextMapCarrier `json:"trackingData,omitempty"`
-	ExternalTrackingID   string                     `json:"externalTrackingID,omitempty"`
-	ExternalTrackingType string                     `json:"externalTrackingType,omitempty"`
+	RequestID            string          `json:"rid"`
+	Namespace            string          `json:"namespace"`
+	Recursive            bool            `json:"recursive"`
+	Operation            Operation       `json:"operation"`
+	Identity             Identity        `json:"identity"`
+	Order                []string        `json:"order"`
+	ObjectID             string          `json:"objectID"`
+	ParentIdentity       Identity        `json:"parentIdentity"`
+	ParentID             string          `json:"parentID"`
+	Data                 json.RawMessage `json:"data,omitempty"`
+	Parameters           url.Values      `json:"parameters,omitempty"`
+	Headers              http.Header     `json:"headers,omitempty"`
+	Username             string          `json:"username,omitempty"`
+	Password             string          `json:"password,omitempty"`
+	Page                 int             `json:"page,omitempty"`
+	PageSize             int             `json:"pageSize,omitempty"`
+	OverrideProtection   bool            `json:"overrideProtection,omitempty"`
+	Version              int             `json:"version,omitempty"`
+	ExternalTrackingID   string          `json:"externalTrackingID,omitempty"`
+	ExternalTrackingType string          `json:"externalTrackingType,omitempty"`
 
 	Metadata           map[string]interface{} `json:"-"`
 	ClientIP           string                 `json:"-"`
@@ -50,11 +47,10 @@ type Request struct {
 func NewRequest() *Request {
 
 	return &Request{
-		RequestID:    uuid.Must(uuid.NewV4()).String(),
-		Parameters:   url.Values{},
-		Headers:      http.Header{},
-		Metadata:     map[string]interface{}{},
-		TrackingData: opentracing.TextMapCarrier{},
+		RequestID:  uuid.Must(uuid.NewV4()).String(),
+		Parameters: url.Values{},
+		Headers:    http.Header{},
+		Metadata:   map[string]interface{}{},
 	}
 }
 
@@ -195,7 +191,6 @@ func NewRequestFromHTTPRequest(req *http.Request) (*Request, error) {
 		OverrideProtection:   override,
 		Metadata:             map[string]interface{}{},
 		Version:              version,
-		TrackingData:         opentracing.TextMapCarrier{},
 		ExternalTrackingID:   req.Header.Get("X-External-Tracking-ID"),
 		ExternalTrackingType: req.Header.Get("X-External-Tracking-Type"),
 		Order:                req.URL.Query()["order"],
@@ -242,10 +237,6 @@ func (r *Request) Duplicate() *Request {
 		req.Metadata[k] = v
 	}
 
-	for k, v := range r.TrackingData {
-		req.TrackingData[k] = v
-	}
-
 	return req
 }
 

diff --git a/request_test.go b/request_test.go
@@ -7,7 +7,6 @@ import (
 	"net/url"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -751,7 +750,6 @@ func TestRequest_Duplicate(t *testing.T) {
 		req.Version = 12
 		req.Order = []string{"key1", "key2"}
 		req.ClientIP = "1.2.3.4"
-		req.TrackingData = opentracing.TextMapCarrier{"a": "b"}
 		req.Metadata = map[string]interface{}{"a": 1}
 
 		Convey("When I use Duplicate()", func() {
@@ -777,7 +775,6 @@ func TestRequest_Duplicate(t *testing.T) {
 				So(req2.Version, ShouldEqual, req.Version)
 				So(req2.Order, ShouldResemble, req.Order)
 				So(req2.ClientIP, ShouldResemble, req.ClientIP)
-				So(req2.TrackingData, ShouldResemble, req.TrackingData)
 				So(req2.Metadata, ShouldResemble, req.Metadata)
 			})
 		})