more fixes

Signed-off-by: MJarmo <michal.jarmolkiewicz@sap.com>

Author: MJarmo

.checkapi.yaml

@@ -34,7 +34,9 @@ ignored_paths:
   - processor/tailsamplingprocessor
   - receiver/hostmetricsreceiver # issue with the parser not identifying Config as a config struct
   - receiver/pulsarreceiver # 38930
+  - receiver/auditlogreceiver/test-standalone # test module
   - exporter/pulsarexporter # 38929
+  - test-auditlog # test module
   - exporter/elasticsearchexporter/integrationtest
   - testbed/mockdatasenders/mockdatadogagentexporter
   - extension/sumologicextension # 40655

receiver/auditlogreceiver/circuitbreaker.go

@@ -4,78 +4,78 @@
 package auditlogreceiver
 
 import (
-	"fmt"
+	"errors"
 	"sync"
 	"time"
 
 	"go.uber.org/zap"
 )
 
-type CircuitBreakerState int
+type circuitBreakerState int
 
 const (
-	CircuitClosed CircuitBreakerState = iota
-	CircuitOpen
-	CircuitHalfOpen
+	circuitClosed circuitBreakerState = iota
+	circuitOpen
+	circuitHalfOpen
 )
 
-type CircuitBreaker struct {
-	state            CircuitBreakerState
+type circuitBreaker struct {
+	state            circuitBreakerState
 	consecutiveFails int
 	lastFailureTime  time.Time
 	mutex            sync.RWMutex
 	logger           *zap.Logger
 	config           CircuitBreakerConfig
 }
 
-func NewCircuitBreaker(config CircuitBreakerConfig, logger *zap.Logger) *CircuitBreaker {
-	return &CircuitBreaker{
-		state:  CircuitClosed,
+func newCircuitBreaker(config CircuitBreakerConfig, logger *zap.Logger) *circuitBreaker {
+	return &circuitBreaker{
+		state:  circuitClosed,
 		config: config,
 		logger: logger,
 	}
 }
 
-func (cb *CircuitBreaker) IsOpen() bool {
+func (cb *circuitBreaker) IsOpen() bool {
 	cb.mutex.RLock()
 	defer cb.mutex.RUnlock()
 
-	if cb.state == CircuitOpen {
+	if cb.state == circuitOpen {
 		openDuration := cb.config.CircuitOpenDuration
 		if openDuration == 0 {
 			openDuration = time.Minute
 		}
 		if time.Since(cb.lastFailureTime) >= openDuration {
-			cb.state = CircuitHalfOpen
+			cb.state = circuitHalfOpen
 			cb.logger.Info("Circuit breaker transitioning to half-open state")
 		}
-		return cb.state == CircuitOpen
+		return cb.state == circuitOpen
 	}
 	return false
 }
 
-func (cb *CircuitBreaker) IsHalfOpen() bool {
+func (cb *circuitBreaker) IsHalfOpen() bool {
 	cb.mutex.RLock()
 	defer cb.mutex.RUnlock()
-	return cb.state == CircuitHalfOpen
+	return cb.state == circuitHalfOpen
 }
 
-func (cb *CircuitBreaker) RecordSuccess() {
+func (cb *circuitBreaker) RecordSuccess() {
 	cb.mutex.Lock()
 	defer cb.mutex.Unlock()
 
 	cb.consecutiveFails = 0
 	previousState := cb.state
-	cb.state = CircuitClosed
+	cb.state = circuitClosed
 
-	if previousState == CircuitHalfOpen {
+	if previousState == circuitHalfOpen {
 		cb.logger.Info("Circuit breaker transitioned from half-open to closed due to successful operation")
 	} else {
 		cb.logger.Info("Circuit breaker closed due to successful operation")
 	}
 }
 
-func (cb *CircuitBreaker) RecordFailure() {
+func (cb *circuitBreaker) RecordFailure() {
 	cb.mutex.Lock()
 	defer cb.mutex.Unlock()
 
@@ -87,69 +87,60 @@ func (cb *CircuitBreaker) RecordFailure() {
 		threshold = 5
 	}
 
-	if cb.state == CircuitHalfOpen {
-		cb.state = CircuitOpen
+	if cb.state == circuitHalfOpen {
+		cb.state = circuitOpen
 		cb.logger.Warn("Circuit breaker reopened due to failure in half-open state",
 			zap.Int("failures", cb.consecutiveFails))
 	} else if cb.consecutiveFails >= threshold {
-		cb.state = CircuitOpen
+		cb.state = circuitOpen
 		cb.logger.Warn("Circuit breaker opened due to consecutive failures",
 			zap.Int("failures", cb.consecutiveFails))
 	}
 }
 
-// for debugging/monitoring
-func (cb *CircuitBreaker) GetState() CircuitBreakerState {
+func (cb *circuitBreaker) getState() circuitBreakerState {
 	cb.mutex.RLock()
 	defer cb.mutex.RUnlock()
 	return cb.state
 }
 
-// for debugging/monitoring
-func (cb *CircuitBreaker) GetConsecutiveFailures() int {
-	cb.mutex.RLock()
-	defer cb.mutex.RUnlock()
-	return cb.consecutiveFails
-}
-
-func (cb *CircuitBreaker) ShouldAttemptProcessing() bool {
+func (cb *circuitBreaker) shouldAttemptProcessing() bool {
 	cb.mutex.RLock()
 	defer cb.mutex.RUnlock()
 
-	return cb.state == CircuitClosed || cb.state == CircuitHalfOpen
+	return cb.state == circuitClosed || cb.state == circuitHalfOpen
 }
 
 // CheckAndUpdateState checks if the circuit breaker should transition states
-func (cb *CircuitBreaker) CheckAndUpdateState() {
+func (cb *circuitBreaker) checkAndUpdateState() {
 	cb.mutex.Lock()
 	defer cb.mutex.Unlock()
 
-	if cb.state == CircuitOpen {
+	if cb.state == circuitOpen {
 		openDuration := cb.config.CircuitOpenDuration
 		if openDuration == 0 {
 			openDuration = time.Minute
 		}
 		if time.Since(cb.lastFailureTime) >= openDuration {
-			cb.state = CircuitHalfOpen
+			cb.state = circuitHalfOpen
 			cb.logger.Info("Circuit breaker transitioning to half-open state")
 		}
 	}
 }
 
-// CheckCircuitBreakerState checks and updates circuit breaker state, returns true if processing should continue
-func (cb *CircuitBreaker) CheckCircuitBreakerState(entryID string) (bool, error) {
-	// Check and update circuit breaker state
-	cb.CheckAndUpdateState()
+// checkCircuitBreakerState checks and updates circuit breaker state, returns true if processing should continue
+func (cb *circuitBreaker) checkCircuitBreakerState(entryID string) (bool, error) {
+	cb.checkAndUpdateState()
 
-	if !cb.ShouldAttemptProcessing() {
-		return false, fmt.Errorf("circuit breaker is open, skipping processing")
+	if !cb.shouldAttemptProcessing() {
+		return false, errors.New("circuit breaker is open, skipping processing")
 	}
 
-	// Log the circuit breaker state for debugging
-	state := cb.GetState()
-	if state == CircuitHalfOpen {
+	state := cb.getState()
+	switch state {
+	case circuitHalfOpen:
 		cb.logger.Debug("Processing log in half-open state to test connectivity", zap.String("id", entryID))
-	} else if state == CircuitClosed {
+	case circuitClosed:
 		cb.logger.Debug("Processing log in closed state (normal operation)", zap.String("id", entryID))
 	}
 

…eceiver/examples/otlp_request_example.go …/request_example/otlp_request_example.goreceiver/auditlogreceiver/examples/otlp_request_example.go renamed to receiver/auditlogreceiver/examples/request_example/otlp_request_example.go receiver/auditlogreceiver/examples/otlp_request_example.go renamed to receiver/auditlogreceiver/examples/request_example/otlp_request_example.go

@@ -1,6 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build ignore
+
 package main
 
 import (

…logreceiver/examples/test_otlp_client.go …examples/test_client/test_otlp_client.goreceiver/auditlogreceiver/examples/test_otlp_client.go renamed to receiver/auditlogreceiver/examples/test_client/test_otlp_client.go receiver/auditlogreceiver/examples/test_otlp_client.go renamed to receiver/auditlogreceiver/examples/test_client/test_otlp_client.go

@@ -1,6 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build ignore
+
 package main
 
 import (

receiver/auditlogreceiver/factory.go

@@ -6,11 +6,12 @@ package auditlogreceiver
 import (
 	"context"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/auditlogreceiver/internal/metadata"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/auditlogreceiver/internal/metadata"
 )
 
 func NewFactory() receiver.Factory {
@@ -30,10 +31,10 @@ func createDefaultConfig() component.Config {
 	}
 }
 
-//type CreateLogsFunc func(context.Context, Settings, component.Config, consumer.Logs) (Logs, error)
+// type CreateLogsFunc func(context.Context, Settings, component.Config, consumer.Logs) (Logs, error)
 
 func createLogsReceiver(
-	ctx context.Context,
+	_ context.Context,
 	set receiver.Settings,
 	cfg component.Config,
 	consumer consumer.Logs,

receiver/auditlogreceiver/otlp_test.go

@@ -23,12 +23,12 @@ type mockConsumer struct {
 	logs []plog.Logs
 }
 
-func (m *mockConsumer) ConsumeLogs(ctx context.Context, logs plog.Logs) error {
+func (m *mockConsumer) ConsumeLogs(_ context.Context, logs plog.Logs) error {
 	m.logs = append(m.logs, logs)
 	return nil
 }
 
-func (m *mockConsumer) Capabilities() consumer.Capabilities {
+func (*mockConsumer) Capabilities() consumer.Capabilities {
 	return consumer.Capabilities{}
 }
 
@@ -64,33 +64,26 @@ func TestHandleOTLPProtobuf(t *testing.T) {
 		t.Fatalf("Failed to marshal OTLP request: %v", err)
 	}
 
-	// Create HTTP request
-	req := httptest.NewRequest("POST", "/v1/logs", bytes.NewReader(requestData))
+	req := httptest.NewRequest(http.MethodPost, "/v1/logs", bytes.NewReader(requestData))
 	req.Header.Set("Content-Type", "application/x-protobuf")
 
-	// Create response recorder
 	w := httptest.NewRecorder()
 
-	// Handle the request
 	r.handleAuditLogs(w, req)
 
-	// Check response
 	if w.Code != http.StatusOK {
 		t.Errorf("Expected status 200, got %d", w.Code)
 	}
 
-	// Check content type
 	contentType := w.Header().Get("Content-Type")
 	if contentType != "application/x-protobuf" {
 		t.Errorf("Expected content type 'application/x-protobuf', got '%s'", contentType)
 	}
 
-	// Check that logs were consumed
 	if len(mockConsumer.logs) == 0 {
 		t.Error("Expected logs to be consumed")
 	}
 
-	// Verify the response is valid OTLP protobuf
 	responseData := w.Body.Bytes()
 	otlpResp := plogotlp.NewExportResponse()
 	if err := otlpResp.UnmarshalProto(responseData); err != nil {
@@ -122,28 +115,22 @@ func TestHandleOTLPProtobufEmptyLogs(t *testing.T) {
 		t.Fatalf("Failed to marshal OTLP request: %v", err)
 	}
 
-	// Create HTTP request
-	req := httptest.NewRequest("POST", "/v1/logs", bytes.NewReader(requestData))
+	req := httptest.NewRequest(http.MethodPost, "/v1/logs", bytes.NewReader(requestData))
 	req.Header.Set("Content-Type", "application/x-protobuf")
 
-	// Create response recorder
 	w := httptest.NewRecorder()
 
-	// Handle the request
 	r.handleAuditLogs(w, req)
 
-	// Check response
 	if w.Code != http.StatusOK {
 		t.Errorf("Expected status 200, got %d", w.Code)
 	}
 
-	// Check content type
 	contentType := w.Header().Get("Content-Type")
 	if contentType != "application/x-protobuf" {
 		t.Errorf("Expected content type 'application/x-protobuf', got '%s'", contentType)
 	}
 
-	// Verify the response is valid OTLP protobuf
 	responseData := w.Body.Bytes()
 	otlpResp := plogotlp.NewExportResponse()
 	if err := otlpResp.UnmarshalProto(responseData); err != nil {
@@ -152,23 +139,19 @@ func TestHandleOTLPProtobufEmptyLogs(t *testing.T) {
 }
 
 func TestHandleOTLPProtobufInvalidData(t *testing.T) {
-	// Create a mock consumer
 	mockConsumer := &mockConsumer{}
 
-	// Create receiver config
 	cfg := &Config{
 		ServerConfig: confighttp.NewDefaultServerConfig(),
 	}
 
-	// Create receiver
 	settings := receivertest.NewNopSettings(metadata.Type)
 	r, err := NewReceiver(cfg, settings, mockConsumer)
 	if err != nil {
 		t.Fatalf("Failed to create receiver: %v", err)
 	}
 
-	// Create HTTP request with invalid protobuf data
-	req := httptest.NewRequest("POST", "/v1/logs", bytes.NewReader([]byte("invalid protobuf data")))
+	req := httptest.NewRequest(http.MethodPost, "/v1/logs", bytes.NewReader([]byte("invalid protobuf data")))
 	req.Header.Set("Content-Type", "application/x-protobuf")
 
 	// Create response recorder