open-telemetry
/
opentelemetry-python-contrib
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update system metrics to work with new metrics imports (#1075)

This commit is contained in:
Aaron Abbott 2022-04-29 00:35:15 -04:00 committed by GitHub
parent a8edcf6a52
commit 2671ff53c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: b5c7dea8d2d035b7e820a9aa5414a396cdd6c312 CORE_REPO_SHA: 2c1cb20543fcc0bcfe5525d8a695e92babec06db
jobs: jobs:
build: build:

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

@ -76,11 +76,10 @@ from typing import Collection, Dict, Iterable, List, Optional
import psutil import psutil
from opentelemetry._metrics import get_meter from opentelemetry._metrics import Observation, get_meter
# FIXME Remove this pyling disabling line when Github issue is cleared # FIXME Remove this pyling disabling line when Github issue is cleared
# pylint: disable=no-name-in-module # pylint: disable=no-name-in-module
from opentelemetry._metrics.observation import Observation
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
from opentelemetry.instrumentation.system_metrics.package import _instruments from opentelemetry.instrumentation.system_metrics.package import _instruments
from opentelemetry.instrumentation.system_metrics.version import __version__ from opentelemetry.instrumentation.system_metrics.version import __version__