Merge pull request newrelic#958 from nr-swilloughby/ar_race

added mutex guards around appRun for code level metrics
nr-swilloughby · Sep 5, 2024 · 2c21c19 · 2c21c19
2 parents ec1af19 + a78ad46
commit 2c21c19
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/v3/newrelic/application.go b/v3/newrelic/application.go
@@ -18,10 +18,14 @@ type Application struct {
 /*
 // IsAIMonitoringEnabled returns true if monitoring for the specified mode of the named integration is enabled.
 func (app *Application) IsAIMonitoringEnabled(integration string, streaming bool) bool {
-	if app == nil || app.app == nil || app.app.run == nil {
+	if app == nil || app.app == nil {
+		return false
+	}
+	run, _ := app.app.getState()
+	if run == nil {
 		return false
 	}
-	aiconf := app.app.run.Config.AIMonitoring
+	aiconf := run.Config.AIMonitoring
 	if !aiconf.Enabled {
 		return false
 	}

diff --git a/v3/newrelic/instrumentation.go b/v3/newrelic/instrumentation.go
@@ -52,13 +52,16 @@ func WrapHandle(app *Application, pattern string, handler http.Handler, options
 		var tOptions *traceOptSet
 		var txnOptionList []TraceOption
 
-		if app.app != nil && app.app.run != nil && app.app.run.Config.CodeLevelMetrics.Enabled {
-			tOptions = resolveCLMTraceOptions(options)
-			if tOptions != nil && !tOptions.SuppressCLM && (tOptions.DemandCLM || app.app.run.Config.CodeLevelMetrics.Scope == 0 || (app.app.run.Config.CodeLevelMetrics.Scope&TransactionCLM) != 0) {
-				// we are for sure collecting CLM here, so go to the trouble of collecting this code location if nothing else has yet.
-				if tOptions.LocationOverride == nil {
-					if loc, err := cache.FunctionLocation(handler, handler.ServeHTTP); err == nil {
-						WithCodeLocation(loc)(tOptions)
+		if app.app != nil {
+			run, _ := app.app.getState()
+			if run != nil && run.Config.CodeLevelMetrics.Enabled {
+				tOptions = resolveCLMTraceOptions(options)
+				if tOptions != nil && !tOptions.SuppressCLM && (tOptions.DemandCLM || run.Config.CodeLevelMetrics.Scope == 0 || (run.Config.CodeLevelMetrics.Scope&TransactionCLM) != 0) {
+					// we are for sure collecting CLM here, so go to the trouble of collecting this code location if nothing else has yet.
+					if tOptions.LocationOverride == nil {
+						if loc, err := cache.FunctionLocation(handler, handler.ServeHTTP); err == nil {
+							WithCodeLocation(loc)(tOptions)
+						}
 					}
 				}
 			}
@@ -96,13 +99,16 @@ func AddCodeLevelMetricsTraceOptions(app *Application, options []TraceOption, ca
 		return options
 	}
 
-	if app.app != nil && app.app.run != nil && app.app.run.Config.CodeLevelMetrics.Enabled {
-		tOptions = resolveCLMTraceOptions(options)
-		if tOptions != nil && !tOptions.SuppressCLM && (tOptions.DemandCLM || app.app.run.Config.CodeLevelMetrics.Scope == 0 || (app.app.run.Config.CodeLevelMetrics.Scope&TransactionCLM) != 0) {
-			// we are for sure collecting CLM here, so go to the trouble of collecting this code location if nothing else has yet.
-			if tOptions.LocationOverride == nil {
-				if loc, err := cache.FunctionLocation(cachedLocations); err == nil {
-					WithCodeLocation(loc)(tOptions)
+	if app.app != nil {
+		run, _ := app.app.getState()
+		if run != nil && run.Config.CodeLevelMetrics.Enabled {
+			tOptions = resolveCLMTraceOptions(options)
+			if tOptions != nil && !tOptions.SuppressCLM && (tOptions.DemandCLM || run.Config.CodeLevelMetrics.Scope == 0 || (run.Config.CodeLevelMetrics.Scope&TransactionCLM) != 0) {
+				// we are for sure collecting CLM here, so go to the trouble of collecting this code location if nothing else has yet.
+				if tOptions.LocationOverride == nil {
+					if loc, err := cache.FunctionLocation(cachedLocations); err == nil {
+						WithCodeLocation(loc)(tOptions)
+					}
 				}
 			}
 		}

diff --git a/v3/newrelic/secure_agent.go b/v3/newrelic/secure_agent.go
@@ -42,7 +42,8 @@ type securityAgent interface {
 func (app *Application) RegisterSecurityAgent(s securityAgent) {
 	if app != nil && app.app != nil && s != nil {
 		secureAgent = s
-		if app.app.run != nil {
+		run, _ := app.app.getState()
+		if run != nil {
 			secureAgent.RefreshState(getLinkedMetaData(app.app))
 		}
 	}