Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Client DataStore data compression #23

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package client

import (
"bytes"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"encoding/json"
"fmt"
"io"
Expand Down Expand Up @@ -30,6 +32,13 @@ type TelemetryAuth struct {
IssueDate types.TelemetryTimeStamp `json:"issueDate"`
}

func (t *TelemetryAuth) HashToken(token types.TelemetryAuthToken) {
hash := sha256.New()
hash.Write([]byte(token))
hashedToken := hex.EncodeToString(hash.Sum(nil))
t.Token = types.TelemetryAuthToken(hashedToken)
}

type TelemetryClient struct {
cfg *config.Config
auth TelemetryAuth
Expand All @@ -38,6 +47,7 @@ type TelemetryClient struct {

func NewTelemetryClient(cfg *config.Config) (tc *TelemetryClient, err error) {
tc = &TelemetryClient{cfg: cfg}
tc.auth.HashToken(tc.auth.Token)
tc.processor, err = telemetrylib.NewTelemetryProcessor(&cfg.DataStores)
return
}
Expand Down
45 changes: 44 additions & 1 deletion pkg/lib/processor.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package telemetrylib

import (
"bytes"
"compress/gzip"
"fmt"
"log"
"strings"
Expand All @@ -20,6 +22,12 @@ type TelemetryProcessor interface {
tags types.Tags,
) (err error)

// Data compression method
CompressData(
data []byte,
format string,
) (compressedData []byte, err error)

// Generate telemetry bundle
GenerateBundle(
clientId int64,
Expand Down Expand Up @@ -107,7 +115,11 @@ func NewTelemetryProcessor(cfg *config.DBConfig) (TelemetryProcessor, error) {
}

func (p *TelemetryProcessorImpl) AddData(telemetry types.TelemetryType, marshaledData []byte, tags types.Tags) (err error) {
dataItemRow, err := NewTelemetryDataItemRow(telemetry, tags, marshaledData)
compressedData, err := p.CompressData(marshaledData, "gzip")
if err != nil {
return fmt.Errorf("unable to compress telemetry data: %s", err.Error())
}
dataItemRow, err := NewTelemetryDataItemRow(telemetry, tags, compressedData)
if err != nil {
return fmt.Errorf("unable to create telemetry data: %s", err.Error())
}
Expand All @@ -116,6 +128,37 @@ func (p *TelemetryProcessorImpl) AddData(telemetry types.TelemetryType, marshale
return
}

func (p *TelemetryProcessorImpl) CompressData(marshaledData []byte, format string) (compressedData []byte, err error) {
switch format {
case "gzip":
zd, err := p.compressGZIP(marshaledData)
return zd.Bytes(), err
}
return
}

func (p *TelemetryProcessorImpl) compressGZIP(marshaledData []byte) (compressedData bytes.Buffer, err error) {
var encoder *gzip.Writer
var tmpBuffer bytes.Buffer

encoder, err = gzip.NewWriterLevel(&tmpBuffer, gzip.BestCompression)
if err != nil {
return tmpBuffer, err
}

_, err = encoder.Write(marshaledData)
if err != nil {
return tmpBuffer, err
}
defer encoder.Close()

if err := encoder.Close(); err != nil {
return tmpBuffer, err
}

return tmpBuffer, nil
}

func (p *TelemetryProcessorImpl) GenerateBundle(clientId int64, customerId string, tags types.Tags) (bundleRow *TelemetryBundleRow, err error) {

bundleRow, err = NewTelemetryBundleRow(clientId, customerId, tags)
Expand Down
Loading