chore: bump to otel version v0.120.0

Signed-off-by: Bence Csati <[email protected]>

Author: csatib02

.github/workflows/go.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.22'
+        go-version: '1.24'
 
     - name: Build
       run: go build -v ./...

README.md

@@ -40,7 +40,7 @@ Forward is the protocol used by Fluentd to route message between peers.
 
 See the default values in the method `createDefaultConfig()` in [factory.go](factory.go) file.
 
-Example, for `default_labels_enabled` that will add only the `time` attribute in the log record:
+Example, for `default_labels_enabled` that will add only the `timestamp` attribute in the log record:
 
 ```yaml
 exporters:
@@ -52,12 +52,13 @@ exporters:
     tag: nginx
     compress_gzip: true
     default_labels_enabled:
-      time: true
-      exporter: false
-      job: false
-      instance: false
+      timestamp: true
+      level: false
+      message: false
 ```
 
+But a best practice is to have at least `timestamp`, `level` and `message` in the exported log record to a Fluent endpoint.
+
 Example with TLS enabled and shared key:
 
 ```yaml

config.go

@@ -72,6 +72,7 @@ type Config struct {
 	configretry.BackOffConfig  `mapstructure:"retry_on_failure"`
 }
 
+// Endpoint defines the address of the server to connect to.
 type Endpoint struct {
 	// TCPAddr is the address of the server to connect to.
 	TCPAddr string `mapstructure:"tcp_addr"`

config_test.go

@@ -55,10 +55,9 @@ func TestLoadConfigNewExporter(t *testing.T) {
 				Tag:          "tag",
 				CompressGzip: false,
 				DefaultLabelsEnabled: map[string]bool{
-					"time":     true,
-					"exporter": true,
-					"job":      true,
-					"instance": true,
+					"timestamp": true,
+					"level":     true,
+					"message":   true,
 				},
 				BackOffConfig: configretry.BackOffConfig{
 					Enabled:             true,

exporter.go

@@ -8,9 +8,11 @@ import (
 	"fmt"
 	"strings"
 	"sync"
+	"time"
 
 	fclient "github.com/IBM/fluent-forward-go/fluent/client"
 	"github.com/IBM/fluent-forward-go/fluent/protocol"
+	fproto "github.com/IBM/fluent-forward-go/fluent/protocol"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/plog"
@@ -86,7 +88,7 @@ func (f *fluentforwardExporter) connectForward() {
 
 func (f *fluentforwardExporter) pushLogData(ctx context.Context, ld plog.Logs) error {
 	// move for loops into a translator
-	entries := []protocol.EntryExt{}
+	entries := []fproto.EntryExt{}
 	rls := ld.ResourceLogs()
 	for i := 0; i < rls.Len(); i++ {
 		ills := rls.At(i).ScopeLogs()
@@ -95,8 +97,8 @@ func (f *fluentforwardExporter) pushLogData(ctx context.Context, ld plog.Logs) e
 			logs := ills.At(j).LogRecords()
 			for k := 0; k < logs.Len(); k++ {
 				log := logs.At(k)
-				entry := protocol.EntryExt{
-					Timestamp: protocol.EventTimeNow(),
+				entry := fproto.EntryExt{
+					Timestamp: fproto.EventTimeNow(),
 					Record:    f.convertLogToMap(log, rls.At(i)),
 				}
 				entries = append(entries, entry)
@@ -113,16 +115,24 @@ func (f *fluentforwardExporter) pushLogData(ctx context.Context, ld plog.Logs) e
 func (f *fluentforwardExporter) convertLogToMap(lr plog.LogRecord, res plog.ResourceLogs) map[string]interface{} {
 	// move function into a translator
 	m := make(map[string]interface{})
-	m["severity"] = lr.SeverityText()
-	m["message"] = lr.Body().AsString()
-	for key, val := range f.config.DefaultLabelsEnabled {
-		if val {
-			attribute, found := lr.Attributes().Get(key)
-			if found {
-				m[key] = attribute.AsString()
+	for k, v := range f.config.DefaultLabelsEnabled {
+		if v {
+			switch k {
+			case "level":
+				m[k] = lr.SeverityText()
+			case "message":
+				m[k] = lr.Body().AsString()
+			case "timestamp":
+				m[k] = lr.Timestamp().AsTime().UTC().Format(time.RFC3339Nano)
 			}
 		}
 	}
+
+	lr.Attributes().Range(func(k string, v pcommon.Value) bool {
+		m[k] = v.AsString()
+		return true
+	})
+
 	if f.config.KubernetesMetadata != nil {
 		key := f.config.KubernetesMetadata.Key
 		if f.config.KubernetesMetadata.Key == "" {
@@ -175,7 +185,7 @@ func (f *fluentforwardExporter) convertLogToMap(lr plog.LogRecord, res plog.Reso
 
 type sendFunc func(string, protocol.EntryList) error
 
-func (f *fluentforwardExporter) send(sendMethod sendFunc, entries []protocol.EntryExt) error {
+func (f *fluentforwardExporter) send(sendMethod sendFunc, entries []fproto.EntryExt) error {
 	err := sendMethod(f.config.Tag, entries)
 	// sometimes the connection is lost, we try to reconnect and send the data again
 	if err != nil {
@@ -192,10 +202,10 @@ func (f *fluentforwardExporter) send(sendMethod sendFunc, entries []protocol.Ent
 	return nil
 }
 
-func (f *fluentforwardExporter) sendCompressed(entries []protocol.EntryExt) error {
+func (f *fluentforwardExporter) sendCompressed(entries []fproto.EntryExt) error {
 	return f.send(f.client.SendCompressed, entries)
 }
 
-func (f *fluentforwardExporter) sendForward(entries []protocol.EntryExt) error {
+func (f *fluentforwardExporter) sendForward(entries []fproto.EntryExt) error {
 	return f.send(f.client.SendForward, entries)
 }

factory.go

@@ -51,10 +51,9 @@ func createDefaultConfig() component.Config {
 		Tag:          "tag",
 		CompressGzip: false,
 		DefaultLabelsEnabled: map[string]bool{
-			"time":     true,
-			"exporter": true,
-			"job":      true,
-			"instance": true,
+			"timestamp": true,
+			"level":     true,
+			"message":   true,
 		},
 		BackOffConfig: configretry.NewDefaultBackOffConfig(),
 		QueueConfig:   exporterhelper.NewDefaultQueueConfig(),

factory_test.go

@@ -60,10 +60,9 @@ func TestNewExporterFullConfig(t *testing.T) {
 			Tag:          "tag",
 			CompressGzip: true,
 			DefaultLabelsEnabled: map[string]bool{
-				"time":     true,
-				"exporter": true,
-				"job":      true,
-				"instance": true,
+				"timestamp": true,
+				"level":     true,
+				"message":   true,
 			},
 			BackOffConfig: configretry.BackOffConfig{
 				Enabled:             true,

go.mod

@@ -1,61 +1,62 @@
 module github.com/axoflow/fluentforwardexporter
 
-go 1.22.0
-
-toolchain go1.23.2
+go 1.24.0
 
 require (
 	github.com/IBM/fluent-forward-go v0.2.2
 	github.com/cenkalti/backoff/v4 v4.3.0
-	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/collector/component v0.112.0
-	go.opentelemetry.io/collector/config/configretry v1.18.0
-	go.opentelemetry.io/collector/config/configtls v1.18.0
-	go.opentelemetry.io/collector/confmap v1.18.0
-	go.opentelemetry.io/collector/exporter v0.112.0
-	go.opentelemetry.io/collector/pdata v1.18.0
-	go.opentelemetry.io/otel/metric v1.31.0
-	go.opentelemetry.io/otel/trace v1.31.0
+	github.com/stretchr/testify v1.10.0
+	go.opentelemetry.io/collector/component v0.120.0
+	go.opentelemetry.io/collector/component/componenttest v0.120.0
+	go.opentelemetry.io/collector/config/configretry v1.26.0
+	go.opentelemetry.io/collector/config/configtls v1.26.0
+	go.opentelemetry.io/collector/confmap v1.24.0
+	go.opentelemetry.io/collector/exporter v0.120.0
+	go.opentelemetry.io/collector/pdata v1.26.0
+	go.opentelemetry.io/otel/metric v1.34.0
+	go.opentelemetry.io/otel/trace v1.34.0
 	go.uber.org/zap v1.27.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
-	github.com/knadh/koanf/v2 v2.1.1 // indirect
+	github.com/knadh/koanf/v2 v2.1.2 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/philhofer/fwd v1.1.1 // indirect
+	github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/tinylib/msgp v1.1.6 // indirect
-	go.opentelemetry.io/collector/config/configopaque v1.18.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.112.0 // indirect
-	go.opentelemetry.io/collector/consumer v0.112.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumererror v0.112.0 // indirect
-	go.opentelemetry.io/collector/extension v0.112.0 // indirect
-	go.opentelemetry.io/collector/extension/experimental/storage v0.112.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.112.0 // indirect
-	go.opentelemetry.io/collector/pipeline v0.112.0 // indirect
-	go.opentelemetry.io/otel v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
+	github.com/tinylib/msgp v1.2.5 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/collector/config/configopaque v1.26.0 // indirect
+	go.opentelemetry.io/collector/consumer v1.26.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror v0.120.0 // indirect
+	go.opentelemetry.io/collector/extension v0.120.0 // indirect
+	go.opentelemetry.io/collector/extension/xextension v0.120.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.26.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.120.0 // indirect
+	go.opentelemetry.io/collector/pipeline v0.120.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )