OtelServiceNameEnvVarDetector handles SecurityException

open-telemetry · Jul 30, 2021 · e0a9aa4 · e0a9aa4
1 parent 3268d71
commit e0a9aa4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/OpenTelemetry/Resources/OtelEnvResourceDetector.cs b/src/OpenTelemetry/Resources/OtelEnvResourceDetector.cs
@@ -41,7 +41,7 @@ public Resource Detect()
             }
             catch (Exception ex)
             {
-                OpenTelemetrySdkEventSource.Log.ResourceDetectorFailed("OtelEnvResourceDetector", ex.Message);
+                OpenTelemetrySdkEventSource.Log.ResourceDetectorFailed(nameof(OtelEnvResourceDetector), ex.Message);
             }
 
             return resource;

diff --git a/src/OpenTelemetry/Resources/OtelServiceNameEnvVarDetector.cs b/src/OpenTelemetry/Resources/OtelServiceNameEnvVarDetector.cs
@@ -16,6 +16,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Security;
+using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Resources
 {
@@ -27,13 +29,20 @@ public Resource Detect()
         {
             var resource = Resource.Empty;
 
-            string envResourceAttributeValue = Environment.GetEnvironmentVariable(EnvVarKey);
-            if (!string.IsNullOrEmpty(envResourceAttributeValue))
+            try
             {
-                resource = new Resource(new Dictionary<string, object>
+                string envResourceAttributeValue = Environment.GetEnvironmentVariable(EnvVarKey);
+                if (!string.IsNullOrEmpty(envResourceAttributeValue))
                 {
-                    [ResourceSemanticConventions.AttributeServiceName] = envResourceAttributeValue,
-                });
+                    resource = new Resource(new Dictionary<string, object>
+                    {
+                        [ResourceSemanticConventions.AttributeServiceName] = envResourceAttributeValue,
+                    });
+                }
+            }
+            catch (SecurityException ex)
+            {
+                OpenTelemetrySdkEventSource.Log.ResourceDetectorFailed(nameof(OtelServiceNameEnvVarDetector), ex.Message);
             }
 
             return resource;