From 2671ff53c8643ad55dcf78dad072f2f0b82e84e1 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Fri, 29 Apr 2022 00:35:15 -0400 Subject: [PATCH] Update system metrics to work with new metrics imports (#1075) --- .github/workflows/test.yml | 2 +- .../opentelemetry/instrumentation/system_metrics/__init__.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4ca102eb3..fe968fe90 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: b5c7dea8d2d035b7e820a9aa5414a396cdd6c312 + CORE_REPO_SHA: 2c1cb20543fcc0bcfe5525d8a695e92babec06db jobs: build: 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 index 53be22d88..0b6e23236 100644 --- 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 @@ -76,11 +76,10 @@ from typing import Collection, Dict, Iterable, List, Optional 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 # pylint: disable=no-name-in-module -from opentelemetry._metrics.observation import Observation from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.system_metrics.package import _instruments from opentelemetry.instrumentation.system_metrics.version import __version__