Skip to content

Commit f840c31

Browse files
committed
Make util a namespace
Fixes #1581 This basically renames the __init__.py file in opentelemetry-api/util to make opentelemetry.util a proper namespace. This is needed since we are now adding components in the contrib repo in this namespace. More information here: https://packaging.python.org/guides/packaging-namespace-packages/#native-namespace-packages
1 parent 78f6949 commit f840c31

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

Diff for: .github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: 263adc5f7f524fae2c84571f656cef0896de0868
13+
CONTRIB_REPO_SHA: 74af6ab48505cdb148de46fb12cf0802a199f297
1414

1515
jobs:
1616
build:

Diff for: opentelemetry-api/src/opentelemetry/trace/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
format_trace_id,
102102
)
103103
from opentelemetry.trace.status import Status
104-
from opentelemetry.util import _load_trace_provider, types
104+
from opentelemetry.util import types
105+
from opentelemetry.util.providers import _load_trace_provider
105106

106107
logger = getLogger(__name__)
107108

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
from opentelemetry.trace import SpanContext
5757
from opentelemetry.trace.propagation import SPAN_KEY
5858
from opentelemetry.trace.status import Status, StatusCode
59-
from opentelemetry.util import time_ns, types
59+
from opentelemetry.util import types
60+
from opentelemetry.util.providers import time_ns
6061

6162
logger = logging.getLogger(__name__)
6263

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
OTEL_BSP_SCHEDULE_DELAY,
3030
)
3131
from opentelemetry.sdk.trace import ReadableSpan, Span, SpanProcessor
32-
from opentelemetry.util import time_ns
32+
from opentelemetry.util.providers import time_ns
3333

3434
logger = logging.getLogger(__name__)
3535

Diff for: opentelemetry-sdk/tests/trace/test_trace.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from opentelemetry.sdk.util import ns_to_iso_str
3939
from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
4040
from opentelemetry.trace.status import StatusCode
41-
from opentelemetry.util import time_ns
41+
from opentelemetry.util.providers import time_ns
4242

4343

4444
def new_tracer() -> trace_api.Tracer:

Diff for: shim/opentelemetry-opentracing-shim/tests/test_util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import unittest
1717

1818
from opentelemetry.shim.opentracing_shim import util
19-
from opentelemetry.util import time_ns
19+
from opentelemetry.util.providers import time_ns
2020

2121

2222
class TestUtil(unittest.TestCase):

0 commit comments

Comments
 (0)