Remove service name

docs/examples/opencensus-exporter-tracer/collector.py

@@ -21,9 +21,7 @@
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
-exporter = OpenCensusSpanExporter(
-    service_name="basic-service", endpoint="localhost:55678"
-)
+exporter = OpenCensusSpanExporter(endpoint="localhost:55678")
 
 trace.set_tracer_provider(TracerProvider())
 tracer = trace.get_tracer(__name__)

docs/getting_started/jaeger_example.py

@@ -15,15 +15,18 @@
 # jaeger_example.py
 from opentelemetry import trace
 from opentelemetry.exporter import jaeger
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
-trace.set_tracer_provider(TracerProvider())
+trace.set_tracer_provider(
+    TracerProvider(
+        resource=Resource.create({SERVICE_NAME: "my-helloworld-service"})
+    )
+)
 
 jaeger_exporter = jaeger.JaegerSpanExporter(
-    service_name="my-helloworld-service",
-    agent_host_name="localhost",
-    agent_port=6831,
+    agent_host_name="localhost", agent_port=6831,
 )
 
 trace.get_tracer_provider().add_span_processor(

exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py

@@ -10,7 +10,6 @@
 
 # create a JaegerSpanExporter
 jaeger_exporter = jaeger.JaegerSpanExporter(
-    service_name="my-helloworld-service",
     # configure agent
     agent_host_name="localhost",
     agent_port=6831,
@@ -29,7 +28,6 @@
 # `EXPORTER_JAEGER_CERTIFICATE` with file containing creds.
 
 # jaeger_exporter = jaeger.JaegerSpanExporter(
-#     service_name="my-helloworld-service",
 #     collector_endpoint="localhost:14250",
 #     insecure=True,
 #     transport_format="protobuf",

exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py

@@ -36,7 +36,6 @@
 
     # create a JaegerSpanExporter
     jaeger_exporter = jaeger.JaegerSpanExporter(
-        service_name='my-helloworld-service',
         # configure agent
         agent_host_name='localhost',
         agent_port=6831,
@@ -72,6 +71,7 @@
 
 from grpc import ChannelCredentials, insecure_channel, secure_channel
 
+from opentelemetry import trace
 from opentelemetry.exporter.jaeger import util
 from opentelemetry.exporter.jaeger.gen import model_pb2
 from opentelemetry.exporter.jaeger.gen.collector_pb2 import PostSpansRequest
@@ -90,6 +90,7 @@
     OTEL_EXPORTER_JAEGER_PASSWORD,
     OTEL_EXPORTER_JAEGER_USER,
 )
+from opentelemetry.sdk.resources import SERVICE_NAME
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 
 DEFAULT_AGENT_HOST_NAME = "localhost"
@@ -108,8 +109,6 @@ class JaegerSpanExporter(SpanExporter):
     """Jaeger span exporter for OpenTelemetry.
 
     Args:
-        service_name: Service that logged an annotation in a trace.Classifier
-            when query for spans.
         agent_host_name: The host name of the Jaeger-Agent.
         agent_port: The port of the Jaeger-Agent.
         collector_endpoint: The endpoint of the Jaeger collector that uses
@@ -126,7 +125,6 @@ class JaegerSpanExporter(SpanExporter):
 
     def __init__(
         self,
-        service_name: str,
         agent_host_name: Optional[str] = None,
         agent_port: Optional[int] = None,
         collector_endpoint: Optional[str] = None,
@@ -137,7 +135,6 @@ def __init__(
         transport_format: Optional[str] = None,
         max_tag_value_length: Optional[int] = None,
     ):
-        self.service_name = service_name
         self._max_tag_value_length = max_tag_value_length
         self.agent_host_name = _parameter_setter(
             param=agent_host_name,
@@ -222,10 +219,14 @@ def _collector_http_client(self) -> Optional[Collector]:
         return self._collector
 
     def export(self, spans) -> SpanExportResult:
+
+        tracer_provider = trace.get_tracer_provider()
+        resource = tracer_provider.resource
+        svc_name = resource.attributes[SERVICE_NAME]
         translator = Translate(spans)
         if self.transport_format == TRANSPORT_FORMAT_PROTOBUF:
             pb_translator = ProtobufTranslator(
-                self.service_name, self._max_tag_value_length
+                svc_name, self._max_tag_value_length
             )
             jaeger_spans = translator._translate(pb_translator)
             batch = model_pb2.Batch(spans=jaeger_spans)
@@ -236,7 +237,7 @@ def export(self, spans) -> SpanExportResult:
             jaeger_spans = translator._translate(thrift_translator)
             batch = jaeger_thrift.Batch(
                 spans=jaeger_spans,
-                process=jaeger_thrift.Process(serviceName=self.service_name),
+                process=jaeger_thrift.Process(serviceName=svc_name),
             )
             if self._collector_http_client is not None:
                 self._collector_http_client.submit(batch)

exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_protobuf.py

@@ -56,7 +56,7 @@ def setUp(self):
     def test_constructor_by_environment_variables(self):
         """Test using Environment Variables."""
         # pylint: disable=protected-access
-        service = "my-opentelemetry-jaeger"
+        # service = "my-opentelemetry-jaeger"
 
         collector_endpoint = "localhost:14250"
 
@@ -71,11 +71,8 @@ def test_constructor_by_environment_variables(self):
 
         env_patch.start()
 
-        exporter = JaegerSpanExporter(
-            service_name=service, transport_format="protobuf"
-        )
+        exporter = JaegerSpanExporter(transport_format="protobuf")
 
-        self.assertEqual(exporter.service_name, service)
         self.assertIsNotNone(exporter._collector_grpc_client)
         self.assertEqual(exporter.collector_endpoint, collector_endpoint)
         self.assertIsNotNone(exporter.credentials)

exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_thrift.py

@@ -31,7 +31,8 @@
     OTEL_EXPORTER_JAEGER_PASSWORD,
     OTEL_EXPORTER_JAEGER_USER,
 )
-from opentelemetry.sdk.trace import Resource
+from opentelemetry.sdk.resources import SERVICE_NAME
+from opentelemetry.sdk.trace import Resource, TracerProvider
 from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
@@ -54,12 +55,12 @@ def setUp(self):
     def test_constructor_default(self):
         # pylint: disable=protected-access
         """Test the default values assigned by constructor."""
-        service_name = "my-service-name"
+        # service_name = "my-service-name"
         agent_host_name = "localhost"
         agent_port = 6831
-        exporter = jaeger_exporter.JaegerSpanExporter(service_name)
+        exporter = jaeger_exporter.JaegerSpanExporter()
 
-        self.assertEqual(exporter.service_name, service_name)
+        # self.assertEqual(exporter.service_name, service_name)
         self.assertEqual(exporter.agent_host_name, agent_host_name)
         self.assertEqual(exporter.agent_port, agent_port)
         self.assertEqual(exporter.collector_endpoint, None)
@@ -72,7 +73,7 @@ def test_constructor_default(self):
     def test_constructor_explicit(self):
         # pylint: disable=protected-access
         """Test the constructor passing all the options."""
-        service = "my-opentelemetry-jaeger"
+        # service = "my-opentelemetry-jaeger"
         collector_endpoint = "https://opentelemetry.io:15875"
 
         agent_port = 14268
@@ -83,7 +84,6 @@ def test_constructor_explicit(self):
         auth = (username, password)
 
         exporter = jaeger_exporter.JaegerSpanExporter(
-            service_name=service,
             agent_host_name=agent_host_name,
             agent_port=agent_port,
             collector_endpoint=collector_endpoint,
@@ -92,7 +92,7 @@ def test_constructor_explicit(self):
             max_tag_value_length=42,
         )
 
-        self.assertEqual(exporter.service_name, service)
+        # self.assertEqual(exporter.service_name, service)
         self.assertEqual(exporter.agent_host_name, agent_host_name)
         self.assertEqual(exporter.agent_port, agent_port)
         self.assertTrue(exporter._collector_http_client is not None)
@@ -111,7 +111,7 @@ def test_constructor_explicit(self):
     def test_constructor_by_environment_variables(self):
         #  pylint: disable=protected-access
         """Test the constructor using Environment Variables."""
-        service = "my-opentelemetry-jaeger"
+        # service = "my-opentelemetry-jaeger"
 
         agent_host_name = "opentelemetry.io"
         agent_port = "6831"
@@ -135,9 +135,9 @@ def test_constructor_by_environment_variables(self):
 
         environ_patcher.start()
 
-        exporter = jaeger_exporter.JaegerSpanExporter(service_name=service)
+        exporter = jaeger_exporter.JaegerSpanExporter()
 
-        self.assertEqual(exporter.service_name, service)
+        # self.assertEqual(exporter.service_name, service)
         self.assertEqual(exporter.agent_host_name, agent_host_name)
         self.assertEqual(exporter.agent_port, int(agent_port))
         self.assertTrue(exporter._collector_http_client is not None)
@@ -432,9 +432,17 @@ def test_translate_to_jaeger(self):
         self.assertEqual(spans, expected_spans)
 
     def test_export(self):
+
         """Test that agent and/or collector are invoked"""
+
+        trace_api.set_tracer_provider(
+            TracerProvider(
+                resource=Resource.create({SERVICE_NAME: "text_export"})
+            )
+        )
+
         exporter = jaeger_exporter.JaegerSpanExporter(
-            "test_export", agent_host_name="localhost", agent_port=6318
+            agent_host_name="localhost", agent_port=6318
         )
 
         # just agent is configured now

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

@@ -25,6 +25,8 @@
 from opencensus.proto.trace.v1 import trace_pb2
 
 import opentelemetry.exporter.opencensus.util as utils
+from opentelemetry import trace
+from opentelemetry.sdk.resources import SERVICE_NAME
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 
@@ -39,18 +41,16 @@ class OpenCensusSpanExporter(SpanExporter):
 
     Args:
         endpoint: OpenCensus Collector receiver endpoint.
-        service_name: Name of Collector service.
         host_name: Host name.
         client: TraceService client stub.
     """
 
     def __init__(
-        self,
-        endpoint=DEFAULT_ENDPOINT,
-        service_name=None,
-        host_name=None,
-        client=None,
+        self, endpoint=DEFAULT_ENDPOINT, host_name=None, client=None,
     ):
+        tracer_provider = trace.get_tracer_provider()
+        resource = tracer_provider.resource
+        service_name = resource.attributes[SERVICE_NAME]
         self.endpoint = endpoint
         if client is None:
             self.channel = grpc.insecure_channel(self.endpoint)

exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py

@@ -26,6 +26,8 @@
     translate_to_collector,
 )
 from opentelemetry.sdk import trace
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
+from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import SpanExportResult
 from opentelemetry.trace import TraceFlags
 
@@ -38,21 +40,23 @@ def test_constructor(self):
             "opentelemetry.exporter.opencensus.util.get_node",
             side_effect=mock_get_node,
         )
-        service_name = "testServiceName"
+        trace_api.set_tracer_provider(
+            TracerProvider(
+                resource=Resource.create({SERVICE_NAME: "testServiceName"})
+            )
+        )
+
         host_name = "testHostName"
         client = grpc.insecure_channel("")
         endpoint = "testEndpoint"
         with patch:
             exporter = OpenCensusSpanExporter(
-                service_name=service_name,
-                host_name=host_name,
-                endpoint=endpoint,
-                client=client,
+                host_name=host_name, endpoint=endpoint, client=client,
             )
 
         self.assertIs(exporter.client, client)
         self.assertEqual(exporter.endpoint, endpoint)
-        mock_get_node.assert_called_with(service_name, host_name)
+        mock_get_node.assert_called_with("testServiceName", host_name)
 
     def test_get_collector_span_kind(self):
         result = utils.get_collector_span_kind(trace_api.SpanKind.SERVER)

tests/opentelemetry-docker-tests/tests/opencensus/test_opencensusexporter_functional.py

@@ -40,9 +40,7 @@ def setUp(self):
         trace.set_tracer_provider(TracerProvider())
         self.tracer = trace.get_tracer(__name__)
         self.span_processor = ExportStatusSpanProcessor(
-            OpenCensusSpanExporter(
-                service_name="basic-service", endpoint="localhost:55678"
-            )
+            OpenCensusSpanExporter(endpoint="localhost:55678")
         )
 
         trace.get_tracer_provider().add_span_processor(self.span_processor)