mirror of
https://github.com/open-telemetry/opentelemetry-python-contrib.git
synced 2025-08-01 17:34:38 +08:00
Sync with Refactor utils (#331)
Co-authored-by: alrex <aboten@lightstep.com> Co-authored-by: Aaron Abbott <aaronabbott@google.com>
This commit is contained in:
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@ -6,7 +6,7 @@ on:
|
||||
- 'release/*'
|
||||
pull_request:
|
||||
env:
|
||||
CORE_REPO_SHA: 6a778683f22200219d1963a366f88828ae10ebbb
|
||||
CORE_REPO_SHA: 0008290841a1f59ee266f906dd841fc151f757ea
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
@ -21,7 +21,7 @@ from opentelemetry.context import Context, attach, detach, set_value
|
||||
from opentelemetry.sdk.trace import Span, SpanProcessor
|
||||
from opentelemetry.sdk.trace.export import SpanExporter
|
||||
from opentelemetry.trace import INVALID_TRACE_ID
|
||||
from opentelemetry.util.providers import time_ns
|
||||
from opentelemetry.util.time import time_ns
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -59,7 +59,7 @@ from opentelemetry.instrumentation.utils import (
|
||||
from opentelemetry.propagate import extract
|
||||
from opentelemetry.trace.status import Status
|
||||
from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
|
||||
from opentelemetry.util.providers import time_ns
|
||||
from opentelemetry.util.time import time_ns
|
||||
|
||||
_logger = getLogger(__name__)
|
||||
|
||||
|
@ -57,7 +57,7 @@ from opentelemetry.instrumentation.flask.version import __version__
|
||||
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
|
||||
from opentelemetry.propagate import extract
|
||||
from opentelemetry.util.http import get_excluded_urls
|
||||
from opentelemetry.util.providers import time_ns
|
||||
from opentelemetry.util.time import time_ns
|
||||
|
||||
_logger = getLogger(__name__)
|
||||
|
||||
|
@ -10,7 +10,7 @@ from opentelemetry import context, trace
|
||||
from opentelemetry.instrumentation.pyramid.version import __version__
|
||||
from opentelemetry.propagate import extract
|
||||
from opentelemetry.util.http import get_excluded_urls
|
||||
from opentelemetry.util.providers import time_ns
|
||||
from opentelemetry.util.time import time_ns
|
||||
|
||||
TWEEN_NAME = "opentelemetry.instrumentation.pyramid.trace_tween_factory"
|
||||
SETTING_TRACE_ENABLED = "opentelemetry-pyramid.trace_enabled"
|
||||
|
@ -55,7 +55,7 @@ from opentelemetry.propagate import extract
|
||||
from opentelemetry.trace.propagation.textmap import DictGetter
|
||||
from opentelemetry.trace.status import Status
|
||||
from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
|
||||
from opentelemetry.util.providers import time_ns
|
||||
from opentelemetry.util.time import time_ns
|
||||
|
||||
from .client import fetch_async # pylint: disable=E0401
|
||||
|
||||
|
@ -1,3 +1,17 @@
|
||||
# Copyright The OpenTelemetry Authors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import functools
|
||||
|
||||
from tornado.httpclient import HTTPError, HTTPRequest
|
||||
@ -6,7 +20,7 @@ from opentelemetry import trace
|
||||
from opentelemetry.instrumentation.utils import http_status_to_status_code
|
||||
from opentelemetry.propagate import inject
|
||||
from opentelemetry.trace.status import Status
|
||||
from opentelemetry.util.providers import time_ns
|
||||
from opentelemetry.util.time import time_ns
|
||||
|
||||
|
||||
def _normalize_request(args, kwargs):
|
||||
|
Reference in New Issue
Block a user