further address @Issif feedback, mv otlp_init*go outputs/

Signed-off-by: JuanJo Ciarlante <[email protected]>

README.md

@@ -670,6 +670,15 @@ dynatrace:
   apiurl: "" # Dynatrace API url, use https://ENVIRONMENTID.live.dynatrace.com/api for Dynatrace SaaS and https://YOURDOMAIN/e/ENVIRONMENTID/api for Dynatrace Managed, more info : https://dt-url.net/ej43qge
   # minimumpriority: "" # minimum priority of event for using this output, order is emergency|alert|critical|error|warning|notice|informational|debug or "" (default)
   # checkcert: true # check if ssl certificate of the output is valid (default: true)
+
+otlp:
+  traces:
+    # endpoint: "" # OTLP endpoint in the form of http://{domain or ip}:4318/
+    # synced: false # Set to true if you want traces to be sent synchronously
+    # minimumpriority: "" # minimum priority of event for using this output, order is emergency|alert|critical|error|warning|notice|informational|debug or "" (default)
+    # checkcert: false # Set if you want to skip TLS certificate validation
+    # duration: 1000 # Artificial span duration in milliseconds
+    # traceidhash: "" # Trace ID Hash "seed" as gotemplate, to select fields from falcopayload output fields (default: automatic to support Kubernetes' or just container.ID)
 ```
 
 Usage :
@@ -1227,6 +1236,7 @@ order is
 - **OTLP_TRACES_SYNCED**: synced OTLP traces, instead of batched (default: `false`)
 - **OTLP_TRACES_CHECKCERT**: check if ssl certificate of the endpoint is valid (default: `false`)
 - **OTLP_TRACES_DURATION**: artificial duration for trace spans in milliseconds (default: `1000`)
+- **OTLP_TRACES_TRACEIDHASH**: trace ID Hash "seed" as gotemplate, to select fields from falcopayload output fields (default: automatic to support Kubernetes' or just container.ID)
 #### Slack/Rocketchat/Mattermost/Googlechat Message Formatting
 
 The `SLACK_MESSAGEFORMAT` environment variable and `slack.messageformat` YAML

config.go

@@ -16,6 +16,7 @@ import (
 	kingpin "github.com/alecthomas/kingpin/v2"
 	"github.com/spf13/viper"
 
+	"github.com/falcosecurity/falcosidekick/outputs"
 	"github.com/falcosecurity/falcosidekick/types"
 )
 
@@ -35,7 +36,7 @@ func getConfig() *types.Configuration {
 		OTLP:            types.OTLPOutputConfig{},
 	}
 
-	otlpSetEnvs()
+	outputs.OtlpSetEnvs()
 	configFile := kingpin.Flag("config-file", "config file").Short('c').ExistingFile()
 	version := kingpin.Flag("version", "falcosidekick version").Short('v').Bool()
 	kingpin.Parse()
@@ -481,7 +482,7 @@ func getConfig() *types.Configuration {
 	v.SetDefault("OTLP.Traces.Endpoint", "")
 	v.SetDefault("OTLP.Traces.Synced", false)
 	v.SetDefault("OTLP.Traces.MinimumPriority", "")
-	v.SetDefault("OTLP.Traces.CheckCert", false)
+	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.

handlers.go

@@ -404,6 +404,6 @@ func forwardEvent(falcopayload types.FalcoPayload) {
 	}
 
 	if config.OTLP.Traces.Endpoint != "" && (falcopayload.Priority >= types.Priority(config.OTLP.Traces.MinimumPriority)) {
-		go otlpClient.OTLPPost(falcopayload)
+		go otlpClient.OTLPTracesPost(falcopayload)
 	}
 }

main.go

@@ -81,6 +81,7 @@ var (
 	promStats                     *types.PromStatistics
 
 	regPromLabels *regexp.Regexp
+	shutDownFuncs []func()
 )
 
 func init() {
@@ -733,12 +734,12 @@ func init() {
 
 	if config.OTLP.Traces.Endpoint != "" {
 		var err error
-		otlpClient, err = outputs.NewClient("OTLP", config.OTLP.Traces.Endpoint, false, false, config, stats, promStats, statsdClient, dogstatsdClient)
+		otlpClient, err = outputs.NewOtlpTracesClient(config, stats, promStats, statsdClient, dogstatsdClient)
 		if err != nil {
 			config.OTLP.Traces.Endpoint = ""
 		} else {
 			outputs.EnabledOutputs = append(outputs.EnabledOutputs, "OTLPTraces")
-			otlpShutdown = otlpInit()
+			shutDownFuncs = append(shutDownFuncs, otlpClient.ShutDownFunc)
 		}
 	}
 
@@ -747,11 +748,9 @@ func init() {
 
 }
 
-var otlpShutdown func()
-
 func main() {
-	if otlpShutdown != nil {
-		defer otlpShutdown()
+	for _, shutdown := range shutDownFuncs {
+		defer shutdown()
 	}
 	if config.Debug {
 		log.Printf("[INFO]  : Debug mode : %v", config.Debug)

outputs/client.go

@@ -102,6 +102,7 @@ type Client struct {
 	CheckCert               bool
 	HeaderList              []Header
 	ContentType             string
+	ShutDownFunc            func()
 	Config                  *types.Configuration
 	Stats                   *types.Statistics
 	PromStats               *types.PromStatistics

outputs/otlp.go

@@ -12,6 +12,7 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/DataDog/datadog-go/statsd"
 	"github.com/falcosecurity/falcosidekick/types"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -21,6 +22,20 @@ import (
 // Unit-testing helper
 var getTracerProvider = otel.GetTracerProvider
 
+func NewOtlpTracesClient(config *types.Configuration, stats *types.Statistics, promStats *types.PromStatistics, statsdClient, dogstatsdClient *statsd.Client) (*Client, error) {
+	otlpClient, err := NewClient("OTLP.Traces", config.OTLP.Traces.Endpoint, false, false, config, stats, promStats, statsdClient, dogstatsdClient)
+	if err != nil {
+		return nil, err
+	}
+	shutDownFunc, err := otlpInit(config)
+	if err != nil {
+		return nil, err
+	}
+	log.Printf("[INFO] : OTLP.Traces=%+v\n", config.OTLP.Traces)
+	otlpClient.ShutDownFunc = shutDownFunc
+	return otlpClient, nil
+}
+
 // newTrace returns a new Trace object.
 func (c *Client) newTrace(falcopayload types.FalcoPayload) *trace.Span {
 	traceID, _, err := generateTraceID(falcopayload, c.Config)
@@ -96,7 +111,7 @@ var (
 func sanitizeOutputFields(falcopayload types.FalcoPayload) map[string]interface{} {
 	ret := make(map[string]interface{})
 	for k, v := range falcopayload.OutputFields {
-	k := strings.ReplaceAll(k, ".", "_")
+		k := strings.ReplaceAll(k, ".", "_")
 		ret[k] = v
 	}
 	return ret

otlp_init.go → outputs/otlp_init.go

@@ -1,15 +1,16 @@
-package main
+package outputs
 
 import (
 	"context"
 	"fmt"
 	"log"
 	"os"
 
+	"github.com/falcosecurity/falcosidekick/types"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
-	"go.opentelemetry.io/otel/sdk/resource"
+	otelresource "go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
 )
@@ -19,21 +20,21 @@ const (
 	OTLPinstrumentationVersion = "v0.1.0"
 )
 
-func newResource() *resource.Resource {
-	return resource.NewWithAttributes(
+func newResource() *otelresource.Resource {
+	return otelresource.NewWithAttributes(
 		semconv.SchemaURL,
 		semconv.ServiceName(OTLPinstrumentationName),
 		semconv.ServiceVersion(OTLPinstrumentationVersion),
 	)
 }
 
-func installExportPipeline(ctx context.Context) (func(context.Context) error, error) {
+func installExportPipeline(config *types.Configuration, ctx context.Context) (func(context.Context) error, error) {
 	var client otlptrace.Client
-	switch config.OTLP.Traces.Insecure {
+	switch config.OTLP.Traces.CheckCert {
 	case true:
-		client = otlptracehttp.NewClient(otlptracehttp.WithInsecure())
-	case false:
 		client = otlptracehttp.NewClient()
+	case false:
+		client = otlptracehttp.NewClient(otlptracehttp.WithInsecure())
 	}
 
 	exporter, err := otlptrace.New(ctx, client)
@@ -54,19 +55,20 @@ func installExportPipeline(ctx context.Context) (func(context.Context) error, er
 	return tracerProvider.Shutdown, nil
 }
 
-func otlpInit() func() {
+func otlpInit(config *types.Configuration) (func(), error) {
 	ctx := context.Background()
 	// Registers a tracer Provider globally.
-	shutdown, err := installExportPipeline(ctx)
+	shutdown, err := installExportPipeline(config, ctx)
 	if err != nil {
-		log.Fatal(err)
+		log.Println(err)
+		return nil, err
 	}
 	shutDownCallback := func() {
 		if err := shutdown(ctx); err != nil {
-			log.Fatal(err)
+			log.Println(err)
 		}
 	}
-	return shutDownCallback
+	return shutDownCallback, nil
 }
 
 type otlpEnv struct {
@@ -114,7 +116,7 @@ func otlpSetEnv(envs []otlpEnv) string {
 // - OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS
 // - OTEL_EXPORTER_OTLP_TIMEOUT, OTEL_EXPORTER_OTLP_TRACES_TIMEOUT
 // - OTEL_EXPORTER_OTLP_PROTOCOL, OTEL_EXPORTER_OTLP_TRACES_PROTOCOL
-func otlpSetEnvs() {
+func OtlpSetEnvs() {
 	otlpSetEnv([]otlpEnv{
 		// Set OTLP_TRACES_ENDPOINT (used by config.OTLP.Traces) from SDK OTLP env vars
 		{Target: "OTLP_TRACES_ENDPOINT", EnvName: "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", Path: ""},

otlp_init_test.go → outputs/otlp_init_test.go

@@ -1,4 +1,4 @@
-package main
+package outputs
 
 import (
 	"testing"
@@ -68,7 +68,7 @@ func TestOtlpInit(t *testing.T) {
 	for _, c := range cases {
 		otlpOS = newMockOS()
 		otlpOS.Setenv(c.key, c.value)
-		otlpSetEnvs()
+		OtlpSetEnvs()
 		require.Equal(t, c.wantedValue, otlpOS.Getenv(c.wantedKey), c.msg)
 	}
 }