Merge pull request #4250 from dragonchaser/ocis-4088-fix-race-condition

Bugfix: Fix race condition
cs3org · Oct 12, 2023 · 2b27cd4 · 2b27cd4
2 parents 9b24c17 + 8ad3c33
commit 2b27cd4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/changelog/unreleased/fix-race-condition.md b/changelog/unreleased/fix-race-condition.md
@@ -0,0 +1,6 @@
+Bugfix: Fix race condition
+
+We have fixed a race condition when setting the default tracing provider.
+
+https://github.com/cs3org/reva/pull/4250
+https://github.com/owncloud/ocis/issues/4088
diff --git a/pkg/trace/trace.go b/pkg/trace/trace.go
@@ -85,6 +85,8 @@ func NewTracerProvider(opts ...Option) trace.TracerProvider {
 // SetDefaultTracerProvider sets the default trace provider
 func SetDefaultTracerProvider(tp trace.TracerProvider) {
 	otel.SetTracerProvider(tp)
+	defaultProvider.mutex.Lock()
+	defer defaultProvider.mutex.Unlock()
 	defaultProvider.initialized = true
 }