Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump OTel to 1.4.0 #1038

Merged
merged 19 commits into from
Feb 27, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build/Common.props
Original file line number Diff line number Diff line change
@@ -31,11 +31,12 @@
<MicrosoftOwinPkgVer>[4.2.2,5.0)</MicrosoftOwinPkgVer>
<MicrosoftPublicApiAnalyzersPkgVer>[3.3.3]</MicrosoftPublicApiAnalyzersPkgVer>
<MicrosoftSourceLinkGitHubPkgVer>[1.1.1,2.0)</MicrosoftSourceLinkGitHubPkgVer>
<OpenTelemetryCoreLatestVersion>[1.3.2,2.0)</OpenTelemetryCoreLatestVersion>
<OpenTelemetryCoreLatestPrereleaseVersion>[1.4.0-rc.4,2.0)</OpenTelemetryCoreLatestPrereleaseVersion>
<OpenTelemetryCoreLatestVersion>[1.4.0,2.0)</OpenTelemetryCoreLatestVersion>
<OpenTelemetryCoreLatestPrereleaseVersion>[1.4.0,2.0)</OpenTelemetryCoreLatestPrereleaseVersion>
<StackExchangeRedisPkgVer>[2.1.58,3.0)</StackExchangeRedisPkgVer>
<StyleCopAnalyzersPkgVer>[1.2.0-beta.435,2.0)</StyleCopAnalyzersPkgVer>
<SystemNetHttp>[4.3.4,)</SystemNetHttp>
<SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>
<SystemTextJsonPkgVer>[6.0.0,)</SystemTextJsonPkgVer>
</PropertyGroup>

2 changes: 1 addition & 1 deletion examples/AspNet/Examples.AspNet.csproj
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@
<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.Instrumentation.Http" Version="1.0.0-rc9.14" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="$(OpenTelemetryCoreLatestVersion)" />
8 changes: 3 additions & 5 deletions examples/AspNet/Web.config
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
</appSettings>
<system.web>
<compilation debug="true" targetFramework="4.8"/>
<httpRuntime targetFramework="4.8"
maxRequestLength="2147483647"
executionTimeout="300" />
<httpRuntime targetFramework="4.8" maxRequestLength="2147483647" executionTimeout="300"/>
</system.web>
<system.webServer>
<handlers>
@@ -31,7 +29,7 @@
</modules>
<security>
<requestFiltering>
<requestLimits maxAllowedContentLength="4294967295" />
<requestLimits maxAllowedContentLength="4294967295"/>
</requestFiltering>
</security>
</system.webServer>
@@ -51,7 +49,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@

<ItemGroup>
<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="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />

<PackageReference Include="Grpc.Tools" Version="1.17.0" />
<PackageReference Include="Grpc" Version="[2.32.0,3.0)" />
4 changes: 2 additions & 2 deletions examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs
Original file line number Diff line number Diff line change
@@ -43,8 +43,8 @@ public void ConfigureServices(IServiceCollection services)
services.AddControllers();

// Wire in otel
services.AddOpenTelemetryTracing(
(builder) => builder
services.AddOpenTelemetry().WithTracing(
builder => builder
.AddAspNetCoreInstrumentation()
.AddGrpcCoreInstrumentation()
.AddConsoleExporter());
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.4.0-beta.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.4.0-rc.4" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Process\OpenTelemetry.Instrumentation.Process.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.4.0-beta.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.4.0-rc.4" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Runtime\OpenTelemetry.Instrumentation.Runtime.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0" />
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPkgVer)" />
</ItemGroup>

3 changes: 3 additions & 0 deletions src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@

## Unreleased

* Update OpenTelemetry to 1.4.0
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.4.0-rc.4

Released 2023-Feb-13
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestPrereleaseVersion)" />
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
</ItemGroup>

<ItemGroup>
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="OpenTelemetry" Version="1.3.2" />
Kielek marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@

## Unreleased

* Update OpenTelemetry to 1.4.0
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

* Tenant token is no longer exposed on `OneCollectorExporterOptions` and will be
set automatically from the instrumentation key. Added new registration
overloads and a builder to help with configuration.
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestPrereleaseVersion)" />
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" Condition="'$(TargetFramework)' != 'net7.0' AND '$(TargetFramework)' != 'net6.0'" />
</ItemGroup>

4 changes: 2 additions & 2 deletions src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Update OTel SDK version to `1.3.2`.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update OTel SDK version to `1.4.0`.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-beta.4

4 changes: 2 additions & 2 deletions src/OpenTelemetry.Extensions.Docker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Updates to 1.3.2 of OpenTelemetry SDK.
[917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)
* Updates to 1.4.0 of OpenTelemetry SDK.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-beta.2

4 changes: 2 additions & 2 deletions src/OpenTelemetry.Extensions/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changelog

* Update OpenTelemetry to 1.4.0-rc.4
([#990](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/990))
* Update OpenTelemetry to 1.4.0
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## Unreleased

Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestPrereleaseVersion)" />
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Update `OpenTelemetry.Api` to `1.3.2`.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update `OpenTelemetry.Api` to `1.4.0`.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-rc9.7

Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ ASP.NET Core instrumentation example:

```csharp
// Add OpenTelemetry and Elasticsearch client instrumentation
services.AddOpenTelemetryTracing(x =>
services.AddOpenTelemetry().WithTracing(x =>
{
x.AddElasticsearchClientInstrumentation();
x.UseJaegerExporter(config => {
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@

## Unreleased

* Updated OTel SDK package version to 1.4.0
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-beta.4

Released 2023-Jan-25
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Update OpenTelemetry.Api to 1.3.2.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update OpenTelemetry.Api to 1.4.0.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-alpha.2

2 changes: 1 addition & 1 deletion src/OpenTelemetry.Instrumentation.GrpcCore/README.md
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ ASP.NET Core instrumentation example:

```csharp
// Add OpenTelemetry and gRPC Core instrumentation
services.AddOpenTelemetryTracing(x =>
services.AddOpenTelemetry().WithTracing(x =>
{
x.AddGrpcCoreInstrumentation();
...
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Update OTel API version to `1.3.2`.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update OTel API version to `1.4.0`.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-beta.4

4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Update OTel API version to `1.3.2`.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update OTel API version to `1.4.0`.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-beta.5

Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
</ItemGroup>

<ItemGroup>
<ItemGroup>
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SemanticConventions.cs" Link="Includes\SemanticConventions.cs" />
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs" />
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\StatusHelper.cs" Link="Includes\StatusHelper.cs" />
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Updated OpenTelemetry SDK to 1.3.2
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Updated OpenTelemetry SDK to 1.4.0
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))
* Removes `AddOwinInstrumentation` method with default configure parameter.
([#929](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/929))

3 changes: 3 additions & 0 deletions src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@

## Unreleased

* Update OpenTelemetry API to 1.4.0
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 0.5.0-beta.1

Released 2023-Feb-17
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestPrereleaseVersion)" />
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
</ItemGroup>

<ItemGroup>
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Update OpenTelemetry.Api to 1.3.2.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update OpenTelemetry.Api to 1.4.0.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))
* Removes .NET Framework 4.7.2. It is distributed as .NET Standard 2.0.
([#911](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/911))
* Removes `AddQuartzInstrumentation` method with default configure default parameter.
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Instrumentation.Quartz/README.md
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ public void ConfigureServices(IServiceCollection services)
}

// Add OpenTelemetry and Quartz instrumentation
services.AddOpenTelemetryTracing(x =>
services.AddOpenTelemetry().WithTracing(x =>
{
x.AddQuartzInstrumentation();
x.UseJaegerExporter(config => {
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@

## Unreleased

* Update OpenTelemetry API to 1.4.0
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.1.0-rc.1

Released 2023-Feb-13
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestPrereleaseVersion)" />
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
</ItemGroup>

<ItemGroup>
Original file line number Diff line number Diff line change
@@ -2,8 +2,11 @@

## Unreleased

* Update OTel API version to `1.3.2`.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update OTel API version to `1.4.0`.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))
* Added a direct dependency on System.Reflection.Emit.Lightweight which
Kielek marked this conversation as resolved.
Show resolved Hide resolved
previously came transitively through the OpenTelemetry API.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))

## 1.0.0-rc9.7

Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="StackExchange.Redis" Version="$(StackExchangeRedisPkgVer)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPkgVer)" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPkgVer)" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

## Unreleased

* Update OTel SDK version to `1.3.2`.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))
* Update OTel SDK version to `1.4.0`.
([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038))
* Removes `AddWcfInstrumentation` method with default configure parameter.
([#928](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/928))

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector
OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector.AppServiceResourceDetector() -> void
OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector.Detect() -> OpenTelemetry.Resources.Resource?
OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector.Detect() -> OpenTelemetry.Resources.Resource!
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ namespace OpenTelemetry.ResourceDetectors.Azure;
public sealed class AppServiceResourceDetector : IResourceDetector
{
/// <inheritdoc/>
public Resource? Detect()
public Resource Detect()
{
List<KeyValuePair<string, object>>? attributeList = null;

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
Loading