Merge branch 'main' into yunl/aotTypeDescriptor

.vscode/settings.json

@@ -54,7 +54,6 @@
  "utkarsh",
  "vishwesh",
  "xunit",
- "zipkin",
- "zpages"
+ "zipkin"
  ]
 }

OpenTelemetry.sln

@@ -72,8 +72,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Ho
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.OpenTelemetryProtocol", "src\OpenTelemetry.Exporter.OpenTelemetryProtocol\OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj", "{A38AC295-2745-4B85-8B6B-DCA864CEDD5B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.ZPages", "src\OpenTelemetry.Exporter.ZPages\OpenTelemetry.Exporter.ZPages.csproj", "{56A34828-621A-478B-A0B8-C065FE938383}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Console", "src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj", "{1AFFF251-3B0C-47CA-BE94-937083732C0A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Zipkin.Tests", "test\OpenTelemetry.Exporter.Zipkin.Tests\OpenTelemetry.Exporter.Zipkin.Tests.csproj", "{1D778D2E-9523-450E-A6E0-A36897C7E78E}"
@@ -125,8 +123,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D2E73927-5
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Grpc.Tests", "test\OpenTelemetry.Instrumentation.Grpc.Tests\OpenTelemetry.Instrumentation.Grpc.Tests.csproj", "{305E9DFD-E73B-4A28-8769-795C25551020}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.ZPages.Tests", "test\OpenTelemetry.Exporter.ZPages.Tests\OpenTelemetry.Exporter.ZPages.Tests.csproj", "{98F9556B-116F-49B5-9211-BB1D418446FF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Console", "examples\Console\Examples.Console.csproj", "{FF3E6E08-E8E4-4523-B526-847CD989279F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.AspNetCore", "examples\AspNetCore\Examples.AspNetCore.csproj", "{0935622B-9377-4056-8343-AE6ECDC274CF}"

README.md

@@ -123,13 +123,13 @@ If you have trouble accessing the doc, please get in touch on
 ([@open-telemetry/dotnet-maintainers](https:/orgs/open-telemetry/teams/dotnet-maintainers)):
 
 * [Alan West](https:/alanwest), New Relic
-* [Cijo Thomas](https:/cijothomas), Microsoft
 * [Mikel Blanchard](https:/CodeBlanch), Microsoft
 * [Utkarsh Umesan Pillai](https:/utpilla), Microsoft
 
 [Approvers](https:/open-telemetry/community/blob/main/community-membership.md#approver)
 ([@open-telemetry/dotnet-approvers](https:/orgs/open-telemetry/teams/dotnet-approvers)):
 
+* [Cijo Thomas](https:/cijothomas), Microsoft
 * [Reiley Yang](https:/reyang), Microsoft
 * [Robert Pająk](https:/pellared), Splunk
 * [Vishwesh Bankwar](https:/vishweshbankwar), Microsoft

build/Common.prod.props

@@ -7,9 +7,9 @@
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
 
- <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Condition=" $(OS) == 'Windows_NT'">
+ <!-- <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Condition=" $(OS) == 'Windows_NT'">
  <PrivateAssets>All</PrivateAssets>
- </PackageReference>
+ </PackageReference> -->
  </ItemGroup>
 
  <PropertyGroup>

examples/Console/Examples.Console.csproj

@@ -30,12 +30,11 @@
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Http\OpenTelemetry.Instrumentation.Http.csproj" />
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.OpenTelemetryProtocol\OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj" />
- <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.ZPages\OpenTelemetry.Exporter.ZPages.csproj" />
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Shims.OpenTracing\OpenTelemetry.Shims.OpenTracing.csproj" />
- <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Zipkin\OpenTelemetry.Exporter.Zipkin.csproj" />
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Jaeger\OpenTelemetry.Exporter.Jaeger.csproj" />
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.InMemory\OpenTelemetry.Exporter.InMemory.csproj" />
  <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Prometheus.HttpListener\OpenTelemetry.Exporter.Prometheus.HttpListener.csproj" />
+ <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
  </ItemGroup>
 </Project>

examples/Console/Program.cs

@@ -33,7 +33,6 @@ public class Program
  /// dotnet run --project Examples.Console.csproj -- jaeger -h localhost -p 6831
  /// dotnet run --project Examples.Console.csproj -- prometheus -p 9464
  /// dotnet run --project Examples.Console.csproj -- otlp -e "http://localhost:4317" -p "grpc"
- /// dotnet run --project Examples.Console.csproj -- zpages
  /// dotnet run --project Examples.Console.csproj -- metrics --help
  ///
  /// To see all available examples in the project run:
@@ -46,7 +45,7 @@ public class Program
  /// <param name="args">Arguments from command line.</param>
  public static void Main(string[] args)
  {
- Parser.Default.ParseArguments<JaegerOptions, ZipkinOptions, PrometheusOptions, MetricsOptions, LogsOptions, GrpcNetClientOptions, HttpClientOptions, ZPagesOptions, ConsoleOptions, OpenTelemetryShimOptions, OpenTracingShimOptions, OtlpOptions, InMemoryOptions>(args)
+ Parser.Default.ParseArguments<JaegerOptions, ZipkinOptions, PrometheusOptions, MetricsOptions, LogsOptions, GrpcNetClientOptions, HttpClientOptions, ConsoleOptions, OpenTelemetryShimOptions, OpenTracingShimOptions, OtlpOptions, InMemoryOptions>(args)
  .MapResult(
  (JaegerOptions options) => TestJaegerExporter.Run(options.Host, options.Port),
  (ZipkinOptions options) => TestZipkinExporter.Run(options.Uri),
@@ -55,7 +54,6 @@ public static void Main(string[] args)
  (LogsOptions options) => TestLogs.Run(options),
  (GrpcNetClientOptions options) => TestGrpcNetClient.Run(),
  (HttpClientOptions options) => TestHttpClient.Run(),
- (ZPagesOptions options) => TestZPagesExporter.Run(),
  (ConsoleOptions options) => TestConsoleExporter.Run(options),
  (OpenTelemetryShimOptions options) => TestOTelShimWithConsoleExporter.Run(options),
  (OpenTracingShimOptions options) => TestOpenTracingShim.Run(options),
@@ -129,11 +127,6 @@ internal class HttpClientOptions
  {
  }
 
- [Verb("zpages", HelpText = "Specify the options required to test ZPages")]
- internal class ZPagesOptions
- {
- }
-
  [Verb("console", HelpText = "Specify the options required to test console exporter")]
  internal class ConsoleOptions
  {

src/OpenTelemetry.Api.ProviderBuilderExtensions/OpenTelemetry.Api.ProviderBuilderExtensions.csproj

@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
- <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+ <TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
  <Description>Contains extensions to register OpenTelemetry in applications using Microsoft.Extensions.DependencyInjection</Description>
  <RootNamespace>OpenTelemetry</RootNamespace>
  <MinVerTagPrefix>core-</MinVerTagPrefix>

src/OpenTelemetry.Api/Internal/SemanticConventions.cs

@@ -110,5 +110,17 @@ internal static class SemanticConventions
  public const string AttributeExceptionType = "exception.type";
  public const string AttributeExceptionMessage = "exception.message";
  public const string AttributeExceptionStacktrace = "exception.stacktrace";
+
+ // Http v1.21.0 https:/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md
+ public const string AttributeClientSocketPort = "client.socket.port"; // replaces: "net.peer.port" (AttributeNetPeerPort)
+ public const string AttributeHttpRequestMethod = "http.request.method"; // replaces: "http.method" (AttributeHttpMethod)
+ public const string AttributeHttpResponseStatusCode = "http.response.status_code"; // replaces: "http.status_code" (AttributeHttpStatusCode)
+ public const string AttributeNetworkProtocolVersion = "network.protocol.version"; // replaces: "http.flavor" (AttributeHttpFlavor)
+ public const string AttributeServerAddress = "server.address"; // replaces: "net.host.name" (AttributeNetHostName)
+ public const string AttributeServerPort = "server.port"; // replaces: "net.host.port" (AttributeNetHostPort)
+ public const string AttributeUrlPath = "url.path"; // replaces: "http.target" (AttributeHttpTarget)
+ public const string AttributeUrlScheme = "url.scheme"; // replaces: "http.scheme" (AttributeHttpScheme)
+ public const string AttributeUrlQuery = "url.query";
+ public const string AttributeUserAgentOriginal = "user_agent.original"; // replaces: "http.user_agent" (AttributeHttpUserAgent)
  }
 }

src/OpenTelemetry.Api/OpenTelemetry.Api.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
- <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+ <TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
  <Description>OpenTelemetry .NET API</Description>
  <RootNamespace>OpenTelemetry</RootNamespace>