resolve conflicts

open-telemetry · Nov 18, 2023 · 5606ce7 · 5606ce7
2 parents 4a2815d + f347716
commit 5606ce7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1980](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1980))
 - `opentelemetry-resource-detector-azure` Using new Cloud Resource ID attribute.
   ([#1976](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1976))
+- Do not collect `system.network.connections` by default on macOS which was causing exceptions in metrics collection.
+  ([#2008](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2008))
 
 ## Version 1.20.0/0.41b0 (2023-09-01)
 

diff --git a/...strumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py b/...strumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py
@@ -76,6 +76,8 @@
 """
 
 import gc
+import os
+import sys
 import logging
 import os
 import threading
@@ -119,6 +121,10 @@
     "process.runtime.context_switches": ["involuntary", "voluntary"],
 }
 
+if sys.platform == "darwin":
+    # see https://github.com/giampaolo/psutil/issues/1219
+    _DEFAULT_CONFIG.pop("system.network.connections")
+
 
 class SystemMetricsInstrumentor(BaseInstrumentor):
     def __init__(