test

open-telemetry · Jul 30, 2020 · 53a1454 · 53a1454
1 parent 91dd6a4
commit 53a1454
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 30 deletions.
diff --git a/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_client.py b/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_client.py
@@ -42,8 +42,8 @@
 import grpc
 
 from opentelemetry import trace
-from opentelemetry.instrumentation.grpc import client_interceptor
-from opentelemetry.instrumentation.grpc.grpcext import intercept_channel
+from opentelemetry.instrumentation.grpcz import client_interceptor
+from opentelemetry.instrumentation.grpcz.grpcext import intercept_channel
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,

diff --git a/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_server.py b/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_server.py
@@ -42,8 +42,8 @@
 import grpc
 
 from opentelemetry import trace
-from opentelemetry.instrumentation.grpc import server_interceptor
-from opentelemetry.instrumentation.grpc.grpcext import intercept_server
+from opentelemetry.instrumentation.grpcz import server_interceptor
+from opentelemetry.instrumentation.grpcz.grpcext import intercept_server
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,

diff --git a/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_client.py b/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_client.py
@@ -43,8 +43,8 @@
 import grpc
 
 from opentelemetry import trace
-from opentelemetry.instrumentation.grpc import client_interceptor
-from opentelemetry.instrumentation.grpc.grpcext import intercept_channel
+from opentelemetry.instrumentation.grpcz import client_interceptor
+from opentelemetry.instrumentation.grpcz.grpcext import intercept_channel
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,

diff --git a/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_server.py b/...amples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_server.py
@@ -45,8 +45,8 @@
 import grpc
 
 from opentelemetry import trace
-from opentelemetry.instrumentation.grpc import server_interceptor
-from opentelemetry.instrumentation.grpc.grpcext import intercept_server
+from opentelemetry.instrumentation.grpcz import server_interceptor
+from opentelemetry.instrumentation.grpcz.grpcext import intercept_server
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,

diff --git a/docs/instrumentation/grpc/grpc.rst b/docs/instrumentation/grpc/grpc.rst
@@ -4,7 +4,7 @@ OpenTelemetry gRPC Instrumentation
 Module contents
 ---------------
 
-.. automodule:: opentelemetry.instrumentation.grpc
+.. automodule:: opentelemetry.instrumentation.grpcz
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py
@@ -37,7 +37,7 @@
     "opentelemetry.ext.dbapi": DatadogSpanTypes.SQL,
     "opentelemetry.instrumentation.django": DatadogSpanTypes.WEB,
     "opentelemetry.instrumentation.flask": DatadogSpanTypes.WEB,
-    "opentelemetry.instrumentation.grpc": DatadogSpanTypes.GRPC,
+    "opentelemetry.instrumentation.grpcz": DatadogSpanTypes.GRPC,
     "opentelemetry.ext.jinja2": DatadogSpanTypes.TEMPLATE,
     "opentelemetry.ext.mysql": DatadogSpanTypes.SQL,
     "opentelemetry.ext.psycopg2": DatadogSpanTypes.SQL,

diff --git a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py
@@ -294,7 +294,7 @@ def test_span_types(self):
             "opentelemetry.ext.dbapi",
             "opentelemetry.instrumentation.django",
             "opentelemetry.instrumentation.flask",
-            "opentelemetry.instrumentation.grpc",
+            "opentelemetry.instrumentation.grpcz",
             "opentelemetry.ext.jinja2",
             "opentelemetry.ext.mysql",
             "opentelemetry.ext.psycopg2",

diff --git a/...lemetry-instrumentation-grpc/CHANGELOG.md → ...emetry-instrumentation-grpcz/CHANGELOG.md b/...lemetry-instrumentation-grpc/CHANGELOG.md → ...emetry-instrumentation-grpcz/CHANGELOG.md
diff --git a/...pentelemetry-instrumentation-grpc/LICENSE → ...entelemetry-instrumentation-grpcz/LICENSE b/...pentelemetry-instrumentation-grpc/LICENSE → ...entelemetry-instrumentation-grpcz/LICENSE
diff --git a/...elemetry-instrumentation-grpc/MANIFEST.in → ...lemetry-instrumentation-grpcz/MANIFEST.in b/...elemetry-instrumentation-grpc/MANIFEST.in → ...lemetry-instrumentation-grpcz/MANIFEST.in
diff --git a/...telemetry-instrumentation-grpc/README.rst → ...elemetry-instrumentation-grpcz/README.rst b/...telemetry-instrumentation-grpc/README.rst → ...elemetry-instrumentation-grpcz/README.rst
diff --git a/...ntelemetry-instrumentation-grpc/setup.cfg → ...telemetry-instrumentation-grpcz/setup.cfg b/...ntelemetry-instrumentation-grpc/setup.cfg → ...telemetry-instrumentation-grpcz/setup.cfg
@@ -55,5 +55,5 @@ where = src
 
 [options.entry_points]
 opentelemetry_instrumentor =
-    grpc_client = opentelemetry.instrumentation.grpc:GrpcInstrumentorClient
-    grpc_server = opentelemetry.instrumentation.grpc:GrpcInstrumentorServer
+    grpc_client = opentelemetry.instrumentation.grpcz:GrpcInstrumentorClient
+    grpc_server = opentelemetry.instrumentation.grpcz:GrpcInstrumentorServer
diff --git a/...entelemetry-instrumentation-grpc/setup.py → ...ntelemetry-instrumentation-grpcz/setup.py b/...entelemetry-instrumentation-grpc/setup.py → ...ntelemetry-instrumentation-grpcz/setup.py
diff --git a/...elemetry/instrumentation/grpc/__init__.py → ...lemetry/instrumentation/grpcz/__init__.py b/...elemetry/instrumentation/grpc/__init__.py → ...lemetry/instrumentation/grpcz/__init__.py
@@ -26,7 +26,7 @@
     import grpc
 
     from opentelemetry import trace
-    from opentelemetry.instrumentation.grpc import GrpcInstrumentorClient, client_interceptor
+    from opentelemetry.instrumentation.grpcz import GrpcInstrumentorClient, client_interceptor
     from opentelemetry.sdk.trace import TracerProvider
     from opentelemetry.sdk.trace.export import (
         ConsoleSpanExporter,
@@ -77,8 +77,8 @@ def run():
     import grpc
 
     from opentelemetry import trace
-    from opentelemetry.instrumentation.grpc import GrpcInstrumentorServer, server_interceptor
-    from opentelemetry.instrumentation.grpc.grpcext import intercept_server
+    from opentelemetry.instrumentation.grpcz import GrpcInstrumentorServer, server_interceptor
+    from opentelemetry.instrumentation.grpcz.grpcext import intercept_server
     from opentelemetry.sdk.trace import TracerProvider
     from opentelemetry.sdk.trace.export import (
         ConsoleSpanExporter,
@@ -124,11 +124,11 @@ def serve():
 from wrapt import wrap_function_wrapper as _wrap
 
 from opentelemetry import trace
-from opentelemetry.instrumentation.grpc.grpcext import (
+from opentelemetry.instrumentation.grpcz.grpcext import (
     intercept_channel,
     intercept_server,
 )
-from opentelemetry.instrumentation.grpc.version import __version__
+from opentelemetry.instrumentation.grpcz.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
 

diff --git a/...telemetry/instrumentation/grpc/_client.py → ...elemetry/instrumentation/grpcz/_client.py b/...telemetry/instrumentation/grpc/_client.py → ...elemetry/instrumentation/grpcz/_client.py
diff --git a/...telemetry/instrumentation/grpc/_server.py → ...elemetry/instrumentation/grpcz/_server.py b/...telemetry/instrumentation/grpc/_server.py → ...elemetry/instrumentation/grpcz/_server.py
diff --git a/...emetry/instrumentation/grpc/_utilities.py → ...metry/instrumentation/grpcz/_utilities.py b/...emetry/instrumentation/grpc/_utilities.py → ...metry/instrumentation/grpcz/_utilities.py
diff --git a/.../instrumentation/grpc/grpcext/__init__.py → ...instrumentation/grpcz/grpcext/__init__.py b/.../instrumentation/grpc/grpcext/__init__.py → ...instrumentation/grpcz/grpcext/__init__.py
diff --git a/...trumentation/grpc/grpcext/_interceptor.py → ...rumentation/grpcz/grpcext/_interceptor.py b/...trumentation/grpc/grpcext/_interceptor.py → ...rumentation/grpcz/grpcext/_interceptor.py
diff --git a/...telemetry/instrumentation/grpc/version.py → ...elemetry/instrumentation/grpcz/version.py b/...telemetry/instrumentation/grpc/version.py → ...elemetry/instrumentation/grpcz/version.py
diff --git a/...ry-instrumentation-grpc/tests/__init__.py → ...y-instrumentation-grpcz/tests/__init__.py b/...ry-instrumentation-grpc/tests/__init__.py → ...y-instrumentation-grpcz/tests/__init__.py
diff --git a/...try-instrumentation-grpc/tests/_client.py → ...ry-instrumentation-grpcz/tests/_client.py b/...try-instrumentation-grpc/tests/_client.py → ...ry-instrumentation-grpcz/tests/_client.py
diff --git a/...try-instrumentation-grpc/tests/_server.py → ...ry-instrumentation-grpcz/tests/_server.py b/...try-instrumentation-grpc/tests/_server.py → ...ry-instrumentation-grpcz/tests/_server.py
diff --git a/...ion-grpc/tests/protobuf/test_server.proto → ...on-grpcz/tests/protobuf/test_server.proto b/...ion-grpc/tests/protobuf/test_server.proto → ...on-grpcz/tests/protobuf/test_server.proto
diff --git a/...on-grpc/tests/protobuf/test_server_pb2.py → ...n-grpcz/tests/protobuf/test_server_pb2.py b/...on-grpc/tests/protobuf/test_server_pb2.py → ...n-grpcz/tests/protobuf/test_server_pb2.py
diff --git a/...pc/tests/protobuf/test_server_pb2_grpc.py → ...cz/tests/protobuf/test_server_pb2_grpc.py b/...pc/tests/protobuf/test_server_pb2_grpc.py → ...cz/tests/protobuf/test_server_pb2_grpc.py
diff --git a/...ion-grpc/tests/test_client_interceptor.py → ...on-grpcz/tests/test_client_interceptor.py b/...ion-grpc/tests/test_client_interceptor.py → ...on-grpcz/tests/test_client_interceptor.py
@@ -14,9 +14,9 @@
 
 import grpc
 
-import opentelemetry.instrumentation.grpc
+import opentelemetry.instrumentation.grpcz
 from opentelemetry import trace
-from opentelemetry.instrumentation.grpc import GrpcInstrumentorClient
+from opentelemetry.instrumentation.grpcz import GrpcInstrumentorClient
 from opentelemetry.sdk.metrics.export.aggregate import (
     MinMaxSumCountAggregator,
     SumAggregator,
@@ -108,7 +108,7 @@ def test_unary_unary(self):
 
         # Check version and name in span's instrumentation info
         self.check_span_instrumentation_info(
-            span, opentelemetry.instrumentation.grpc
+            span, opentelemetry.instrumentation.grpcz
         )
 
         self._verify_success_records(8, 8, "/GRPCTestServer/SimpleMethod")
@@ -124,7 +124,7 @@ def test_unary_stream(self):
 
         # Check version and name in span's instrumentation info
         self.check_span_instrumentation_info(
-            span, opentelemetry.instrumentation.grpc
+            span, opentelemetry.instrumentation.grpcz
         )
 
         self._verify_success_records(
@@ -142,7 +142,7 @@ def test_stream_unary(self):
 
         # Check version and name in span's instrumentation info
         self.check_span_instrumentation_info(
-            span, opentelemetry.instrumentation.grpc
+            span, opentelemetry.instrumentation.grpcz
         )
 
         self._verify_success_records(
@@ -162,7 +162,7 @@ def test_stream_stream(self):
 
         # Check version and name in span's instrumentation info
         self.check_span_instrumentation_info(
-            span, opentelemetry.instrumentation.grpc
+            span, opentelemetry.instrumentation.grpcz
         )
 
         self._verify_success_records(
@@ -294,5 +294,5 @@ def test_unary_unary(self):
 
         # Check version and name in span's instrumentation info
         self.check_span_instrumentation_info(
-            span, opentelemetry.instrumentation.grpc
+            span, opentelemetry.instrumentation.grpcz
         )
diff --git a/...ion-grpc/tests/test_server_interceptor.py → ...on-grpcz/tests/test_server_interceptor.py b/...ion-grpc/tests/test_server_interceptor.py → ...on-grpcz/tests/test_server_interceptor.py
@@ -20,13 +20,13 @@
 
 import grpc
 
-import opentelemetry.instrumentation.grpc
+import opentelemetry.instrumentation.grpcz
 from opentelemetry import trace
-from opentelemetry.instrumentation.grpc import (
+from opentelemetry.instrumentation.grpcz import (
     GrpcInstrumentorServer,
     server_interceptor,
 )
-from opentelemetry.instrumentation.grpc.grpcext import intercept_server
+from opentelemetry.instrumentation.grpcz.grpcext import intercept_server
 from opentelemetry.sdk import trace as trace_sdk
 from opentelemetry.test.test_base import TestBase
 
@@ -80,7 +80,7 @@ def handler(request, context):
         self.assertEqual(span.name, "test")
         self.assertIs(span.kind, trace.SpanKind.SERVER)
         self.check_span_instrumentation_info(
-            span, opentelemetry.instrumentation.grpc
+            span, opentelemetry.instrumentation.grpcz
         )
         grpc_server_instrumentor.uninstrument()
 
@@ -147,7 +147,7 @@ def handler(request, context):
 
         # Check version and name in span's instrumentation info
         self.check_span_instrumentation_info(
-            span, opentelemetry.instrumentation.grpc
+            span, opentelemetry.instrumentation.grpcz
         )
 
     def test_span_lifetime(self):