chore: Save component.TelemetrySettings on chronicle exporter (#2047)

* chore: Minor cleanup of chronicle exporter names * chore: Chronicle exporter - save component.TelemetrySettings
observIQ · Dec 12, 2024 · e7ce981 · e7ce981
1 parent 8d67555
commit e7ce981
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/exporter/chronicleexporter/exporter.go b/exporter/chronicleexporter/exporter.go
@@ -52,7 +52,7 @@ const (
 
 type chronicleExporter struct {
 	cfg                     *Config
-	logger                  *zap.Logger
+	set                     component.TelemetrySettings
 	marshaler               logMarshaler
 	collectorID, exporterID string
 
@@ -85,7 +85,7 @@ func newExporter(cfg *Config, params exporter.Settings, collectorID, exporterID
 
 	return &chronicleExporter{
 		cfg:         cfg,
-		logger:      params.Logger,
+		set:         params.TelemetrySettings,
 		metrics:     newHostMetricsReporter(uuidCID[:], customerID[:], exporterID, cfg.Namespace),
 		marshaler:   marshaller,
 		collectorID: collectorID,
@@ -238,12 +238,12 @@ func (ce *chronicleExporter) startHostMetricsCollection(ctx context.Context) {
 		case <-ticker.C:
 			err := ce.metrics.collectHostMetrics()
 			if err != nil {
-				ce.logger.Error("Failed to collect host metrics", zap.Error(err))
+				ce.set.Logger.Error("Failed to collect host metrics", zap.Error(err))
 			}
 			request := ce.metrics.getAndReset()
 			_, err = ce.grpcClient.BatchCreateEvents(ctx, request, ce.buildOptions()...)
 			if err != nil {
-				ce.logger.Error("Failed to upload host metrics", zap.Error(err))
+				ce.set.Logger.Error("Failed to upload host metrics", zap.Error(err))
 			}
 		}
 	}
@@ -317,9 +317,9 @@ func (ce *chronicleExporter) uploadToChronicleHTTP(ctx context.Context, logs *ap
 	respBody, err := io.ReadAll(resp.Body)
 	if resp.StatusCode != http.StatusOK {
 		if err != nil {
-			ce.logger.Warn("Failed to read response body", zap.Error(err))
+			ce.set.Logger.Warn("Failed to read response body", zap.Error(err))
 		} else {
-			ce.logger.Warn("Received non-OK response from Chronicle", zap.String("status", resp.Status), zap.ByteString("response", respBody))
+			ce.set.Logger.Warn("Received non-OK response from Chronicle", zap.String("status", resp.Status), zap.ByteString("response", respBody))
 		}
 		return fmt.Errorf("received non-OK response from Chronicle: %s", resp.Status)
 	}

diff --git a/exporter/chronicleexporter/exporter_test.go b/exporter/chronicleexporter/exporter_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/observiq/bindplane-agent/exporter/chronicleexporter/protos/api/mocks"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/consumer/consumererror"
-	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -52,7 +52,7 @@ func TestLogsDataPusher(t *testing.T) {
 				return &chronicleExporter{
 					cfg:        &cfg,
 					metrics:    newHostMetricsReporter([]byte{}, []byte{}, "", cfg.Namespace),
-					logger:     zap.NewNop(),
+					set:        componenttest.NewNopTelemetrySettings(),
 					grpcClient: mockClient,
 					marshaler:  marshaller,
 				}
@@ -71,7 +71,7 @@ func TestLogsDataPusher(t *testing.T) {
 				return &chronicleExporter{
 					cfg:        &cfg,
 					metrics:    newHostMetricsReporter([]byte{}, []byte{}, "", cfg.Namespace),
-					logger:     zap.NewNop(),
+					set:        componenttest.NewNopTelemetrySettings(),
 					grpcClient: mockClient,
 					marshaler:  marshaller,
 				}
@@ -92,7 +92,7 @@ func TestLogsDataPusher(t *testing.T) {
 				return &chronicleExporter{
 					cfg:        &cfg,
 					metrics:    newHostMetricsReporter([]byte{}, []byte{}, "", cfg.Namespace),
-					logger:     zap.NewNop(),
+					set:        componenttest.NewNopTelemetrySettings(),
 					grpcClient: mockClient,
 					marshaler:  marshaller,
 				}
@@ -114,7 +114,7 @@ func TestLogsDataPusher(t *testing.T) {
 				return &chronicleExporter{
 					cfg:        &cfg,
 					metrics:    newHostMetricsReporter([]byte{}, []byte{}, "", cfg.Namespace),
-					logger:     zap.NewNop(),
+					set:        componenttest.NewNopTelemetrySettings(),
 					grpcClient: mockClient,
 					marshaler:  marshaller,
 				}
@@ -134,7 +134,7 @@ func TestLogsDataPusher(t *testing.T) {
 				return &chronicleExporter{
 					cfg:        &cfg,
 					metrics:    newHostMetricsReporter([]byte{}, []byte{}, "", cfg.Namespace),
-					logger:     zap.NewNop(),
+					set:        componenttest.NewNopTelemetrySettings(),
 					grpcClient: mockClient,
 					marshaler:  marshaller,
 				}