Skip to content

Commit 8084a5b

Browse files
DylanRussellJWinermaSplunk
authored andcommitted
Move IterEntryPoint to opentelemetry-exporter-otlp-proto-common package, make imports of it absolute (open-telemetry#4796)
* Initial commit * Fix precommit * Move IterEntryPoint to test util package
1 parent 95beb39 commit 8084a5b

6 files changed

Lines changed: 5 additions & 26 deletions

File tree

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_exporter_mixin.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,11 @@
5757
SpanExporter,
5858
SpanExportResult,
5959
)
60+
from opentelemetry.test.mock_test_classes import IterEntryPoint
6061

6162
logger = getLogger(__name__)
6263

6364

64-
class IterEntryPoint:
65-
def __init__(self, name, class_type):
66-
self.name = name
67-
self.class_type = class_type
68-
69-
def load(self):
70-
return self.class_type
71-
72-
7365
# The below tests use this test SpanExporter and Spans, but are testing the
7466
# underlying behavior in the mixin. A MetricExporter or LogExporter could
7567
# just as easily be used.

exporter/opentelemetry-exporter-otlp-proto-http/tests/metrics/test_otlp_metrics_exporter.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
InstrumentationScope as SDKInstrumentationScope,
7878
)
7979
from opentelemetry.test.metrictestutil import _generate_sum
80-
81-
from .._common import IterEntryPoint
80+
from opentelemetry.test.mock_test_classes import IterEntryPoint
8281

8382
OS_ENV_ENDPOINT = "os.env.base"
8483
OS_ENV_CERTIFICATE = "os/env/base.crt"

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_log_exporter.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,14 @@
6161
)
6262
from opentelemetry.sdk.resources import Resource as SDKResource
6363
from opentelemetry.sdk.util.instrumentation import InstrumentationScope
64+
from opentelemetry.test.mock_test_classes import IterEntryPoint
6465
from opentelemetry.trace import (
6566
NonRecordingSpan,
6667
SpanContext,
6768
TraceFlags,
6869
set_span_in_context,
6970
)
7071

71-
from ._common import IterEntryPoint
72-
7372
ENV_ENDPOINT = "http://localhost.env:8080/"
7473
ENV_CERTIFICATE = "/etc/base.crt"
7574
ENV_CLIENT_CERTIFICATE = "/etc/client-cert.pem"

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_span_exporter.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
)
5151
from opentelemetry.sdk.trace import _Span
5252
from opentelemetry.sdk.trace.export import SpanExportResult
53-
54-
from ._common import IterEntryPoint
53+
from opentelemetry.test.mock_test_classes import IterEntryPoint
5554

5655
OS_ENV_ENDPOINT = "os.env.base"
5756
OS_ENV_CERTIFICATE = "os/env/base.crt"

opentelemetry-sdk/tests/test_configurator.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
SamplingResult,
8282
TraceIdRatioBased,
8383
)
84+
from opentelemetry.test.mock_test_classes import IterEntryPoint
8485
from opentelemetry.trace import Link, SpanKind
8586
from opentelemetry.trace.span import TraceState
8687
from opentelemetry.util.types import Attributes
@@ -318,15 +319,6 @@ def generate_trace_id(self):
318319
pass
319320

320321

321-
class IterEntryPoint:
322-
def __init__(self, name, class_type):
323-
self.name = name
324-
self.class_type = class_type
325-
326-
def load(self):
327-
return self.class_type
328-
329-
330322
class TestTraceInit(TestCase):
331323
def setUp(self):
332324
super()

exporter/opentelemetry-exporter-otlp-proto-http/tests/_common/__init__.py renamed to tests/opentelemetry-test-utils/src/opentelemetry/test/mock_test_classes.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# pylint: disable=protected-access
16-
1715

1816
class IterEntryPoint:
1917
def __init__(self, name, class_type):

0 commit comments

Comments
 (0)