fix race in test

open-telemetry · Dec 8, 2024 · ee7cf01 · ee7cf01
1 parent 5e20e58
commit ee7cf01
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 26 deletions.
diff --git a/exporter/azuremonitorexporter/azuremonitor_exporter.go b/exporter/azuremonitorexporter/azuremonitor_exporter.go
@@ -5,6 +5,7 @@ package azuremonitorexporter // import "github.com/open-telemetry/opentelemetry-
 
 import (
 	"context"
+	"sync"
 	"time"
 
 	"github.com/microsoft/ApplicationInsights-Go/appinsights"
@@ -24,35 +25,41 @@ type azureMonitorExporter struct {
 	transportChannel appinsights.TelemetryChannel
 	logger           *zap.Logger
 	packer           *metricPacker
+	startOnce        sync.Once
+	endOnce          sync.Once
 }
 
-func (exporter *azureMonitorExporter) Start(_ context.Context, _ component.Host) error {
-	connectionVars, err := parseConnectionString(exporter.config)
-	if err != nil {
-		return err
-	}
+func (exporter *azureMonitorExporter) Start(_ context.Context, _ component.Host) (err error) {
+	exporter.startOnce.Do(func() {
+		connectionVars, err := parseConnectionString(exporter.config)
+		if err != nil {
+			return
+		}
 
-	exporter.config.InstrumentationKey = configopaque.String(connectionVars.InstrumentationKey)
-	exporter.config.Endpoint = connectionVars.IngestionURL
-	telemetryConfiguration := appinsights.NewTelemetryConfiguration(connectionVars.InstrumentationKey)
-	telemetryConfiguration.EndpointUrl = connectionVars.IngestionURL
-	telemetryConfiguration.MaxBatchSize = exporter.config.MaxBatchSize
-	telemetryConfiguration.MaxBatchInterval = exporter.config.MaxBatchInterval
+		exporter.config.InstrumentationKey = configopaque.String(connectionVars.InstrumentationKey)
+		exporter.config.Endpoint = connectionVars.IngestionURL
+		telemetryConfiguration := appinsights.NewTelemetryConfiguration(connectionVars.InstrumentationKey)
+		telemetryConfiguration.EndpointUrl = connectionVars.IngestionURL
+		telemetryConfiguration.MaxBatchSize = exporter.config.MaxBatchSize
+		telemetryConfiguration.MaxBatchInterval = exporter.config.MaxBatchInterval
 
-	telemetryClient := appinsights.NewTelemetryClientFromConfig(telemetryConfiguration)
-	exporter.transportChannel = telemetryClient.Channel()
+		telemetryClient := appinsights.NewTelemetryClientFromConfig(telemetryConfiguration)
+		exporter.transportChannel = telemetryClient.Channel()
+	})
 
 	return nil
 }
 
-func (exporter *azureMonitorExporter) Shutdown(_ context.Context) error {
-	if exporter.transportChannel != nil {
-		select {
-		case <-exporter.transportChannel.Close(exporter.config.ShutdownTimeout):
-		case <-time.After(exporter.config.ShutdownTimeout):
-			exporter.transportChannel.Stop()
+func (exporter *azureMonitorExporter) Shutdown(_ context.Context) (err error) {
+	exporter.startOnce.Do(func() {
+		if exporter.transportChannel != nil {
+			select {
+			case <-exporter.transportChannel.Close(exporter.config.ShutdownTimeout):
+			case <-time.After(exporter.config.ShutdownTimeout):
+				exporter.transportChannel.Stop()
+			}
 		}
-	}
+	})
 
 	return nil
 }
@@ -149,8 +156,10 @@ func (exporter *azureMonitorExporter) consumeTraces(_ context.Context, traceData
 // Returns a new instance of the log exporter
 func newAzureMonitorExporter(config *Config, set exporter.Settings) AzureMonitorExporter {
 	return &azureMonitorExporter{
-		config: config,
-		logger: set.Logger,
-		packer: newMetricPacker(set.Logger),
+		config:    config,
+		logger:    set.Logger,
+		packer:    newMetricPacker(set.Logger),
+		startOnce: sync.Once{},
+		endOnce:   sync.Once{},
 	}
 }
diff --git a/exporter/azuremonitorexporter/generated_component_test.go b/exporter/azuremonitorexporter/generated_component_test.go
diff --git a/exporter/azuremonitorexporter/logexporter_test.go b/exporter/azuremonitorexporter/logexporter_test.go
@@ -9,6 +9,7 @@ Contains tests for logexporter.go and log_to_envelope.go
 
 import (
 	"context"
+	"sync"
 	"testing"
 	"time"
 
@@ -185,6 +186,8 @@ func getLogsExporter(config *Config, transportChannel appinsights.TelemetryChann
 		transportChannel,
 		zap.NewNop(),
 		newMetricPacker(zap.NewNop()),
+		sync.Once{},
+		sync.Once{},
 	}
 }
 

diff --git a/exporter/azuremonitorexporter/metadata.yaml b/exporter/azuremonitorexporter/metadata.yaml
@@ -14,6 +14,4 @@ tests:
     instrumentation_key: b1cd0778-85fc-4677-a3fa-79d3c23e0efd
   expect_consumer_error: true
   goleak:
-    skip: true
-  # todo: update to pass race in start and shutdown
-  skip_lifecycle: true
+    skip: true
diff --git a/exporter/azuremonitorexporter/metricexporter_test.go b/exporter/azuremonitorexporter/metricexporter_test.go
@@ -9,6 +9,7 @@ Contains tests for metricexporter.go and metric_to_envelopes.go
 
 import (
 	"context"
+	"sync"
 	"testing"
 
 	"github.com/microsoft/ApplicationInsights-Go/appinsights"
@@ -144,6 +145,8 @@ func getAzureMonitorExporter(config *Config, transportChannel appinsights.Teleme
 		transportChannel,
 		zap.NewNop(),
 		newMetricPacker(zap.NewNop()),
+		sync.Once{},
+		sync.Once{},
 	}
 }
 

diff --git a/exporter/azuremonitorexporter/traceexporter_test.go b/exporter/azuremonitorexporter/traceexporter_test.go
@@ -4,6 +4,7 @@
 package azuremonitorexporter
 
 import (
+	"sync"
 	"testing"
 
 	"github.com/microsoft/ApplicationInsights-Go/appinsights"
@@ -127,5 +128,7 @@ func getExporter(config *Config, transportChannel appinsights.TelemetryChannel)
 		transportChannel,
 		zap.NewNop(),
 		newMetricPacker(zap.NewNop()),
+		sync.Once{},
+		sync.Once{},
 	}
 }