ResourceBuilder API

examples/Console/TestConsoleExporter.cs

@@ -35,7 +35,7 @@ internal static object Run(ConsoleOptions options)
             // and use a custom MyProcessor, along with Console exporter.
             using var tracerProvider = Sdk.CreateTracerProviderBuilder()
                 .AddSource("MyCompany.MyProduct.MyWebServer")
-                .SetResource(Resources.CreateServiceResource("MyServiceName"))
+                .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("MyServiceName"))
                 .AddProcessor(new MyProcessor()) // This must be added before ConsoleExporter
                 .AddConsoleExporter()
                 .Build();

examples/Console/TestHttpClient.cs

@@ -34,7 +34,7 @@ internal static object Run()
 
             using var openTelemetry = Sdk.CreateTracerProviderBuilder()
                 .AddHttpClientInstrumentation()
-                .SetResource(Resources.CreateServiceResource("http-service-example"))
+                .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("http-service-example"))
                 .AddSource("http-client-test")
                 .AddConsoleExporter()
                 .Build();

examples/Console/TestOTelShimWithConsoleExporter.cs

@@ -28,7 +28,7 @@ internal static object Run(OpenTelemetryShimOptions options)
             // and use a single pipeline with a custom MyProcessor, and Console exporter.
             using var tracerProvider = Sdk.CreateTracerProviderBuilder()
                     .AddSource("MyCompany.MyProduct.MyWebServer")
-                    .SetResource(Resources.CreateServiceResource("MyServiceName"))
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("MyServiceName"))
                     .AddConsoleExporter()
                     .Build();
 

examples/Console/TestOpenTracingWithConsoleExporter.cs

@@ -31,7 +31,7 @@ internal static object Run(OpenTracingShimOptions options)
             // and use Console exporter.
             using var openTelemetry = Sdk.CreateTracerProviderBuilder()
                     .AddSource("MyCompany.MyProduct.MyWebServer")
-                    .SetResource(Resources.CreateServiceResource("MyServiceName"))
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("MyServiceName"))
                     .AddConsoleExporter()
                     .Build();
 

src/OpenTelemetry.Api/Internal/SemanticConventions.cs

@@ -26,50 +26,6 @@ internal static class SemanticConventions
         // https://github.com/open-telemetry/opentelemetry-specification/tree/master/specification/trace/semantic_conventions
         // https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/exceptions.md
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-        public const string AttributeServiceName = "service.name";
-        public const string AttributeServiceNamespace = "service.namespace";
-        public const string AttributeServiceInstance = "service.instance.id";
-        public const string AttributeServiceVersion = "service.version";
-
-        public const string AttributeTelemetrySdkName = "telemetry.sdk.name";
-        public const string AttributeTelemetrySdkLanguage = "telemetry.sdk.language";
-        public const string AttributeTelemetrySdkVersion = "telemetry.sdk.version";
-
-        public const string AttributeContainerName = "container.name";
-        public const string AttributeContainerImage = "container.image.name";
-        public const string AttributeContainerTag = "container.image.tag";
-
-        public const string AttributeFaasName = "faas.name";
-        public const string AttributeFaasId = "faas.id";
-        public const string AttributeFaasVersion = "faas.version";
-        public const string AttributeFaasInstance = "faas.instance";
-
-        public const string AttributeK8sCluster = "k8s.cluster.name";
-        public const string AttributeK8sNamespace = "k8s.namespace.name";
-        public const string AttributeK8sPod = "k8s.pod.name";
-        public const string AttributeK8sDeployment = "k8s.deployment.name";
-
-        public const string AttributeHostHostname = "host.hostname";
-        public const string AttributeHostId = "host.id";
-        public const string AttributeHostName = "host.name";
-        public const string AttributeHostType = "host.type";
-        public const string AttributeHostImageName = "host.image.name";
-        public const string AttributeHostImageId = "host.image.id";
-        public const string AttributeHostImageVersion = "host.image.version";
-
-        public const string AttributeProcessId = "process.id";
-        public const string AttributeProcessExecutableName = "process.executable.name";
-        public const string AttributeProcessExecutablePath = "process.executable.path";
-        public const string AttributeProcessCommand = "process.command";
-        public const string AttributeProcessCommandLine = "process.command_line";
-        public const string AttributeProcessUsername = "process.username";
-
-        public const string AttributeCloudProvider = "cloud.provider";
-        public const string AttributeCloudAccount = "cloud.account.id";
-        public const string AttributeCloudRegion = "cloud.region";
-        public const string AttributeCloudZone = "cloud.zone";
-        public const string AttributeComponent = "component";
-
         public const string AttributeNetTransport = "net.transport";
         public const string AttributeNetPeerIp = "net.peer.ip";
         public const string AttributeNetPeerPort = "net.peer.port";

src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs

@@ -105,10 +105,10 @@ internal void SetResource(Resource resource)
                 {
                     switch (key)
                     {
-                        case Resource.ServiceNameKey:
+                        case ResourceSemanticConventions.AttributeServiceName:
                             serviceName = strVal;
                             continue;
-                        case Resource.ServiceNamespaceKey:
+                        case ResourceSemanticConventions.AttributeServiceNamespace:
                             serviceNamespace = strVal;
                             continue;
                     }

src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net46;netstandard2.0;netstandard2.1</TargetFrameworks>
@@ -18,7 +18,8 @@
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\IActivityEnumerator.cs" Link="Includes\IActivityEnumerator.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\EnumerationHelper.cs" Link="Includes\EnumerationHelper.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PooledList.cs" Link="Includes\PooledList.cs" />
-    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Exporter\PeerServiceResolver.cs" Link="Includes\PeerServiceResolver.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PeerServiceResolver.cs" Link="Includes\PeerServiceResolver.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\ResourceSemanticConventions.cs" Link="Includes\ResourceSemanticConventions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj

@@ -18,7 +18,8 @@
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\IActivityEnumerator.cs" Link="Includes\IActivityEnumerator.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\EnumerationHelper.cs" Link="Includes\EnumerationHelper.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PooledList.cs" Link="Includes\PooledList.cs" />
-    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Exporter\PeerServiceResolver.cs" Link="Includes\PeerServiceResolver.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PeerServiceResolver.cs" Link="Includes\PeerServiceResolver.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\ResourceSemanticConventions.cs" Link="Includes\ResourceSemanticConventions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporter.cs

@@ -104,7 +104,7 @@ internal void SetResource(Resource resource)
                 }
             }
 
-            if (!processResource.Attributes.Any(kvp => kvp.Key == Resource.ServiceNameKey))
+            if (!processResource.Attributes.Any(kvp => kvp.Key == ResourceSemanticConventions.AttributeServiceName))
             {
                 string serviceName = this.options.ServiceName;
                 if (string.IsNullOrEmpty(serviceName))
@@ -114,7 +114,7 @@ internal void SetResource(Resource resource)
 
                 processResource.Attributes.Add(new OtlpCommon.KeyValue
                 {
-                    Key = Resource.ServiceNameKey,
+                    Key = ResourceSemanticConventions.AttributeServiceName,
                     Value = new OtlpCommon.AnyValue { StringValue = serviceName },
                 });
             }

src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj

@@ -13,7 +13,8 @@
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\IActivityEnumerator.cs" Link="Includes\IActivityEnumerator.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\EnumerationHelper.cs" Link="Includes\EnumerationHelper.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PooledList.cs" Link="Includes\PooledList.cs" />
-    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Exporter\PeerServiceResolver.cs" Link="Includes\PeerServiceResolver.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PeerServiceResolver.cs" Link="Includes\PeerServiceResolver.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\ResourceSemanticConventions.cs" Link="Includes\ResourceSemanticConventions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs

@@ -115,7 +115,7 @@ internal void SetLocalEndpointFromResource(Resource resource)
 
                 switch (key)
                 {
-                    case Resource.ServiceNameKey:
+                    case ResourceSemanticConventions.AttributeServiceName:
                         serviceName = label.Value as string;
                         continue;
                 }

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

@@ -126,7 +126,11 @@ OpenTelemetry.Resources.Resource
 OpenTelemetry.Resources.Resource.Attributes.get -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>>
 OpenTelemetry.Resources.Resource.Merge(OpenTelemetry.Resources.Resource other) -> OpenTelemetry.Resources.Resource
 OpenTelemetry.Resources.Resource.Resource(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) -> void
-OpenTelemetry.Resources.Resources
+OpenTelemetry.Resources.ResourceBuilder
+OpenTelemetry.Resources.ResourceBuilder.AddResource(OpenTelemetry.Resources.Resource resource) -> OpenTelemetry.Resources.ResourceBuilder
+OpenTelemetry.Resources.ResourceBuilder.Build() -> OpenTelemetry.Resources.Resource
+OpenTelemetry.Resources.ResourceBuilder.Clear() -> OpenTelemetry.Resources.ResourceBuilder
+OpenTelemetry.ResourceBuilderExtensions
 OpenTelemetry.Sdk
 OpenTelemetry.SimpleExportProcessor<T>
 OpenTelemetry.SimpleExportProcessor<T>.SimpleExportProcessor(OpenTelemetry.BaseExporter<T> exporter) -> void
@@ -176,10 +180,6 @@ abstract OpenTelemetry.Metrics.Export.MetricExporter.ExportAsync(System.Collecti
 abstract OpenTelemetry.Metrics.Export.MetricProcessor.FinishCollectionCycle(out System.Collections.Generic.IEnumerable<OpenTelemetry.Metrics.Export.Metric> metrics) -> void
 abstract OpenTelemetry.Metrics.Export.MetricProcessor.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
 abstract OpenTelemetry.Trace.Sampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
-const OpenTelemetry.Resources.Resource.ServiceInstanceIdKey = "service.instance.id" -> string
-const OpenTelemetry.Resources.Resource.ServiceNameKey = "service.name" -> string
-const OpenTelemetry.Resources.Resource.ServiceNamespaceKey = "service.namespace" -> string
-const OpenTelemetry.Resources.Resource.ServiceVersionKey = "service.version" -> string
 override OpenTelemetry.BaseExportProcessor<T>.Dispose(bool disposing) -> void
 override OpenTelemetry.BaseExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
 override OpenTelemetry.BatchExportProcessor<T>.OnEnd(T data) -> void
@@ -227,8 +227,13 @@ override abstract OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
 override sealed OpenTelemetry.BaseExportProcessor<T>.OnStart(T data) -> void
 readonly OpenTelemetry.BaseExportProcessor<T>.exporter -> OpenTelemetry.BaseExporter<T>
 static OpenTelemetry.ProviderExtensions.GetResource(this OpenTelemetry.BaseProvider baseProvider) -> OpenTelemetry.Resources.Resource
+static OpenTelemetry.ResourceBuilderExtensions.AddEnvironmentVariableDetector(this OpenTelemetry.Resources.ResourceBuilder resourceBuilder) -> OpenTelemetry.Resources.ResourceBuilder
 static OpenTelemetry.Resources.Resource.Empty.get -> OpenTelemetry.Resources.Resource
-static OpenTelemetry.Resources.Resources.CreateServiceResource(string serviceName, string serviceInstanceId = null, string serviceNamespace = null, string serviceVersion = null) -> OpenTelemetry.Resources.Resource
+static OpenTelemetry.ResourceBuilderExtensions.AddAttributes(this OpenTelemetry.Resources.ResourceBuilder resourceBuilder, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) -> OpenTelemetry.Resources.ResourceBuilder
+static OpenTelemetry.ResourceBuilderExtensions.AddService(this OpenTelemetry.Resources.ResourceBuilder resourceBuilder, string serviceName, string serviceNamespace = null, string serviceVersion = null, bool autoGenerateServiceInstanceId = true, string serviceInstanceId = null) -> OpenTelemetry.Resources.ResourceBuilder
+static OpenTelemetry.ResourceBuilderExtensions.AddTelemetrySdk(this OpenTelemetry.Resources.ResourceBuilder resourceBuilder) -> OpenTelemetry.Resources.ResourceBuilder
+static OpenTelemetry.Resources.ResourceBuilder.CreateDefault() -> OpenTelemetry.Resources.ResourceBuilder
+static OpenTelemetry.Resources.ResourceBuilder.CreateEmpty() -> OpenTelemetry.Resources.ResourceBuilder
 static OpenTelemetry.Sdk.CreateMeterProviderBuilder() -> OpenTelemetry.Metrics.MeterProviderBuilder
 static OpenTelemetry.Sdk.CreateTracerProviderBuilder() -> OpenTelemetry.Trace.TracerProviderBuilder
 static OpenTelemetry.Sdk.SetDefaultTextMapPropagator(OpenTelemetry.Context.Propagation.TextMapPropagator textMapPropagator) -> void
@@ -239,7 +244,7 @@ static OpenTelemetry.Trace.SamplingResult.operator !=(OpenTelemetry.Trace.Sampli
 static OpenTelemetry.Trace.SamplingResult.operator ==(OpenTelemetry.Trace.SamplingResult decision1, OpenTelemetry.Trace.SamplingResult decision2) -> bool
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddProcessor(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder, OpenTelemetry.BaseProcessor<System.Diagnostics.Activity> processor) -> OpenTelemetry.Trace.TracerProviderBuilder
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.Build(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder) -> OpenTelemetry.Trace.TracerProvider
-static OpenTelemetry.Trace.TracerProviderBuilderExtensions.SetResource(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder, OpenTelemetry.Resources.Resource resource) -> OpenTelemetry.Trace.TracerProviderBuilder
+static OpenTelemetry.Trace.TracerProviderBuilderExtensions.SetResourceBuilder(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder, OpenTelemetry.Resources.ResourceBuilder resourceBuilder) -> OpenTelemetry.Trace.TracerProviderBuilder
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.SetSampler(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder, OpenTelemetry.Trace.Sampler sampler) -> OpenTelemetry.Trace.TracerProviderBuilder
 static OpenTelemetry.Trace.TracerProviderExtensions.AddProcessor(this OpenTelemetry.Trace.TracerProvider provider, OpenTelemetry.BaseProcessor<System.Diagnostics.Activity> processor) -> OpenTelemetry.Trace.TracerProvider
 static OpenTelemetry.Trace.TracerProviderExtensions.Shutdown(this OpenTelemetry.Trace.TracerProvider provider, int timeoutMilliseconds = -1) -> bool