Refactor encoding field in Config struct to remove pointer and update usage in exporter

feat: enhance OpenTelemetry collector configuration with Prometheus support and improved metrics handling

Author: gafda

exporter/googlecloudstorageexporter/config.go

@@ -18,8 +18,8 @@ var (
 )
 
 type Config struct {
-	Encoding *component.ID `mapstructure:"encoding"`
-	Bucket   bucketConfig  `mapstructure:"bucket"`
+	Encoding component.ID `mapstructure:"encoding"`
+	Bucket   bucketConfig `mapstructure:"bucket"`
 }
 
 type bucketConfig struct {

exporter/googlecloudstorageexporter/config_test.go

@@ -28,10 +28,7 @@ func TestValidate(t *testing.T) {
 		{
 			id: component.NewIDWithName(metadata.Type, ""),
 			expected: &Config{
-				Encoding: func() *component.ID {
-					id := component.MustNewID("test")
-					return &id
-				}(),
+				Encoding: component.MustNewID("test"),
 				Bucket: bucketConfig{
 					Name:       "test-bucket",
 					Region:     "test-region",

exporter/googlecloudstorageexporter/exporter.go

@@ -104,18 +104,27 @@ func isBucketConflictError(err error) bool {
 func (s *storageExporter) Start(ctx context.Context, host component.Host) error {
 	s.logsMarshaler = &plog.JSONMarshaler{}
 	s.tracesMarshaler = &ptrace.JSONMarshaler{}
-	if s.cfg.Encoding != nil {
-		logsEncoding, err := loadExtension[plog.Marshaler](host, *s.cfg.Encoding, "logs marshaler")
-		if err != nil {
-			return fmt.Errorf("failed to load logs extension: %w", err)
+
+	s.logger.Info("GCS Exporter configuration", zap.String("encoding", s.cfg.Encoding.String()))
+
+	if s.cfg.Encoding.String() != "" {
+		logsEncoding, errLogs := loadExtension[plog.Marshaler](host, s.cfg.Encoding, "logs marshaler")
+		if errLogs == nil {
+			s.logsMarshaler = logsEncoding
+		} else {
+			s.logger.Debug("Extension does not support logs marshaler", zap.Error(errLogs))
 		}
-		s.logsMarshaler = logsEncoding
 
-		tracesEncoding, err := loadExtension[ptrace.Marshaler](host, *s.cfg.Encoding, "traces marshaler")
-		if err != nil {
-			return fmt.Errorf("failed to load traces extension: %w", err)
+		tracesEncoding, errTraces := loadExtension[ptrace.Marshaler](host, s.cfg.Encoding, "traces marshaler")
+		if errTraces == nil {
+			s.tracesMarshaler = tracesEncoding
+		} else {
+			s.logger.Debug("Extension does not support traces marshaler", zap.Error(errTraces))
+		}
+
+		if errLogs != nil && errTraces != nil {
+			return fmt.Errorf("failed to load extension %q: %w; %w", s.cfg.Encoding, errLogs, errTraces)
 		}
-		s.tracesMarshaler = tracesEncoding
 	}
 
 	// TODO Add option for authenticator

exporter/googlecloudstorageexporter/exporter_test.go

@@ -128,10 +128,12 @@ func TestStart(t *testing.T) {
 
 	encodingSucceedsID := "id_success"
 	encodingFailsID := "id_fail"
+	encodingLogsOnlyID := "id_logs_only"
 	mHost := &mockHost{
 		extensions: map[component.ID]component.Component{
 			component.MustNewID(encodingFailsID):    nil,
 			component.MustNewID(encodingSucceedsID): &mockBothMarshaler{},
+			component.MustNewID(encodingLogsOnlyID): &mockLogMarshaler{},
 		},
 	}
 
@@ -149,22 +151,31 @@ func TestStart(t *testing.T) {
 		require.Equal(t, &ptrace.JSONMarshaler{}, gcsExporter.tracesMarshaler)
 	})
 
-	gcsExporter.cfg.Encoding = &id
+	gcsExporter.cfg.Encoding = id
 	t.Run("encoding id not present", func(t *testing.T) {
 		err := gcsExporter.Start(t.Context(), mHost)
 		require.ErrorContains(t, err, "unknown extension")
 	})
 
 	id = component.MustNewID(encodingFailsID)
 
-	gcsExporter.cfg.Encoding = &id
+	gcsExporter.cfg.Encoding = id
 	t.Run("encoding id not a logs marshaler", func(t *testing.T) {
 		err := gcsExporter.Start(t.Context(), mHost)
 		require.ErrorContains(t, err, "is not a logs marshaler")
 	})
 
+	id = component.MustNewID(encodingLogsOnlyID)
+	gcsExporter.cfg.Encoding = id
+	t.Run("encoding id only logs marshaler", func(t *testing.T) {
+		err := gcsExporter.Start(t.Context(), mHost)
+		require.NoError(t, err)
+		require.IsType(t, &mockLogMarshaler{}, gcsExporter.logsMarshaler)
+		require.IsType(t, &ptrace.JSONMarshaler{}, gcsExporter.tracesMarshaler)
+	})
+
 	id = component.MustNewID(encodingSucceedsID)
-	gcsExporter.cfg.Encoding = &id
+	gcsExporter.cfg.Encoding = id
 
 	t.Run("create new bucket", func(t *testing.T) {
 		err := gcsExporter.Start(t.Context(), mHost)
@@ -201,7 +212,7 @@ func TestUploadFile(t *testing.T) {
 		Bucket: bucketConfig{
 			Name: uploadBucketName,
 		},
-		Encoding: &id,
+		Encoding: id,
 	})
 
 	t.Run("empty content", func(t *testing.T) {
@@ -370,7 +381,7 @@ func TestConsumeTraces(t *testing.T) {
 		Bucket: bucketConfig{
 			Name: uploadBucketName,
 		},
-		Encoding: &id,
+		Encoding: id,
 	})
 
 	errStart := gcsExporter.Start(t.Context(), mHost)