try catch

open-telemetry · Jul 16, 2021 · c31273b · c31273b
1 parent fbcb7d8
commit c31273b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusExporterEventSource.cs b/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusExporterEventSource.cs
@@ -37,6 +37,15 @@ public void FailedExport(Exception ex)
             }
         }
 
+        [NonEvent]
+        public void FailedShutdown(Exception ex)
+        {
+            if (this.IsEnabled(EventLevel.Error, (EventKeywords)(-1)))
+            {
+                this.FailedShutdown(ex.ToInvariantString());
+            }
+        }
+
         [NonEvent]
         public void CanceledExport(Exception ex)
         {
@@ -57,5 +66,11 @@ public void CanceledExport(string exception)
         {
             this.WriteEvent(2, exception);
         }
+
+        [Event(3, Message = "Failed to shutdown Metrics server '{0}'", Level = EventLevel.Error)]
+        public void FailedShutdown(string exception)
+        {
+            this.WriteEvent(3, exception);
+        }
     }
 }
diff --git a/src/OpenTelemetry.Exporter.Prometheus/PrometheusExporterMetricsHttpServer.cs b/src/OpenTelemetry.Exporter.Prometheus/PrometheusExporterMetricsHttpServer.cs
@@ -138,8 +138,15 @@ private void WorkerThread()
             }
             finally
             {
-                this.httpListener.Stop();
-                this.httpListener.Close();
+                try
+                {
+                    this.httpListener.Stop();
+                    this.httpListener.Close();
+                }
+                catch (Exception exFromFinally)
+                {
+                    PrometheusExporterEventSource.Log.FailedShutdown(exFromFinally);
+                }
             }
         }
     }