address more @Issif feedback (cleanup)

Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
falcosecurity · Jan 18, 2024 · 62b80d7 · 62b80d7
1 parent 501ede9
commit 62b80d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 71 deletions.
diff --git a/config.go b/config.go
@@ -36,12 +36,6 @@ import (
 	"github.com/falcosecurity/falcosidekick/types"
 )
 
-// NB: create OS interface to allow unit-testing
-type OS interface {
-	Getenv(string) string
-	Setenv(string, string) error
-}
-
 func getConfig() *types.Configuration {
 	c := &types.Configuration{
 		Customfields:    make(map[string]string),
@@ -515,7 +509,6 @@ func getConfig() *types.Configuration {
 	v.SetDefault("OTLP.Traces.Synced", false)
 	v.SetDefault("OTLP.Traces.MinimumPriority", "")
 	v.SetDefault("OTLP.Traces.CheckCert", true)
-	v.SetDefault("OTLP.Traces.TraceIDHash", "")
 	// NB: Unfortunately falco events don't provide endtime, artificially set
 	// it to 1000ms by default, override-able via OTLP_DURATION environment variable.
 	v.SetDefault("OTLP.Traces.Duration", 1000)

diff --git a/outputs/otlp_test.go b/outputs/otlp_test.go
@@ -25,61 +25,6 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-// Need to mock three interfaces: TracerProvider, Tracer, Span
-// type (
-// 	MockTracerProvider struct{}
-// 	MockTracer         struct{}
-// 	MockSpan           struct {
-// 		name       string
-// 		startOpts  []trace.SpanStartOption
-// 		endOpts    []trace.SpanEndOption
-// 		ctx        context.Context
-// 		attributes map[attribute.Key]attribute.Value
-// 	}
-// )
-
-// // TracerProvider interface {
-// func (*MockTracerProvider) Tracer(string, ...trace.TracerOption) trace.Tracer {
-// 	return &MockTracer{}
-// }
-
-// // Tracer interface
-// func (*MockTracer) Start(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
-// 	return ctx, &MockSpan{
-// 		ctx:        ctx,
-// 		name:       name,
-// 		startOpts:  opts,
-// 		attributes: make(map[attribute.Key]attribute.Value),
-// 	}
-// }
-
-// // Span interface
-// func (*MockSpan) AddEvent(string, ...trace.EventOption)            {}
-// func (*MockSpan) IsRecording() bool                                { return true }
-// func (*MockSpan) RecordError(err error, opts ...trace.EventOption) {}
-// func (*MockSpan) SetName(name string)                              {}
-// func (*MockSpan) SetStatus(code codes.Code, description string)    {}
-
-// func (*MockSpan) TracerProvider() trace.TracerProvider { return &MockTracerProvider{} }
-
-// func (m *MockSpan) End(opts ...trace.SpanEndOption) {
-// 	m.endOpts = opts
-// }
-
-// func (m *MockSpan) SetAttributes(kv ...attribute.KeyValue) {
-// 	for _, k := range kv {
-// 		m.attributes[k.Key] = k.Value
-// 	}
-// }
-
-// func (m *MockSpan) SpanContext() trace.SpanContext {
-// 	return trace.SpanContextFromContext(m.ctx)
-// }
-
-// func MockGetTracerProvider() trace.TracerProvider {
-// 	return &MockTracerProvider{}
-// }
-
 func startOptIn(opt trace.SpanStartOption, opts []trace.SpanStartOption) bool {
 	res := lo.Filter(opts, func(o trace.SpanStartOption, index int) bool {
 		return o == opt

diff --git a/types/types.go b/types/types.go
@@ -766,15 +766,15 @@ type OpenObserveConfig struct {
 
 // OTLPTraces represents config parameters for OTLP Traces
 type OTLPTraces struct {
-	Endpoint            string
-	Protocol            string
-	Timeout             int64
-	Headers             string
-	Duration            int64
-	Synced              bool
-	ExtraEnvVars        map[string]string
-	CheckCert           bool
-	MinimumPriority     string
+	Endpoint        string
+	Protocol        string
+	Timeout         int64
+	Headers         string
+	Duration        int64
+	Synced          bool
+	ExtraEnvVars    map[string]string
+	CheckCert       bool
+	MinimumPriority string
 }
 
 // OTLPOutputConfig represents config parameters for OTLP