opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-30 21:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'core-instrumentation-system-metrics-v0.15b0'

Browse Source
This commit is contained in:
Nathaniel Ruiz Nowell
2020-11-02 11:16:10 -08:00
parent d6686fb60f 6d4a79a56f
commit 3326da5bec
3 changed files with 26 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg
View File

@ -39,13 +39,13 @@ package_dir=
=src =src
packages=find_namespace: packages=find_namespace:
install_requires = install_requires =
opentelemetry-api == 0.15.dev0 opentelemetry-api == 0.15b0
opentelemetry-sdk == 0.15.dev0 opentelemetry-sdk == 0.15b0
psutil ~= 5.7.0 psutil ~= 5.7.0
[options.extras_require] [options.extras_require]
test = test =
opentelemetry-test == 0.15.dev0 opentelemetry-test == 0.15b0
[options.packages.find] [options.packages.find]
where = src where = src

71
instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py
View File

@ -77,11 +77,6 @@ from platform import python_implementation
import psutil import psutil
from opentelemetry import metrics from opentelemetry import metrics
from opentelemetry.sdk.metrics import (
SumObserver,
UpDownSumObserver,
ValueObserver,
)
from opentelemetry.sdk.metrics.export import MetricsExporter from opentelemetry.sdk.metrics.export import MetricsExporter
from opentelemetry.sdk.metrics.export.controller import PushController from opentelemetry.sdk.metrics.export.controller import PushController
from opentelemetry.sdk.util import get_dict_as_key from opentelemetry.sdk.util import get_dict_as_key
@ -160,178 +155,159 @@ class SystemMetrics:
self._runtime_cpu_time_labels = self._labels.copy() self._runtime_cpu_time_labels = self._labels.copy()
self._runtime_gc_count_labels = self._labels.copy() self._runtime_gc_count_labels = self._labels.copy()
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_cpu_time, callback=self._get_system_cpu_time,
name="system.cpu.time", name="system.cpu.time",
description="System CPU time", description="System CPU time",
unit="seconds", unit="seconds",
value_type=float, value_type=float,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_valueobserver(
callback=self._get_system_cpu_utilization, callback=self._get_system_cpu_utilization,
name="system.cpu.utilization", name="system.cpu.utilization",
description="System CPU utilization", description="System CPU utilization",
unit="1", unit="1",
value_type=float, value_type=float,
observer_type=ValueObserver,
) )
self.meter.register_observer( self.meter.register_valueobserver(
callback=self._get_system_memory_usage, callback=self._get_system_memory_usage,
name="system.memory.usage", name="system.memory.usage",
description="System memory usage", description="System memory usage",
unit="bytes", unit="bytes",
value_type=int, value_type=int,
observer_type=ValueObserver,
) )
self.meter.register_observer( self.meter.register_valueobserver(
callback=self._get_system_memory_utilization, callback=self._get_system_memory_utilization,
name="system.memory.utilization", name="system.memory.utilization",
description="System memory utilization", description="System memory utilization",
unit="1", unit="1",
value_type=float, value_type=float,
observer_type=ValueObserver,
) )
self.meter.register_observer( self.meter.register_valueobserver(
callback=self._get_system_swap_usage, callback=self._get_system_swap_usage,
name="system.swap.usage", name="system.swap.usage",
description="System swap usage", description="System swap usage",
unit="pages", unit="pages",
value_type=int, value_type=int,
observer_type=ValueObserver,
) )
self.meter.register_observer( self.meter.register_valueobserver(
callback=self._get_system_swap_utilization, callback=self._get_system_swap_utilization,
name="system.swap.utilization", name="system.swap.utilization",
description="System swap utilization", description="System swap utilization",
unit="1", unit="1",
value_type=float, value_type=float,
observer_type=ValueObserver,
) )
# self.meter.register_observer( # self.meter.register_sumobserver(
# callback=self._get_system_swap_page_faults, # callback=self._get_system_swap_page_faults,
# name="system.swap.page_faults", # name="system.swap.page_faults",
# description="System swap page faults", # description="System swap page faults",
# unit="faults", # unit="faults",
# value_type=int, # value_type=int,
# observer_type=SumObserver,
# ) # )
# self.meter.register_observer( # self.meter.register_sumobserver(
# callback=self._get_system_swap_page_operations, # callback=self._get_system_swap_page_operations,
# name="system.swap.page_operations", # name="system.swap.page_operations",
# description="System swap page operations", # description="System swap page operations",
# unit="operations", # unit="operations",
# value_type=int, # value_type=int,
# observer_type=SumObserver,
# ) # )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_disk_io, callback=self._get_system_disk_io,
name="system.disk.io", name="system.disk.io",
description="System disk IO", description="System disk IO",
unit="bytes", unit="bytes",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_disk_operations, callback=self._get_system_disk_operations,
name="system.disk.operations", name="system.disk.operations",
description="System disk operations", description="System disk operations",
unit="operations", unit="operations",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_disk_time, callback=self._get_system_disk_time,
name="system.disk.time", name="system.disk.time",
description="System disk time", description="System disk time",
unit="seconds", unit="seconds",
value_type=float, value_type=float,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_disk_merged, callback=self._get_system_disk_merged,
name="system.disk.merged", name="system.disk.merged",
description="System disk merged", description="System disk merged",
unit="1", unit="1",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
# self.meter.register_observer( # self.meter.register_valueobserver(
# callback=self._get_system_filesystem_usage, # callback=self._get_system_filesystem_usage,
# name="system.filesystem.usage", # name="system.filesystem.usage",
# description="System filesystem usage", # description="System filesystem usage",
# unit="bytes", # unit="bytes",
# value_type=int, # value_type=int,
# observer_type=ValueObserver,
# ) # )
# self.meter.register_observer( # self.meter.register_valueobserver(
# callback=self._get_system_filesystem_utilization, # callback=self._get_system_filesystem_utilization,
# name="system.filesystem.utilization", # name="system.filesystem.utilization",
# description="System filesystem utilization", # description="System filesystem utilization",
# unit="1", # unit="1",
# value_type=float, # value_type=float,
# observer_type=ValueObserver,
# ) # )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_network_dropped_packets, callback=self._get_system_network_dropped_packets,
name="system.network.dropped_packets", name="system.network.dropped_packets",
description="System network dropped_packets", description="System network dropped_packets",
unit="packets", unit="packets",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_network_packets, callback=self._get_system_network_packets,
name="system.network.packets", name="system.network.packets",
description="System network packets", description="System network packets",
unit="packets", unit="packets",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_network_errors, callback=self._get_system_network_errors,
name="system.network.errors", name="system.network.errors",
description="System network errors", description="System network errors",
unit="errors", unit="errors",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_system_network_io, callback=self._get_system_network_io,
name="system.network.io", name="system.network.io",
description="System network io", description="System network io",
unit="bytes", unit="bytes",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_updownsumobserver(
callback=self._get_system_network_connections, callback=self._get_system_network_connections,
name="system.network.connections", name="system.network.connections",
description="System network connections", description="System network connections",
unit="connections", unit="connections",
value_type=int, value_type=int,
observer_type=UpDownSumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_runtime_memory, callback=self._get_runtime_memory,
name="runtime.{}.memory".format(self._python_implementation), name="runtime.{}.memory".format(self._python_implementation),
description="Runtime {} memory".format( description="Runtime {} memory".format(
@ -339,10 +315,9 @@ class SystemMetrics:
), ),
unit="bytes", unit="bytes",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_runtime_cpu_time, callback=self._get_runtime_cpu_time,
name="runtime.{}.cpu_time".format(self._python_implementation), name="runtime.{}.cpu_time".format(self._python_implementation),
description="Runtime {} CPU time".format( description="Runtime {} CPU time".format(
@ -350,10 +325,9 @@ class SystemMetrics:
), ),
unit="seconds", unit="seconds",
value_type=float, value_type=float,
observer_type=SumObserver,
) )
self.meter.register_observer( self.meter.register_sumobserver(
callback=self._get_runtime_gc_count, callback=self._get_runtime_gc_count,
name="runtime.{}.gc_count".format(self._python_implementation), name="runtime.{}.gc_count".format(self._python_implementation),
description="Runtime {} GC count".format( description="Runtime {} GC count".format(
@ -361,7 +335,6 @@ class SystemMetrics:
), ),
unit="bytes", unit="bytes",
value_type=int, value_type=int,
observer_type=SumObserver,
) )
def _get_system_cpu_time(self, observer: metrics.ValueObserver) -> None: def _get_system_cpu_time(self, observer: metrics.ValueObserver) -> None:

2
instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/version.py
View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
__version__ = "0.15.dev0" __version__ = "0.15b0"