Release 2.0.4

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015－2021 Sensors Data Inc.
+   Copyright 2015－2019 Sensors Data Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

sensorsanalytics.go

@@ -40,12 +40,15 @@ const (
 	ITEM_SET          = "item_set"
 	ITEM_DELETE       = "item_delete"
 
-	SDK_VERSION = "2.0.3"
+	SDK_VERSION = "2.0.4"
 	LIB_NAME    = "Golang"
 
 	MAX_ID_LEN = 255
 )
 
+// 静态公共属性
+var superProperties map[string]interface{}
+
 type SensorsAnalytics struct {
 	C           consumers.Consumer
 	ProjectName string
@@ -116,6 +119,10 @@ func (sa *SensorsAnalytics) Track(distinctId, event string, properties map[strin
 		nproperties = utils.DeepCopy(properties)
 	}
 
+	// merge super properties
+	if superProperties != nil {
+		utils.MergeSuperProperty(superProperties, nproperties)
+	}
 	nproperties["$lib"] = LIB_NAME
 	nproperties["$lib_version"] = SDK_VERSION
 
@@ -132,7 +139,10 @@ func (sa *SensorsAnalytics) TrackSignup(distinctId, originId string) error {
 	}
 
 	properties := make(map[string]interface{})
-
+	// merge super properties
+	if superProperties != nil {
+		utils.MergeSuperProperty(superProperties, properties)
+	}
 	properties["$lib"] = LIB_NAME
 	properties["$lib_version"] = SDK_VERSION
 
@@ -250,6 +260,24 @@ func (sa *SensorsAnalytics) ItemDelete(itemType string, itemId string) error {
 	return sa.C.ItemSend(itemData)
 }
 
+// 注册公共属性
+func (sa *SensorsAnalytics) RegisterSuperProperties(superProperty map[string]interface{}) {
+	if superProperties == nil {
+		superProperties = make(map[string]interface{})
+	}
+	utils.MergeSuperProperty(superProperty, superProperties)
+}
+
+// 清除公共属性
+func (sa *SensorsAnalytics) ClearSuperProperties() {
+	superProperties = make(map[string]interface{})
+}
+
+// 清除指定 key 的公共属性
+func (sa *SensorsAnalytics) UnregisterSuperProperty(key string) {
+	delete(superProperties, key)
+}
+
 func getLibProperties() structs.LibProperties {
 	lp := structs.LibProperties{}
 	lp.Lib = LIB_NAME

structs/event.go

@@ -83,6 +83,10 @@ func (e *EventData) NormalizeData() error {
 			if len(k) > KEY_MAX {
 				return errors.New("the max length of property key is 256")
 			}
+
+			if len(k) == 0 {
+				return errors.New("The key is empty or null.")
+			}
 			isMatch := checkPattern([]byte(k))
 			if !isMatch {
 				return errors.New("property key must be a valid variable name.")

utils/utils.go

@@ -114,6 +114,21 @@ func NowMs() int64 {
 	return time.Now().UnixNano() / 1000000
 }
 
+// 合并公共属性
+func MergeSuperProperty(superProperty map[string]interface{}, properties map[string]interface{}) map[string]interface{} {
+	if superProperty == nil {
+		return properties
+	}
+
+	for key, value := range superProperty {
+		_, ok := properties[key]
+		if !ok {
+			properties[key] = value
+		}
+	}
+	return properties
+}
+
 func DeepCopy(value map[string]interface{}) map[string]interface{} {
 	ncopy := deepCopy(value)
 	if nmap, ok := ncopy.(map[string]interface{}); ok {