fix: remove dependency on sdk for system-metrics instrumentation (open-telemetry#2557)

emdneto · web-flow · commit 7bddbb54195b · 2024-05-29T10:17:50.000-07:00
diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
@@ -26,7 +26,6 @@ classifiers = [
 dependencies = [
   "opentelemetry-instrumentation == 0.46b0.dev",
   "opentelemetry-api ~= 1.11",
-  "opentelemetry-sdk ~= 1.11",
   "psutil ~= 5.9",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py
@@ -91,7 +91,6 @@
 from opentelemetry.instrumentation.system_metrics.package import _instruments
 from opentelemetry.instrumentation.system_metrics.version import __version__
 from opentelemetry.metrics import CallbackOptions, Observation, get_meter
-from opentelemetry.sdk.util import get_dict_as_key
 
 _logger = logging.getLogger(__name__)
 
@@ -638,8 +637,8 @@ def _get_system_network_connections(
                     net_connection, metric
                 )
 
-            connection_counters_key = get_dict_as_key(
-                self._system_network_connections_labels
+            connection_counters_key = tuple(
+                sorted(self._system_network_connections_labels.items())
             )
 
             if connection_counters_key in connection_counters:

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ classifiers = [`
`26`	`26`	`dependencies = [`
`27`	`27`	`"opentelemetry-instrumentation == 0.46b0.dev",`
`28`	`28`	`"opentelemetry-api ~= 1.11",`
`29`		`- "opentelemetry-sdk ~= 1.11",`
`30`	`29`	`"psutil ~= 5.9",`
`31`	`30`	`]`
`32`	`31`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@`
`91`	`91`	`from opentelemetry.instrumentation.system_metrics.package import _instruments`
`92`	`92`	`from opentelemetry.instrumentation.system_metrics.version import __version__`
`93`	`93`	`from opentelemetry.metrics import CallbackOptions, Observation, get_meter`
`94`		`-from opentelemetry.sdk.util import get_dict_as_key`
`95`	`94`
`96`	`95`	`_logger = logging.getLogger(__name__)`
`97`	`96`
`@@ -638,8 +637,8 @@ def _get_system_network_connections(`
`638`	`637`	`net_connection, metric`
`639`	`638`	`)`
`640`	`639`
`641`		`- connection_counters_key = get_dict_as_key(`
`642`		`- self._system_network_connections_labels`
	`640`	`+ connection_counters_key = tuple(`
	`641`	`+ sorted(self._system_network_connections_labels.items())`
`643`	`642`	`)`
`644`	`643`
`645`	`644`	`if connection_counters_key in connection_counters:`