Skip to content

Commit dd732aa

Browse files
WIP
Signed-off-by: Thomas Poignant <[email protected]>
1 parent 06b8bc3 commit dd732aa

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

Diff for: cmd/relayproxy/config/config.go

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/knadh/koanf/providers/posflag"
1919
"github.com/knadh/koanf/v2"
2020
"github.com/spf13/pflag"
21+
ffclient "github.com/thomaspoignant/go-feature-flag"
2122
"github.com/xitongsys/parquet-go/parquet"
2223
"go.uber.org/zap"
2324
"go.uber.org/zap/zapcore"
@@ -45,6 +46,7 @@ var DefaultExporter = struct {
4546
MaxEventInMemory int64
4647
ParquetCompressionCodec string
4748
LogLevel string
49+
ExporterEventType ffclient.ExporterEventType
4850
}{
4951
Format: "JSON",
5052
LogFormat: "[{{ .FormattedDate}}] user=\"{{ .UserKey}}\", flag=\"{{ .Key}}\", value=\"{{ .Value}}\"",
@@ -55,6 +57,7 @@ var DefaultExporter = struct {
5557
MaxEventInMemory: 100000,
5658
ParquetCompressionCodec: parquet.CompressionCodec_SNAPPY.String(),
5759
LogLevel: DefaultLogLevel,
60+
ExporterEventType: ffclient.FeatureEventExporter,
5861
}
5962

6063
// New is reading the configuration file

Diff for: cmd/relayproxy/config/exporter.go

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ type ExporterConf struct {
3333
AccountName string `mapstructure:"accountName" koanf:"accountname"`
3434
AccountKey string `mapstructure:"accountKey" koanf:"accountkey"`
3535
Container string `mapstructure:"container" koanf:"container"`
36+
ExporterEventType string `mapstructure:"eventType" koanf:"eventtype"`
3637
}
3738

3839
func (c *ExporterConf) IsValid() error {

Diff for: cmd/relayproxy/controller/collect_eval_data_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func Test_collect_tracking_and_evaluation_events(t *testing.T) {
193193
//
194194
// PLEASE REWORK THIS TEST
195195
//
196-
//
196+
// TODO: Do some tests that the exporterEventType is correctly set in the exporter
197197
//
198198
//
199199
//

Diff for: cmd/relayproxy/service/gofeatureflag.go

+5
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ func initDataExporters(proxyConf *config.Config) ([]ffclient.DataExporter, error
168168
}
169169

170170
func initDataExporter(c *config.ExporterConf) (ffclient.DataExporter, error) {
171+
exporterEventType := c.ExporterEventType
172+
if exporterEventType == "" {
173+
exporterEventType = config.DefaultExporter.ExporterEventType
174+
}
171175
dataExp := ffclient.DataExporter{
172176
FlushInterval: func() time.Duration {
173177
if c.FlushInterval != 0 {
@@ -181,6 +185,7 @@ func initDataExporter(c *config.ExporterConf) (ffclient.DataExporter, error) {
181185
}
182186
return config.DefaultExporter.MaxEventInMemory
183187
}(),
188+
ExporterEventType: exporterEventType,
184189
}
185190

186191
var err error

0 commit comments

Comments
 (0)