Rely on DefaultResource's Service.Name for Exporters (#1768)

* Jaeger and API changes and ProviderMethod

* Changelog

* Fix whitespace

* Not just checking first element of default resource but querying for servicename

* Including the servicename fallback in Zipkin options

* Resolving tests

* we previously removed the adapting of new servicenames from resources in jaeger, this undoes that

* Removing servicename from Jaeger ctor

* re-adding servicename to Ctor for Jaeger

* CodeBlanch 's implementation for preserving servicename

* Scrubbed ServiceName from ZipkinExporterOptions

* Messed up ternary operator order again

* reordering using for SA compliance

* more instances of zipkinoptions.servicename

* removed servicename from API

* Changelog in right places

Co-authored-by: Cijo Thomas <[email protected]>

Author: Austin-Tan

examples/AspNetCore/Startup.cs

@@ -75,7 +75,6 @@ public void ConfigureServices(IServiceCollection services)
                         .AddHttpClientInstrumentation()
                         .AddZipkinExporter(zipkinOptions =>
                         {
-                            zipkinOptions.ServiceName = this.Configuration.GetValue<string>("Zipkin:ServiceName");
                             zipkinOptions.Endpoint = new Uri(this.Configuration.GetValue<string>("Zipkin:Endpoint"));
                         }));
                     break;

examples/Console/TestRedis.cs

@@ -45,7 +45,6 @@ internal static object Run(string zipkinUri)
             using var openTelemetry = Sdk.CreateTracerProviderBuilder()
                     .AddZipkinExporter(o =>
                     {
-                        o.ServiceName = "redis-test";
                         o.Endpoint = new Uri(zipkinUri);
                     })
                     .AddRedisInstrumentation(connection, options =>

examples/Console/TestZipkinExporter.cs

@@ -40,7 +40,6 @@ internal static object Run(string zipkinUri)
                     .AddSource("Samples.SampleClient", "Samples.SampleServer")
                     .AddZipkinExporter(o =>
                     {
-                        o.ServiceName = "test-zipkin";
                         o.Endpoint = new Uri(zipkinUri);
                     })
                     .Build();

examples/GrpcService/Startup.cs

@@ -59,7 +59,6 @@ public void ConfigureServices(IServiceCollection services)
                         .AddAspNetCoreInstrumentation()
                         .AddZipkinExporter(zipkinOptions =>
                         {
-                            zipkinOptions.ServiceName = this.Configuration.GetValue<string>("Zipkin:ServiceName");
                             zipkinOptions.Endpoint = new Uri(this.Configuration.GetValue<string>("Zipkin:Endpoint"));
                         }));
                     break;

examples/MicroserviceExample/WebApi/Startup.cs

@@ -46,7 +46,6 @@ public void ConfigureServices(IServiceCollection services)
                 .AddZipkinExporter(b =>
                 {
                     var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
-                    b.ServiceName = nameof(WebApi);
                     b.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
                 }));
         }

examples/MicroserviceExample/WorkerService/Program.cs

@@ -44,7 +44,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                             .AddZipkinExporter(b =>
                             {
                                 var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
-                                b.ServiceName = nameof(WorkerService);
                                 b.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
                             });
                     });

src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md

@@ -5,6 +5,9 @@
 * Moved `JaegerExporter` and `JaegerExporterOptions` classes to
   `OpenTelemetry.Exporter` namespace.
   ([#1770](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1770))
+* Default `service.name` complies with OTel spec. Grabs default from
+  `ParentProvider` using GetDefaultResource() APIfrom SDK if not found.
+  [#1768](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1768)
 
 ## 1.0.0-rc2
 

src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs

@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using OpenTelemetry.Exporter.Jaeger.Implementation;
 using OpenTelemetry.Resources;
@@ -28,8 +29,6 @@ namespace OpenTelemetry.Exporter
 {
     public class JaegerExporter : BaseExporter<Activity>
     {
-        private const string DefaultServiceName = "OpenTelemetry Exporter";
-
         private readonly int maxPayloadSizeInBytes;
         private readonly TProtocolFactory protocolFactory;
         private readonly TTransport clientTransport;
@@ -58,7 +57,9 @@ internal JaegerExporter(JaegerExporterOptions options, TTransport clientTranspor
             this.memoryTransport = new InMemoryTransport(16000);
             this.memoryProtocol = this.protocolFactory.GetProtocol(this.memoryTransport);
 
-            this.Process = new Process(DefaultServiceName, options.ProcessTags);
+            string serviceName = (string)this.ParentProvider.GetDefaultResource().Attributes.Where(
+                    pair => pair.Key == ResourceSemanticConventions.AttributeServiceName).FirstOrDefault().Value;
+            this.Process = new Process(serviceName, options.ProcessTags);
         }
 
         internal Process Process { get; set; }
@@ -130,14 +131,14 @@ internal void SetResourceAndInitializeBatch(Resource resource)
 
             if (serviceName != null)
             {
-                process.ServiceName = serviceNamespace != null
-                    ? serviceNamespace + "." + serviceName
-                    : serviceName;
+                serviceName = string.IsNullOrEmpty(serviceNamespace)
+                    ? serviceName
+                    : serviceNamespace + "." + serviceName;
             }
 
-            if (string.IsNullOrEmpty(process.ServiceName))
+            if (!string.IsNullOrEmpty(serviceName))
             {
-                process.ServiceName = DefaultServiceName;
+                process.ServiceName = serviceName;
             }
 
             this.Process.Message = this.BuildThriftMessage(this.Process).ToArray();

src/OpenTelemetry.Exporter.Zipkin/.publicApi/net452/PublicAPI.Unshipped.txt

@@ -7,8 +7,6 @@ OpenTelemetry.Exporter.ZipkinExporterOptions.Endpoint.get -> System.Uri
 OpenTelemetry.Exporter.ZipkinExporterOptions.Endpoint.set -> void
 OpenTelemetry.Exporter.ZipkinExporterOptions.ExportProcessorType.get -> OpenTelemetry.ExportProcessorType
 OpenTelemetry.Exporter.ZipkinExporterOptions.ExportProcessorType.set -> void
-OpenTelemetry.Exporter.ZipkinExporterOptions.ServiceName.get -> string
-OpenTelemetry.Exporter.ZipkinExporterOptions.ServiceName.set -> void
 OpenTelemetry.Exporter.ZipkinExporterOptions.UseShortTraceIds.get -> bool
 OpenTelemetry.Exporter.ZipkinExporterOptions.UseShortTraceIds.set -> void
 OpenTelemetry.Exporter.ZipkinExporterOptions.ZipkinExporterOptions() -> void

src/OpenTelemetry.Exporter.Zipkin/.publicApi/net461/PublicAPI.Unshipped.txt

@@ -9,8 +9,6 @@ OpenTelemetry.Exporter.ZipkinExporterOptions.ExportProcessorType.get -> OpenTele
 OpenTelemetry.Exporter.ZipkinExporterOptions.ExportProcessorType.set -> void
 OpenTelemetry.Exporter.ZipkinExporterOptions.MaxPayloadSizeInBytes.get -> int?
 OpenTelemetry.Exporter.ZipkinExporterOptions.MaxPayloadSizeInBytes.set -> void
-OpenTelemetry.Exporter.ZipkinExporterOptions.ServiceName.get -> string
-OpenTelemetry.Exporter.ZipkinExporterOptions.ServiceName.set -> void
 OpenTelemetry.Exporter.ZipkinExporterOptions.UseShortTraceIds.get -> bool
 OpenTelemetry.Exporter.ZipkinExporterOptions.UseShortTraceIds.set -> void
 OpenTelemetry.Exporter.ZipkinExporterOptions.ZipkinExporterOptions() -> void