Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix callbacks in system metrics instrumentation #1057

Merged
merged 6 commits into from
Apr 15, 2022
Merged

Fix callbacks in system metrics instrumentation #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ae3cff
sha
lzchen Apr 15, 2022
eb7ee6d
callbacks
lzchen Apr 15, 2022
e3a75bf
Update setup.cfg
lzchen Apr 15, 2022
0f85b8e
callbacks
lzchen Apr 15, 2022
c0fc0f1
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
lzchen Apr 15, 2022
2ae36e5
Update test.yml
lzchen Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: f81381cf8aca64a707d934f20c6c27d40b949dce
CORE_REPO_SHA: d52b80124ac0c9ea9515a1d90dfec37c532f8cd9

jobs:
build:
Expand Down
38 changes: 19 additions & 19 deletions ...strumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,83 +156,83 @@ def _instrument(self, **kwargs):
)

self._meter.create_observable_counter(
callback=self._get_system_cpu_time,
name="system.cpu.time",
callbacks=[self._get_system_cpu_time],
description="System CPU time",
unit="seconds",
)

self._meter.create_observable_gauge(
callback=self._get_system_cpu_utilization,
name="system.cpu.utilization",
callbacks=[self._get_system_cpu_utilization],
description="System CPU utilization",
unit="1",
)

self._meter.create_observable_gauge(
callback=self._get_system_memory_usage,
name="system.memory.usage",
callbacks=[self._get_system_memory_usage],
description="System memory usage",
unit="bytes",
)

self._meter.create_observable_gauge(
callback=self._get_system_memory_utilization,
name="system.memory.utilization",
callbacks=[self._get_system_memory_utilization],
description="System memory utilization",
unit="1",
)

self._meter.create_observable_gauge(
callback=self._get_system_swap_usage,
name="system.swap.usage",
callbacks=[self._get_system_swap_usage],
description="System swap usage",
unit="pages",
)

self._meter.create_observable_gauge(
callback=self._get_system_swap_utilization,
name="system.swap.utilization",
callbacks=[self._get_system_swap_utilization],
description="System swap utilization",
unit="1",
)

# TODO Add _get_system_swap_page_faults

# self._meter.create_observable_counter(
# callback=self._get_system_swap_page_faults,
# name="system.swap.page_faults",
# callbacks=[self._get_system_swap_page_faults],
# description="System swap page faults",
# unit="faults",
# value_type=int,
# )

# TODO Add _get_system_swap_page_operations
# self._meter.create_observable_counter(
# callback=self._get_system_swap_page_operations,
# name="system.swap.page_operations",
# callbacks=self._get_system_swap_page_operations,
# description="System swap page operations",
# unit="operations",
# value_type=int,
# )

self._meter.create_observable_counter(
callback=self._get_system_disk_io,
name="system.disk.io",
callbacks=[self._get_system_disk_io],
description="System disk IO",
unit="bytes",
)

self._meter.create_observable_counter(
callback=self._get_system_disk_operations,
name="system.disk.operations",
callbacks=[self._get_system_disk_operations],
description="System disk operations",
unit="operations",
)

self._meter.create_observable_counter(
callback=self._get_system_disk_time,
name="system.disk.time",
callbacks=[self._get_system_disk_time],
description="System disk time",
unit="seconds",
)
Expand Down Expand Up @@ -260,57 +260,57 @@ def _instrument(self, **kwargs):
# OSs, how to do the same in Windows?

self._meter.create_observable_counter(
callback=self._get_system_network_dropped_packets,
name="system.network.dropped_packets",
callbacks=[self._get_system_network_dropped_packets],
description="System network dropped_packets",
unit="packets",
)

self._meter.create_observable_counter(
callback=self._get_system_network_packets,
name="system.network.packets",
callbacks=[self._get_system_network_packets],
description="System network packets",
unit="packets",
)

self._meter.create_observable_counter(
callback=self._get_system_network_errors,
name="system.network.errors",
callbacks=[self._get_system_network_errors],
description="System network errors",
unit="errors",
)

self._meter.create_observable_counter(
callback=self._get_system_network_io,
name="system.network.io",
callbacks=[self._get_system_network_io],
description="System network io",
unit="bytes",
)

self._meter.create_observable_up_down_counter(
callback=self._get_system_network_connections,
name="system.network.connections",
callbacks=[self._get_system_network_connections],
description="System network connections",
unit="connections",
)

self._meter.create_observable_counter(
callback=self._get_runtime_memory,
name=f"runtime.{self._python_implementation}.memory",
callbacks=[self._get_runtime_memory],
description=f"Runtime {self._python_implementation} memory",
unit="bytes",
)

self._meter.create_observable_counter(
callback=self._get_runtime_cpu_time,
name=f"runtime.{self._python_implementation}.cpu_time",
callbacks=[self._get_runtime_cpu_time],
description=f"Runtime {self._python_implementation} CPU time",
unit="seconds",
)

self._meter.create_observable_counter(
callback=self._get_runtime_gc_count,
name=f"runtime.{self._python_implementation}.gc_count",
callbacks=[self._get_runtime_gc_count],
description=f"Runtime {self._python_implementation} GC count",
unit="bytes",
)
Expand Down