better performance on tracecontext removal

Author: gunlee01

scouterx/common/netdata/blobvalue.go

@@ -0,0 +1,48 @@
+package netdata
+
+import (
+	valueconstants "github.com/scouter-contrib/scouter-agent-golang/scouterx/common/constants/valueconstant"
+	"strconv"
+)
+
+//BlobValue struct has number value
+type BlobValue struct {
+	Value []byte
+}
+
+//NewBlobValue return DeciamlValue instance
+func NewBlobValue(value []byte) *BlobValue {
+	BlobValue := new(BlobValue)
+	BlobValue.Value = value
+	return BlobValue
+}
+
+//NewBlobEmptyValue return BlobValue instance
+func NewBlobEmptyValue() *BlobValue {
+	BlobValue := new(BlobValue)
+	return BlobValue
+}
+
+// Read function reads a value from datainputx
+func (BlobValue *BlobValue) Read(in *DataInputX) (Value, error) {
+	var err error
+	BlobValue.Value, err = in.ReadBlob()
+	return BlobValue, err
+}
+
+// Write function writes a number value to dataoutputx
+func (BlobValue *BlobValue) Write(out *DataOutputX) error {
+	err := out.WriteBlob(BlobValue.Value)
+	return err
+}
+
+// GetValueType returns value type
+func (BlobValue *BlobValue) GetValueType() byte {
+	return valueconstants.BLOB
+}
+
+// ToString returns converted string value from decimal value
+func (BlobValue *BlobValue) ToString() string {
+	v := "byte["  + strconv.Itoa(len(BlobValue.Value)) + "]"
+	return v
+}

scouterx/common/netdata/datainputx.go

@@ -3,7 +3,9 @@ package netdata
 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"io"
+	"strconv"
 )
 
 // DataInputX is a byte buffer read stream struct
@@ -75,14 +77,21 @@ func (in *DataInputX) ReadFloat32() (float32, error) {
 	return value, err
 }
 
+func (in *DataInputX) ReadFloat64() (float64, error) {
+	in.offset +=8
+	var value float64
+	err := binary.Read(in.reader, binary.BigEndian, &value)
+	return value, err
+}
+
 // ReadString returns string value
 func (in *DataInputX) ReadString() (string, error) {
-	bytes, err := in.readBlob()
+	bytes, err := in.ReadBlob()
 	return string(bytes), err
 
 }
 
-func (in *DataInputX) readBlob() ([]byte, error) {
+func (in *DataInputX) ReadBlob() ([]byte, error) {
 	baseLen, err := in.ReadUInt8()
 	var length int32
 	switch baseLen {
@@ -147,15 +156,30 @@ func (in *DataInputX) ReadBoolean() (bool, error) {
 func (in *DataInputX) ReadValue() (Value, error) {
 	valueType, err := in.ReadInt8()
 	value := CreateValue(byte(valueType))
+	if value == nil {
+		return NewNilValue(), errors.New("[scouter] Not defined value type:" + strconv.FormatUint(uint64(valueType), 10))
+	}
 	readValue, err := value.Read(in)
 	return readValue, err
 
 }
 
 func (in *DataInputX) ReadIntBytes() ([]byte, error) {
 	length, err := in.ReadInt32()
-	val := make([]byte, length)
-	_, err = in.reader.Read(val)
+	b, err := in.Read(length)
+	return b, err
+	//val := make([]byte, length)
+	//_, err = in.reader.Read(val)
+	//if err != nil {
+	//	val = []byte{}
+	//}
+	//return val, err
+}
+
+func (in *DataInputX) Read(len int32) ([]byte, error) {
+	in.offset += len
+	val := make([]byte, len)
+	_, err := in.reader.Read(val)
 	if err != nil {
 		val = []byte{}
 	}

scouterx/common/netdata/dataoutputx.go

@@ -101,6 +101,13 @@ func (out *DataOutputX) WriteFloat32(value float32) (*DataOutputX, error) {
 	return out, err
 }
 
+// WriteFloat64 writes float64 value to buffer
+func (out *DataOutputX) WriteFloat64(value float64) (*DataOutputX, error) {
+	out.written += 8
+	err := binary.Write(out.writer, binary.BigEndian, value)
+	return out, err
+}
+
 // WriteDecimal writes number type value to buffer
 func (out *DataOutputX) WriteDecimal(value int64) (*DataOutputX, error) {
 	var err error

scouterx/common/netdata/doublevalue.go

@@ -0,0 +1,46 @@
+package netdata
+
+import (
+	"strconv"
+
+	valueconstants "github.com/scouter-contrib/scouter-agent-golang/scouterx/common/constants/valueconstant"
+)
+
+type DoubleValue struct {
+	Value float64
+}
+
+func NewDoubleValue(value float64) *DoubleValue {
+	doubleValue := new(DoubleValue)
+	doubleValue.Value = value
+	return doubleValue
+}
+
+//NewFloatEmptyValue returns new FloatValue instance
+func NewDoubleEmptyValue() *DoubleValue {
+	doubleValue := new(DoubleValue)
+	return doubleValue
+}
+
+// Read function reads a value from datainputx
+func (value *DoubleValue) Read(in *DataInputX) (Value, error) {
+	var err error
+	value.Value, err = in.ReadFloat64()
+	return value, err
+}
+
+// Write function write a float value to dataoutputx
+func (value *DoubleValue) Write(out *DataOutputX) error {
+	_, err := out.WriteFloat64(value.Value)
+	return err
+}
+
+// GetValueType returns value type
+func (value *DoubleValue) GetValueType() byte {
+	return valueconstants.DOUBLE
+}
+
+// ToString returns converted float value
+func (value *DoubleValue) ToString() string {
+	return strconv.FormatFloat(float64(value.Value), 'f', 3, 64)
+}

scouterx/common/netdata/ip4value.go

@@ -0,0 +1,49 @@
+package netdata
+
+import (
+	valueconstants "github.com/scouter-contrib/scouter-agent-golang/scouterx/common/constants/valueconstant"
+	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/util"
+)
+
+//Ip4Value struct has number value
+type Ip4Value struct {
+	Value []byte
+}
+
+//NewIp4Value return DeciamlValue instance
+func NewIp4Value(ip string) *Ip4Value {
+	Ip4Value := new(Ip4Value)
+	Ip4Value.Value = util.IpToBytes(ip)
+	return Ip4Value
+}
+
+//NewIp4EmptyValue return Ip4Value instance
+func NewIp4EmptyValue() *Ip4Value {
+	Ip4Value := new(Ip4Value)
+	Ip4Value.Value = make([]byte, 4)
+	return Ip4Value
+}
+
+// Read function reads a value from datainputx
+func (Ip4Value *Ip4Value) Read(in *DataInputX) (Value, error) {
+	var err error
+	Ip4Value.Value, err = in.Read(4)
+	return Ip4Value, err
+}
+
+// Write function writes a number value to dataoutputx
+func (Ip4Value *Ip4Value) Write(out *DataOutputX) error {
+	err := out.Write(Ip4Value.Value)
+	return err
+}
+
+// GetValueType returns value type
+func (Ip4Value *Ip4Value) GetValueType() byte {
+	return valueconstants.IP4ADDR
+}
+
+// ToString returns converted string value from decimal value
+func (Ip4Value *Ip4Value) ToString() string {
+	v := "ip["  + string(Ip4Value.Value) + "]"
+	return v
+}

scouterx/common/netdata/texthashvalue.go

@@ -0,0 +1,49 @@
+package netdata
+
+import (
+	"strconv"
+
+	valueconstants "github.com/scouter-contrib/scouter-agent-golang/scouterx/common/constants/valueconstant"
+)
+
+//TextHashValue struct has number value
+type TextHashValue struct {
+	Value int32
+}
+
+//NewTextHashValue return DeciamlValue instance
+func NewTextHashValue(value int32) *TextHashValue {
+	textHashValue := new(TextHashValue)
+	textHashValue.Value = value
+	return textHashValue
+}
+
+//NewDecimalEmptyValue return DeciamlValue instance
+func NewTextHashEmptyValue() *TextHashValue {
+	textHashValue := new(TextHashValue)
+	return textHashValue
+}
+
+// Read function reads a value from datainputx
+func (text *TextHashValue) Read(in *DataInputX) (Value, error) {
+	var err error
+	text.Value, err = in.ReadInt32()
+	return text, err
+}
+
+// Write function writes a number value to dataoutputx
+func (text *TextHashValue) Write(out *DataOutputX) error {
+	_, err := out.WriteInt32(text.Value)
+	return err
+}
+
+// GetValueType returns value type
+func (text *TextHashValue) GetValueType() byte {
+	return valueconstants.TEXT_HASH
+}
+
+// ToString returns converted string value from decimal value
+func (text *TextHashValue) ToString() string {
+	v := strconv.FormatInt(int64(text.Value), 10)
+	return v
+}

scouterx/common/netdata/valuecreator.go

@@ -4,21 +4,29 @@ import (
 	valueconstants "github.com/scouter-contrib/scouter-agent-golang/scouterx/common/constants/valueconstant"
 )
 
-//CreateValue return Value instacne
+//CreateValue return Value instance
 func CreateValue(valueType byte) Value {
 	switch valueType {
 	case valueconstants.NULL:
 		return NewNilValue()
-	case valueconstants.FLOAT:
-		return NewFloatEmptyValue()
+	case valueconstants.BOOLEAN:
+		return NewBooleanEmptyValue()
 	case valueconstants.DECIMAL:
 		return NewDecimalEmptyValue()
-	case valueconstants.LIST:
-		return NewListValue()
+	case valueconstants.FLOAT:
+		return NewFloatEmptyValue()
+	case valueconstants.DOUBLE:
+		return NewDoubleEmptyValue()
 	case valueconstants.TEXT:
 		return NewTextEmptyValue()
-	case valueconstants.BOOLEAN:
-		return NewBooleanEmptyValue()
+	case valueconstants.TEXT_HASH:
+		return NewTextHashEmptyValue()
+	case valueconstants.BLOB:
+		return NewBlobEmptyValue()
+	case valueconstants.IP4ADDR:
+		return NewBlobEmptyValue()
+	case valueconstants.LIST:
+		return NewListValue()
 	case valueconstants.MAP:
 		return NewMapValue()
 	default: