Merge with origin/main

.github/workflows/apicompatibility.yml

@@ -9,18 +9,11 @@ on:
 jobs:
   build-test:
     runs-on: windows-latest
-    # https://github.com/actions/setup-dotnet/issues/122
     env:
       CheckAPICompatibility: true
-      DOTNET_MULTILEVEL_LOOKUP: 1
     steps:
     - uses: actions/checkout@v2
 
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: true
-
     - name: Install dependencies
       run: dotnet restore
 

.github/workflows/code-coverage.yml

@@ -13,26 +13,19 @@ on:
 jobs:
   build-test-report:
     runs-on: ${{ matrix.os }}
-    # https://github.com/actions/setup-dotnet/issues/122
 
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest]
     env:
       OS: ${{ matrix.os }}
-      DOTNET_MULTILEVEL_LOOKUP: 1
 
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0 # fetching all
 
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: true
-
     - name: Install dependencies
       run: dotnet restore
 

.github/workflows/integration.yml

@@ -13,80 +13,48 @@ on:
 jobs:
   redis-test:
     runs-on: ubuntu-latest
-    # https://github.com/actions/setup-dotnet/issues/122
-    env:
-      DOTNET_MULTILEVEL_LOOKUP: 1
     strategy:
       fail-fast: false
       matrix:
         version: [netcoreapp3.1,net5.0,net6.0]
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-          include-prerelease: true
-
       - name: Run redis docker-compose.integration
         run: docker-compose --file=test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
 
   sql-test:
     runs-on: ubuntu-latest
-    # https://github.com/actions/setup-dotnet/issues/122
-    env:
-      DOTNET_MULTILEVEL_LOOKUP: 1
     strategy:
       fail-fast: false
       matrix:
         version: [netcoreapp3.1,net5.0,net6.0]
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-          include-prerelease: true
-
       - name: Run sql docker-compose.integration
         run: docker-compose --file=test/OpenTelemetry.Instrumentation.SqlClient.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
 
   w3c-trace-context-test:
     runs-on: ubuntu-latest
-    # https://github.com/actions/setup-dotnet/issues/122
-    env:
-      DOTNET_MULTILEVEL_LOOKUP: 1
     strategy:
       fail-fast: false
       matrix:
         version: [netcoreapp3.1,net5.0,net6.0]
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-          include-prerelease: true
-
       - name: Run W3C Trace Context docker-compose.integration
         run: docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
 
   otlp-exporter-test:
     runs-on: ubuntu-latest
-    # https://github.com/actions/setup-dotnet/issues/122
-    env:
-      DOTNET_MULTILEVEL_LOOKUP: 1
     strategy:
       fail-fast: false
       matrix:
         version: [netcoreapp3.1,net5.0,net6.0]
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-          include-prerelease: true
-
       - name: Run OTLP Exporter docker-compose.integration
         run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build

.github/workflows/linux-ci.yml

@@ -13,9 +13,6 @@ on:
 jobs:
   build-test:
     runs-on: ubuntu-latest
-    # https://github.com/actions/setup-dotnet/issues/122
-    env:
-      DOTNET_MULTILEVEL_LOOKUP: 1
 
     strategy:
       matrix:
@@ -24,26 +21,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
-
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: true
-
     - name: Install dependencies
       run: dotnet restore
 
     - name: Build
       run: dotnet build --configuration Release --no-restore
 
     - name: Test ${{ matrix.version }}
-      env:
-        DOTNET_MULTILEVEL_LOOKUP: 1
       run: dotnet test **/bin/**/${{ matrix.version }}/*.Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed"

.github/workflows/publish-packages-1.0.yml

@@ -32,11 +32,6 @@ jobs:
         fetch-depth: 0 # fetching all
         ref: ${{ matrix.branches }}
 
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: true
-
     - name: Install dependencies
       run: dotnet restore
 

.github/workflows/windows-ci.yml

@@ -13,9 +13,6 @@ on:
 jobs:
   build-test:
     runs-on: windows-latest
-    # https://github.com/actions/setup-dotnet/issues/122
-    env:
-      DOTNET_MULTILEVEL_LOOKUP: 1
 
     strategy:
       matrix:
@@ -24,11 +21,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: true
-
     - name: Install dependencies
       run: dotnet restore
 

docs/trace/extending-the-sdk/MyResourceDetector.cs

@@ -0,0 +1,31 @@
+// <copyright file="MyResourceDetector.cs" company="OpenTelemetry Authors">
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+using System.Collections.Generic;
+using OpenTelemetry.Resources;
+
+internal class MyResourceDetector : IResourceDetector
+{
+    public Resource Detect()
+    {
+        var attributes = new List<KeyValuePair<string, object>>
+        {
+            new KeyValuePair<string, object>("key", "val"),
+        };
+
+        return new Resource(attributes);
+    }
+}

docs/trace/extending-the-sdk/Program.cs

@@ -16,6 +16,7 @@
 
 using System.Diagnostics;
 using OpenTelemetry;
+using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 
 public class Program
@@ -27,6 +28,7 @@ public static void Main()
         using var tracerProvider = Sdk.CreateTracerProviderBuilder()
             .SetSampler(new MySampler())
             .AddSource("OTel.Demo")
+            .SetResourceBuilder(ResourceBuilder.CreateEmpty().AddDetector(new MyResourceDetector()))
             .AddProcessor(new MyProcessor("ProcessorA"))
             .AddProcessor(new MyProcessor("ProcessorB"))
             .AddProcessor(new SimpleActivityExportProcessor(new MyExporter("ExporterX")))

docs/trace/extending-the-sdk/README.md

@@ -4,6 +4,7 @@
 * [Building your own instrumentation library](#instrumentation-library)
 * [Building your own processor](#processor)
 * [Building your own sampler](#sampler)
+* [Building your own resource detector](#resource-detector)
 * [References](#references)
 
 ## Exporter
@@ -293,11 +294,28 @@ class MySampler : Sampler
 
 A demo sampler is shown [here](./MySampler.cs).
 
+## Resource Detector
+
+OpenTelemetry .NET SDK provides a resource detector for detecting
+resource information from the `OTEL_RESOURCE_ATTRIBUTES` and
+`OTEL_SERVICE_NAME` environment variables.
+
+Custom resource detectors can be implemented:
+
+* ResourceDetectors should inherit from
+  `OpenTelemetry.Resources.IResourceDetector`, (which belongs
+  to the [OpenTelemetry](../../../src/OpenTelemetry/README.md)
+  package), and implement the `Detect` method.
+
+A demo ResourceDetector is shown [here](./MyResourceDetector.cs).
+
 ## References
 
 * [Exporter
   specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#span-exporter)
 * [Processor
   specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#span-processor)
+* [Resource
+  specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/sdk.md)
 * [Sampler
   specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#sampler)

src/OpenTelemetry.Exporter.Console/ConsoleMetricExporter.cs

@@ -41,7 +41,7 @@ public override ExportResult Export(in Batch<Metric> batch)
                     {
                         if (resourceAttribute.Key.Equals("service.name"))
                         {
-                            this.WriteLine("Service.Name" + resourceAttribute.Value);
+                            this.WriteLine("Service.Name=" + resourceAttribute.Value);
                         }
                     }
                 }

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

@@ -114,6 +114,8 @@ OpenTelemetry.ReadOnlyTagCollection.GetEnumerator() -> OpenTelemetry.ReadOnlyTag
 OpenTelemetry.ReadOnlyTagCollection.ReadOnlyTagCollection() -> void
 OpenTelemetry.Resources.IResourceDetector
 OpenTelemetry.Resources.IResourceDetector.Detect() -> OpenTelemetry.Resources.Resource
+OpenTelemetry.Resources.Resource.Resource(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) -> void
+OpenTelemetry.Resources.ResourceBuilder.AddDetector(OpenTelemetry.Resources.IResourceDetector resourceDetector) -> OpenTelemetry.Resources.ResourceBuilder
 OpenTelemetry.Trace.BatchExportActivityProcessorOptions
 OpenTelemetry.Trace.BatchExportActivityProcessorOptions.BatchExportActivityProcessorOptions() -> void
 override OpenTelemetry.BaseExportProcessor<T>.OnForceFlush(int timeoutMilliseconds) -> bool

src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt

@@ -114,6 +114,8 @@ OpenTelemetry.ReadOnlyTagCollection.GetEnumerator() -> OpenTelemetry.ReadOnlyTag
 OpenTelemetry.ReadOnlyTagCollection.ReadOnlyTagCollection() -> void
 OpenTelemetry.Resources.IResourceDetector
 OpenTelemetry.Resources.IResourceDetector.Detect() -> OpenTelemetry.Resources.Resource
+OpenTelemetry.Resources.Resource.Resource(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) -> void
+OpenTelemetry.Resources.ResourceBuilder.AddDetector(OpenTelemetry.Resources.IResourceDetector resourceDetector) -> OpenTelemetry.Resources.ResourceBuilder
 OpenTelemetry.Trace.BatchExportActivityProcessorOptions
 OpenTelemetry.Trace.BatchExportActivityProcessorOptions.BatchExportActivityProcessorOptions() -> void
 override OpenTelemetry.BaseExportProcessor<T>.OnForceFlush(int timeoutMilliseconds) -> bool

src/OpenTelemetry/CHANGELOG.md

@@ -2,9 +2,9 @@
 
 ## Unreleased
 
-* Make `IResourceDetector` public to allow custom implementations of resource
-  detectors.
-  ([2897](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2897))
+* Added support for implementing custom `ResourceDetector`.
+  ([#2949](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2949/)
+  [#2897](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2897))
 
 * Perf improvement for Histogram and HistogramSumCount by implementing lock-free
   updates.
@@ -16,18 +16,18 @@
 Released 2022-Feb-02
 
 * Make `MetricPoint` of `MetricPointAccessor` readonly.
-  ([2736](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2736))
+  ([#2736](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2736))
 
 * Fail-fast when using AddView with guaranteed conflict.
-  ([2751](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2751))
+  ([#2751](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2751))
 
 * Swallow `ObjectDisposedException` from the `BatchExportProcessor` worker
   thread.
-  ([2844](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2844))
+  ([#2844](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2844))
 
 * Performance improvement: when emitting metrics, users are strongly advised to
   provide tags with same Key order, to achieve maximum performance.
-  ([2805](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2805/files))
+  ([#2805](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2805/files))
 
 ## 1.2.0-rc1
 

src/OpenTelemetry/Resources/Resource.cs

@@ -35,7 +35,7 @@ public class Resource
         /// Initializes a new instance of the <see cref="Resource"/> class.
         /// </summary>
         /// <param name="attributes">An <see cref="IEnumerable{T}"/> of attributes that describe the resource.</param>
-        internal Resource(IEnumerable<KeyValuePair<string, object>> attributes)
+        public Resource(IEnumerable<KeyValuePair<string, object>> attributes)
         {
             if (attributes == null)
             {

src/OpenTelemetry/Resources/ResourceBuilder.cs

@@ -86,9 +86,7 @@ public Resource Build()
             return finalResource;
         }
 
-        // Internal until spec is finalized.
-        // https://github.com/open-telemetry/oteps/blob/master/text/0111-auto-resource-detection.md
-        internal ResourceBuilder AddDetector(IResourceDetector resourceDetector)
+        public ResourceBuilder AddDetector(IResourceDetector resourceDetector)
         {
             Guard.ThrowIfNull(resourceDetector);