Merge branch 'main' into otlp-persist

.github/workflows/linux-ci-md.yml → .github/workflows/ci-md.yml

@@ -5,7 +5,7 @@
 
 # IMPORTANT: This workflow MUST use the same 'name' as the non -md workflow.
 
-name: Linux
+name: Build
 
 on:
   pull_request:
@@ -15,11 +15,14 @@ on:
 
 jobs:
   build-test:
-    runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        version: [net6.0]
+        os: [ windows-latest, ubuntu-latest ]
+        version: [ net462, net6.0, net7.0 ]
+        exclude:
+        - os: ubuntu-latest
+          version: net462
 
+    runs-on: ubuntu-latest
     steps:
-      - run: 'echo "No build required"'
+    - run: 'echo "No build required"'

.github/workflows/windows-ci.yml → .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Windows
+name: Build
 
 on:
   push:
@@ -12,12 +12,16 @@ on:
 
 jobs:
   build-test:
-    runs-on: windows-latest
-
     strategy:
+      fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
-        version: [net462,net6.0,net7.0]
+        os: [ windows-latest, ubuntu-latest ]
+        version: [ net462, net6.0, net7.0 ]
+        exclude:
+        - os: ubuntu-latest
+          version: net462
 
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
       with:
@@ -34,4 +38,4 @@ jobs:
       run: dotnet build --configuration Release --no-restore
 
     - name: Test ${{ matrix.version }}
-      run: dotnet test **\bin\**\${{ matrix.version }}\*Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed"
+      run: dotnet test **/bin/**/${{ matrix.version }}/*Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed"

.vscode/settings.json

@@ -2,6 +2,7 @@
   "cSpell.words": [
     "appsettings",
     "asax",
+    "bankwar",
     "cijo",
     "cncf",
     "codebases",
@@ -50,6 +51,7 @@
     "unencrypted",
     "unvalidated",
     "utkarsh",
+    "vishwesh",
     "xunit",
     "zipkin",
     "zpages"

CONTRIBUTING.md

@@ -59,7 +59,7 @@ of Windows.
 * Visual Studio 2022+ or Visual Studio Code
 * .NET Framework 4.6.2+
 
-**NOTE** : Visual Studio 2022 preview is **recommended** due to projects
+**Note:** : Visual Studio 2022 preview is **recommended** due to projects
 targeting `.net7.0` which is in preview currently.
 
 ### Public API

OpenTelemetry.sln

@@ -93,19 +93,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\apicompatibility.yml = .github\workflows\apicompatibility.yml
 		.github\workflows\code-coverage.yml = .github\workflows\code-coverage.yml
+		.github\workflows\ci.yml = .github\workflows\ci.yml
+		.github\workflows\ci-md.yml = .github\workflows\ci-md.yml
 		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
 		.github\workflows\docfx.yml = .github\workflows\docfx.yml
 		.github\workflows\dotnet-format-md.yml = .github\workflows\dotnet-format-md.yml
 		.github\workflows\dotnet-format.yml = .github\workflows\dotnet-format.yml
 		.github\workflows\integration-md.yml = .github\workflows\integration-md.yml
 		.github\workflows\integration.yml = .github\workflows\integration.yml
-		.github\workflows\linux-ci-md.yml = .github\workflows\linux-ci-md.yml
-		.github\workflows\linux-ci.yml = .github\workflows\linux-ci.yml
 		.github\workflows\markdownlint.yml = .github\workflows\markdownlint.yml
 		.github\workflows\publish-packages-1.0.yml = .github\workflows\publish-packages-1.0.yml
 		.github\workflows\sanitycheck.yml = .github\workflows\sanitycheck.yml
-		.github\workflows\windows-ci-md.yml = .github\workflows\windows-ci-md.yml
-		.github\workflows\windows-ci.yml = .github\workflows\windows-ci.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C1542297-8763-4DF4-957C-489ED771C21D}"

README.md

@@ -31,6 +31,11 @@ files.
  Logs](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#otlp-logs)
  is still non-stable.
 
+See [Spec Compliance
+Matrix](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md)
+to understand which portions of the specification has been implemented in this
+repo.
+
 ## Getting Started
 
 If you are new here, please read the getting started docs:
@@ -70,8 +75,10 @@ libraries](https://github.com/open-telemetry/opentelemetry-specification/blob/ma
 * [Prometheus AspNetCore](./src/OpenTelemetry.Exporter.Prometheus.AspNetCore/README.md)
 * [Zipkin](./src/OpenTelemetry.Exporter.Zipkin/README.md)
 
-See the [OpenTelemetry registry](https://opentelemetry.io/registry/?s=net) for
-more exporters.
+See the [OpenTelemetry registry](https://opentelemetry.io/registry/?s=net) and
+[OpenTelemetry .NET Contrib
+repo](https://github.com/open-telemetry/opentelemetry-dotnet-contrib) for more
+components.
 
 ## Extensibility
 

build/Common.props

@@ -43,7 +43,7 @@
     <SerilogPkgVer>[2.8.0,3.0)</SerilogPkgVer>
     <StyleCopAnalyzersPkgVer>[1.2.0-beta.435,2.0)</StyleCopAnalyzersPkgVer>
     <SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>
-    <SystemDiagnosticSourcePkgVer>7.0.0-rc.2.22472.3</SystemDiagnosticSourcePkgVer>
+    <SystemDiagnosticSourcePkgVer>7.0.0</SystemDiagnosticSourcePkgVer>
     <SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>
     <SystemTextJsonPkgVer>4.7.2</SystemTextJsonPkgVer>
     <SystemThreadingTasksExtensionsPkgVer>4.5.4</SystemThreadingTasksExtensionsPkgVer>

docs/metrics/customizing-the-sdk/README.md

@@ -251,7 +251,7 @@ default boundaries. This requires the use of
         new ExplicitBucketHistogramConfiguration { Boundaries = new double[] { 10, 20 } })
 
     // If you provide an empty `double` array as `Boundaries` to the `ExplicitBucketHistogramConfiguration`,
-    // the SDK will only export the sum and count for the measurements.
+    // the SDK will only export the sum, count, min and max for the measurements.
     // There are no buckets exported in this case.
     .AddView(
         instrumentName: "MyHistogram",
@@ -276,7 +276,7 @@ default boundaries. This requires the use of
     })
 ```
 
-**NOTE:** The SDK currently does not support any changes to `Aggregation` type
+**Note:** The SDK currently does not support any changes to `Aggregation` type
 by using Views.
 
 See [Program.cs](./Program.cs) for a complete example.
@@ -329,9 +329,9 @@ ignored. The SDK chooses the key/value combinations in the order in which they
 are emitted. `SetMaxMetricPointsPerMetricStream` can be used to override the
 default.
 
-**NOTE**: One `MetricPoint` is reserved for every `MetricStream` for the special
-case where there is no key/value pair associated with the metric. The maximum
-number of `MetricPoint`s has to accommodate for this special case.
+**Note:**: One `MetricPoint` is reserved for every `MetricStream` for the
+special case where there is no key/value pair associated with the metric. The
+maximum number of `MetricPoint`s has to accommodate for this special case.
 
 Consider the below example. Here we set the maximum number of `MetricPoint`s
 allowed to be `3`. This means that for every `MetricStream`, the SDK will export
@@ -395,7 +395,7 @@ AnotherFruitCounter.Add(5, new("name", "banana"), new("color", "yellow")); // Ex
 AnotherFruitCounter.Add(4, new("name", "mango"), new("color", "yellow")); // Not exported
 ```
 
-**NOTE:** The above limit is *per* metric stream, and applies to all the metric
+**Note:** The above limit is *per* metric stream, and applies to all the metric
 streams. There is no ability to apply different limits for each instrument at
 this moment.
 

docs/metrics/getting-started-prometheus-grafana/README.md

@@ -172,18 +172,19 @@ Follow the instructions in the Grafana getting started
 [doc](https://grafana.com/docs/grafana/latest/getting-started/getting-started/#step-2-log-in)
 to log in.
 
-After successfully logging in, click on the Configuration icon
-on the panel at the left hand side, and click on Prometheus.
-Type in the default endpoint of Prometheus as suggested by the UI
-as the value for the URI.
+After successfully logging in, hover on the Configuration icon
+on the panel at the left hand side, and click on Plugins.
+Find and click on the Prometheus plugin. Next click on
+`Create a Prometheus data source` button. Type in the default endpoint of
+Prometheus as suggested by the UI as the value for the URI.
 
 ```console
 http://localhost:9090
 ```
 
-Then, click on the Explore icon on the left panel of
-the website - we should be able to write some queries to explore our metrics
-now!
+At the bottom of the page click `Save & test` to ensure the data source is
+working. Then, click on the `Explore` button - we should be able to write
+some queries to explore our metrics now!
 
 Feel free to find some handy PromQL
 [here](https://promlabs.com/promql-cheat-sheet/).