Merge branch 'main' into ecs_detector

open-telemetry · Jan 9, 2023 · d4334f4 · d4334f4
2 parents 3a47560 + 70f9f0f
commit d4334f4
Show file tree

Hide file tree

Showing 55 changed files with 459 additions and 253 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -90,7 +90,7 @@ components:
   test/OpenTelemetry.Extensions.Tests/:
     - codeblanch
   test/OpenTelemetry.Extensions.Docker.Tests/:
-    - swetharavichandrancisco
+    - iskiselev
   test/OpenTelemetry.Extensions.PersistentStorage.Tests/:
     - vishweshbankwar
   test/OpenTelemetry.Instrumentation.AWSLambda.Tests/:

diff --git a/.github/workflows/dotnet-core-cov.yml b/.github/workflows/dotnet-core-cov.yml
@@ -18,13 +18,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-    env:
-      OS: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0 # fetching all
 
-    - uses: actions/[email protected]
+    - name: Setup .NET 7.0
+      uses: actions/[email protected]
       with:
         dotnet-version: '7.0.x'
 

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -10,7 +10,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         with:
           stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 7 days.'
           close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'

diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props
@@ -20,11 +20,11 @@
       Please sort alphabetically.
       Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax.
     -->
-    <BenchmarkDotNetPkgVer>[0.13.2,0.14)</BenchmarkDotNetPkgVer>
-    <CoverletCollectorPkgVer>[3.1.2,4.0.0)</CoverletCollectorPkgVer>
+    <BenchmarkDotNetPkgVer>[0.13.3,0.14)</BenchmarkDotNetPkgVer>
+    <CoverletCollectorPkgVer>[3.2.0,4.0.0)</CoverletCollectorPkgVer>
     <DotNetXUnitCliVer>[2.3.1,3.0)</DotNetXUnitCliVer>
     <MicrosoftExtensionsLoggingPkgVer>[5.0.0,7.0)</MicrosoftExtensionsLoggingPkgVer>
-    <MicrosoftNETTestSdkPkgVer>[16.11.0,17.0)</MicrosoftNETTestSdkPkgVer>
+    <MicrosoftNETTestSdkPkgVer>[17.3.2,18.0)</MicrosoftNETTestSdkPkgVer>
     <MoqPkgVer>[4.18.3,5.0)</MoqPkgVer>
     <MoqNet45PkgVer>[4.17.2,5.0)</MoqNet45PkgVer>
     <OpenTelemetryExporterInMemoryPkgVer>$(OpenTelemetryCoreLatestVersion)</OpenTelemetryExporterInMemoryPkgVer>

diff --git a/build/process-codecoverage.ps1 b/build/process-codecoverage.ps1
@@ -1,8 +1,12 @@
-$files = Get-ChildItem "TestResults" -Filter "*.coverage" -Recurse
+[xml]$commonProps = Get-Content -Path $PSScriptRoot\Common.props
+$microsoftCodeCoveragePkgVer = [string]$commonProps.Project.PropertyGroup.MicrosoftCodeCoveragePkgVer # This is collected in the format: "[16.10.0]"
+$microsoftCodeCoveragePkgVer = $microsoftCodeCoveragePkgVer.Trim();
+$microsoftCodeCoveragePkgVer = $microsoftCodeCoveragePkgVer.SubString(1, $microsoftCodeCoveragePkgVer.Length - 2) # Removing square brackets
+$files = Get-ChildItem "TestResults" -Filter "*.coverage" -Recurse
 Write-Host $env:USERPROFILE
 foreach ($file in $files)
 {
-    $command = $env:USERPROFILE+ '\.nuget\packages\microsoft.codecoverage\16.11.0\build\netstandard1.0\CodeCoverage\CodeCoverage.exe analyze /output:' + $file.DirectoryName + '\' + $file.Name + '.xml '+ $file.FullName
+    $command = $env:USERPROFILE+ '\.nuget\packages\microsoft.codecoverage\' + $microsoftCodeCoveragePkgVer + '\build\netstandard1.0\CodeCoverage\CodeCoverage.exe analyze /output:' + $file.DirectoryName + '\' + $file.Name + '.xml '+ $file.FullName
     Write-Host $command
     Invoke-Expression $command
 }
diff --git a/examples/AspNet/Examples.AspNet.csproj b/examples/AspNet/Examples.AspNet.csproj
@@ -76,9 +76,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="[5.2.7,6.0)" />
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="[5.2.7,6.0)" />
-    <PackageReference Include="Microsoft.AspNet.WebPages" Version="[3.2.7,4.0)" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="[5.2.9,6.0)" />
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="[5.2.9,6.0)" />
+    <PackageReference Include="Microsoft.AspNet.WebPages" Version="[3.2.9,4.0)" />
     <PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.4" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="$(OpenTelemetryCoreLatestVersion)" />

diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.0.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc2" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc2" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="$(OpenTelemetryCoreLatestVersion)" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.4" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.4" />
 
     <PackageReference Include="Grpc.Tools" Version="1.17.0" />
     <PackageReference Include="Grpc" Version="[2.32.0,3.0)" />

diff --git a/examples/owin/Examples.Owin.csproj b/examples/owin/Examples.Owin.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.7" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.0.1" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.9" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="$(OpenTelemetryCoreLatestVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/wcf/README.md b/examples/wcf/README.md
@@ -2,10 +2,10 @@
 
 Project structure:
 
-* Examples.Wcf.Client.Core
+* Examples.Wcf.Client.DotNet
 
   An example of how to call a WCF service with OpenTelemetry instrumentation on
-  .NET Core.
+  .NET.
 
 * Examples.Wcf.Client.NetFramework
 

diff --git a/...ient-core/Examples.Wcf.Client.Core.csproj → ...nt-core/Examples.Wcf.Client.DotNet.csproj b/...ient-core/Examples.Wcf.Client.Core.csproj → ...nt-core/Examples.Wcf.Client.DotNet.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.9" />
-    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryCoreLatestVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/wcf/client-netframework/Examples.Wcf.Client.NetFramework.csproj b/examples/wcf/client-netframework/Examples.Wcf.Client.NetFramework.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net462</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryCoreLatestVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/wcf/server-netframework/Examples.Wcf.Server.NetFramework.csproj b/examples/wcf/server-netframework/Examples.Wcf.Server.NetFramework.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net462</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryCoreLatestVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/opentelemetry-dotnet-contrib.sln b/opentelemetry-dotnet-contrib.sln
@@ -19,7 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1A06E14B-DD2F-4536-9D2E-F708C0C43555}"
 	ProjectSection(SolutionItems) = preProject
-		.github\codecov.yml = .github\codecov.yml
 		CODEOWNERS = CODEOWNERS
 		.github\component_owners.yml = .github\component_owners.yml
 	EndProjectSection
@@ -106,7 +105,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wcf", "wcf", "{73474960-8F9
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Wcf.Shared", "examples\wcf\shared\Examples.Wcf.Shared.csproj", "{21716C26-3B2A-4208-BDFB-8E58E2AF49EA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Wcf.Client.Core", "examples\wcf\client-core\Examples.Wcf.Client.Core.csproj", "{3AF5D7E4-CA7D-401B-9729-A6D8F63B023C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Wcf.Client.DotNet", "examples\wcf\client-core\Examples.Wcf.Client.DotNet.csproj", "{3AF5D7E4-CA7D-401B-9729-A6D8F63B023C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Wcf.Client.NetFramework", "examples\wcf\client-netframework\Examples.Wcf.Client.NetFramework.csproj", "{2A7867E5-0FD6-42F8-B594-19E897EDA54C}"
 EndProject

diff --git a/src/OpenTelemetry.Exporter.Geneva/Metrics/GenevaMetricExporter.cs b/src/OpenTelemetry.Exporter.Geneva/Metrics/GenevaMetricExporter.cs
@@ -33,6 +33,8 @@ public class GenevaMetricExporter : BaseExporter<Metric>
 
     internal const int MaxDimensionValueSize = 1024;
 
+    private static readonly MetricData ulongZero = new MetricData { UInt64Value = 0 };
+
     private readonly ushort prepopulatedDimensionsCount;
 
     private readonly int fixedPayloadStartIndex;
@@ -55,8 +57,6 @@ public class GenevaMetricExporter : BaseExporter<Metric>
 
     private readonly int bufferIndexForHistogramMetrics;
 
-    private static readonly MetricData ulongZero = new MetricData { UInt64Value = 0 };
-
     private bool isDisposed;
 
     public GenevaMetricExporter(GenevaMetricExporterOptions options)

diff --git a/src/OpenTelemetry.Exporter.Geneva/MsgPackExporter/MsgPackTraceExporter.cs b/src/OpenTelemetry.Exporter.Geneva/MsgPackExporter/MsgPackTraceExporter.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Threading;
 
@@ -286,7 +287,7 @@ internal int SerializeActivity(Activity activity)
             }
             else if (string.Equals(entry.Key, "otel.status_code", StringComparison.Ordinal))
             {
-                if (string.Equals(entry.Value.ToString(), "ERROR", StringComparison.Ordinal))
+                if (string.Equals(Convert.ToString(entry.Value, CultureInfo.InvariantCulture), "ERROR", StringComparison.Ordinal))
                 {
                     isStatusSuccess = false;
                 }
@@ -295,7 +296,7 @@ internal int SerializeActivity(Activity activity)
             }
             else if (string.Equals(entry.Key, "otel.status_description", StringComparison.Ordinal))
             {
-                statusDescription = entry.Value.ToString();
+                statusDescription = Convert.ToString(entry.Value, CultureInfo.InvariantCulture);
                 continue;
             }
             else if (this.m_customFields == null || this.m_customFields.ContainsKey(entry.Key))
@@ -400,6 +401,23 @@ public void Dispose()
 
     private const int BUFFER_SIZE = 65360; // the maximum ETW payload (inclusive)
 
+    private static readonly string INVALID_SPAN_ID = default(ActivitySpanId).ToHexString();
+
+    private static readonly IReadOnlyDictionary<string, string> CS40_PART_B_MAPPING = new Dictionary<string, string>
+    {
+        ["db.system"] = "dbSystem",
+        ["db.name"] = "dbName",
+        ["db.statement"] = "dbStatement",
+
+        ["http.method"] = "httpMethod",
+        ["http.url"] = "httpUrl",
+        ["http.status_code"] = "httpStatusCode",
+
+        ["messaging.system"] = "messagingSystem",
+        ["messaging.destination"] = "messagingDestination",
+        ["messaging.url"] = "messagingUrl",
+    };
+
     private readonly ThreadLocal<byte[]> m_buffer = new(() => null);
 
     private readonly byte[] m_bufferPrologue;
@@ -418,22 +436,5 @@ public void Dispose()
 
     private readonly IReadOnlyDictionary<string, object> m_dedicatedFields;
 
-    private static readonly string INVALID_SPAN_ID = default(ActivitySpanId).ToHexString();
-
-    private static readonly IReadOnlyDictionary<string, string> CS40_PART_B_MAPPING = new Dictionary<string, string>
-    {
-        ["db.system"] = "dbSystem",
-        ["db.name"] = "dbName",
-        ["db.statement"] = "dbStatement",
-
-        ["http.method"] = "httpMethod",
-        ["http.url"] = "httpUrl",
-        ["http.status_code"] = "httpStatusCode",
-
-        ["messaging.system"] = "messagingSystem",
-        ["messaging.destination"] = "messagingDestination",
-        ["messaging.url"] = "messagingUrl",
-    };
-
     private bool isDisposed;
 }
diff --git a/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj b/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>An OpenTelemetry .NET exporter that exports to local ETW or UDS</Description>
     <Authors>OpenTelemetry Authors</Authors>
-    <NoWarn>$(NoWarn),NU5104,CS1591,SA1123,SA1310,CA1031,CA1810,CA1822,CA2000,CA2208,SA1204,SA1201,SA1202,SA1308,SA1309,SA1311,SA1402,SA1602,SA1649</NoWarn>
+    <NoWarn>$(NoWarn),CS1591,SA1123,SA1310,CA1810,CA1822,CA2000,CA2208,SA1201,SA1202,SA1308,SA1309,SA1311,SA1402,SA1602,SA1649</NoWarn>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
     <MinVerTagPrefix>Exporter.Geneva-</MinVerTagPrefix>

diff --git a/src/OpenTelemetry.Exporter.Stackdriver/Implementation/ActivityExtensions.cs b/src/OpenTelemetry.Exporter.Stackdriver/Implementation/ActivityExtensions.cs
@@ -83,9 +83,9 @@ public static Span ToSpan(this Activity activity, string projectId)
             {
                 AttributeMap =
                 {
-                    activity.Tags?.ToDictionary(
+                    activity.Tags.ToDictionary(
                         s => s.Key,
-                        s => s.Value?.ToAttributeValue()),
+                        s => s.Value.ToAttributeValue()),
                 },
             };
         }

diff --git a/src/OpenTelemetry.Extensions.AzureMonitor/ApplicationInsightsSampler.cs b/src/OpenTelemetry.Extensions.AzureMonitor/ApplicationInsightsSampler.cs
@@ -71,7 +71,7 @@ public override SamplingResult ShouldSample(in SamplingParameters samplingParame
             return this.recordAndSampleSamplingResult;
         }
 
-        double sampleScore = DJB2SampleScore(samplingParameters.TraceId.ToHexString().ToLowerInvariant());
+        double sampleScore = DJB2SampleScore(samplingParameters.TraceId.ToHexString().ToUpperInvariant());
 
         if (sampleScore < this.samplingRatio)
         {
@@ -90,7 +90,10 @@ private static double DJB2SampleScore(string traceIdHex)
 
         for (int i = 0; i < traceIdHex.Length; i++)
         {
-            hash = ((hash << 5) + hash) + (int)traceIdHex[i];
+            unchecked
+            {
+                hash = (hash << 5) + hash + (int)traceIdHex[i];
+            }
         }
 
         // Take the absolute value of the hash

diff --git a/src/OpenTelemetry.Extensions.AzureMonitor/OpenTelemetry.Extensions.AzureMonitor.csproj b/src/OpenTelemetry.Extensions.AzureMonitor/OpenTelemetry.Extensions.AzureMonitor.csproj
@@ -5,6 +5,7 @@
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)' == 'Debug'">$(TargetFrameworks);net6.0</TargetFrameworks> <!-- Added just to get proper nullable analysis in IDE -->
     <MinVerTagPrefix>Extensions.AzureMonitor-</MinVerTagPrefix>
+    <EnableAnalysis>true</EnableAnalysis>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/OpenTelemetry.Extensions.PersistentStorage.Abstractions/NotNullWhenAttribute.cs b/src/OpenTelemetry.Extensions.PersistentStorage.Abstractions/NotNullWhenAttribute.cs
diff --git a/...istentStorage.Abstractions/OpenTelemetry.Extensions.PersistentStorage.Abstractions.csproj b/...istentStorage.Abstractions/OpenTelemetry.Extensions.PersistentStorage.Abstractions.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -15,4 +15,8 @@
     <EnableAnalysis>true</EnableAnalysis>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry.Internal\NullableAttributes.cs" Link="Includes\NullableAttributes.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/...nTelemetry.Extensions.PersistentStorage/OpenTelemetry.Extensions.PersistentStorage.csproj b/...nTelemetry.Extensions.PersistentStorage/OpenTelemetry.Extensions.PersistentStorage.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Internal\Guard.cs" Link="Includes\Guard.cs" />
-    <Compile Include="$(RepoRoot)\src\OpenTelemetry.Extensions.PersistentStorage.Abstractions\NotNullWhenAttribute.cs" Link="Includes\NotNullWhenAttribute.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry.Internal\NullableAttributes.cs" Link="Includes\NullableAttributes.cs" />
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.PersistentStorage.Abstractions\OpenTelemetry.Extensions.PersistentStorage.Abstractions.csproj" />
   </ItemGroup>