Skip to content

Commit 7a5d528

Browse files
committed
squash me maybe - opencensus as in 3rd party
1 parent 6f967d8 commit 7a5d528

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
from typing import Sequence
1919

2020
import grpc
21-
22-
import opentelemetry.exporter.opencensus.util as utils
2321
from opencensus.proto.agent.trace.v1 import (
2422
trace_service_pb2,
2523
trace_service_pb2_grpc,
2624
)
2725
from opencensus.proto.trace.v1 import trace_pb2
26+
27+
import opentelemetry.exporter.opencensus.util as utils
2828
from opentelemetry import trace
2929
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
3030
from opentelemetry.sdk.trace import ReadableSpan

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
# pylint: disable=wrong-import-position
2020
from google.protobuf.timestamp_pb2 import Timestamp
21-
2221
from opencensus.proto.agent.common.v1 import common_pb2
2322
from opencensus.proto.trace.v1 import trace_pb2
23+
2424
from opentelemetry.exporter.opencensus.version import (
2525
__version__ as opencensusexporter_exporter_version,
2626
)

pyproject.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,11 @@ ignore = [
4343
]
4444

4545
[tool.ruff.lint.isort]
46-
known-third-party = ["psutil", "pytest", "redis", "redis_opentracing"]
46+
known-third-party = [
47+
"psutil",
48+
"pytest",
49+
"redis",
50+
"redis_opentracing",
51+
"opencensus",
52+
]
4753
known-first-party = ["opentelemetry", "opentelemetry_example_app"]

shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/_patch.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from opencensus.trace.span_context import SpanContext
2020
from opencensus.trace.tracer import Tracer
2121
from opencensus.trace.tracers.noop_tracer import NoopTracer
22+
2223
from opentelemetry import trace
2324
from opentelemetry.shim.opencensus._shim_tracer import ShimTracer
2425
from opentelemetry.shim.opencensus.version import __version__

shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/_shim_span.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
from typing import TYPE_CHECKING
1818

1919
import wrapt
20-
2120
from opencensus.trace import execution_context
2221
from opencensus.trace.blank_span import BlankSpan
2322
from opencensus.trace.span import SpanKind
2423
from opencensus.trace.status import Status
2524
from opencensus.trace.time_event import MessageEvent
25+
2626
from opentelemetry import context, trace
2727

2828
if TYPE_CHECKING:

shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/_shim_tracer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import logging
1616

1717
import wrapt
18-
1918
from opencensus.trace import execution_context
2019
from opencensus.trace.blank_span import BlankSpan
2120
from opencensus.trace.span_context import SpanContext
2221
from opencensus.trace.tracers.base import Tracer as BaseTracer
2322
from opencensus.trace.tracestate import Tracestate
23+
2424
from opentelemetry import context, trace
2525
from opentelemetry.shim.opencensus._shim_span import ShimSpan
2626

0 commit comments

Comments
 (0)