open-telemetry
/
opentelemetry-dotnet-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump dependencies from contrib repository (#3260) 

* Bump OpenTelemetry.ResourceDetectors.Container to 1.0.0-beta.6

* Bump OpenTelemetry.Instrumentation.EntityFrameworkCore to 1.0.0-beta.10

* Bump OpenTelemetry.Instrumentation.AspNet to 1.7.0-beta.2

* Bump OpenTelemetry.Instrumentation.Wcf to 1.0.0-rc.15
This commit is contained in:
Piotr Kiełkowicz 2024-02-07 22:53:40 +01:00 committed by GitHub
parent 22f33f761a
commit 068faa811c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -22,11 +22,20 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
- Following packages updated
- `OpenTelemetry.ResourceDetectors.Azure` from `1.0.0-beta.4` to `1.0.0-beta.5`,
- `OpenTelemetry.ResourceDetectors.Container` from `1.0.0-beta.5` to `1.0.0-beta.6`.
- `OpenTelemetry.Instrumentation.Wcf` from `1.0.0-rc.14` to `1.0.0-rc.15`,
- .NET only, following packages updated
- `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.0.0-beta.9` to `1.0.0-beta.10`.
- .NET Framework only, following packages updated
- `OpenTelemetry.Instrumentation.AspNet` from `1.7.0-beta.1` to `1.7.0-beta.2`.
### Deprecated
### Removed
- Container resource detector will be not executed on .NET Framework.
It was not giving any results before changes.
### Fixed
## [1.3.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0)

2
Directory.Packages.props
View File

@ -11,6 +11,6 @@
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.0.0-rc.14" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.0.0-rc.15" />
</ItemGroup>
</Project>

14
docs/config.md
View File

@ -88,13 +88,13 @@ for more details.
The following resource detectors are included and enabled by default:
| ID | Description | Documentation | Status |
|-------------------|----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
| `AZUREAPPSERVICE` | Azure App Service detector | [Azure resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Azure-1.0.0-beta.4/src/OpenTelemetry.ResourceDetectors.Azure/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `CONTAINER` | Container detector | [Container resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Container-1.0.0-beta.5/src/OpenTelemetry.ResourceDetectors.Container/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `HOST` | Host detector | [Host resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Host-0.1.0-alpha.2/src/OpenTelemetry.ResourceDetectors.Host/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `PROCESS` | Process detector | [Process resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Process-0.1.0-alpha.2/src/OpenTelemetry.ResourceDetectors.Process/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `PROCESSRUNTIME` | Process Runtime detector | [Process Runtime resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.ProcessRuntime-0.1.0-alpha.2/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| ID | Description | Documentation | Status |
|-------------------|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
| `AZUREAPPSERVICE` | Azure App Service detector | [Azure resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Azure-1.0.0-beta.4/src/OpenTelemetry.ResourceDetectors.Azure/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `CONTAINER` | Container detector | [Container resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Container-1.0.0-beta.6/src/OpenTelemetry.ResourceDetectors.Container/README.md) **Not supported on .NET Framework** | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `HOST` | Host detector | [Host resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Host-0.1.0-alpha.2/src/OpenTelemetry.ResourceDetectors.Host/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `PROCESS` | Process detector | [Process resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.Process-0.1.0-alpha.2/src/OpenTelemetry.ResourceDetectors.Process/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
| `PROCESSRUNTIME` | Process Runtime detector | [Process Runtime resource detector documentation](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/ResourceDetectors.ProcessRuntime-0.1.0-alpha.2/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/README.md) | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
## Instrumentations

6
docs/plugins.md
View File

@ -111,15 +111,15 @@ public class MyPlugin
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.7.0 |
| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.7.0 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.7.0 |
| OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.7.0-beta.1 |
| OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.7.0-beta.2 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.7.0 |
| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.9 |
| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.10 |
| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.6.0-beta.3 |
| OpenTelemetry.Instrumentation.Http.HttpClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.7.0 |
| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-beta.1 |
| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.6.0-beta.3 |
| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.13 |
| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.14 |
| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.15 |
### Metrics

6
src/Directory.Packages.props
View File

@ -16,9 +16,9 @@
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.7.0-rc.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Propagators" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNet" Version="1.7.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNet" Version="1.7.0-beta.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.9" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.10" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.4" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-beta.1" />
@ -27,7 +27,7 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
<PackageVersion Include="OpenTelemetry.Shims.OpenTracing" Version="1.7.0-beta.1" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Azure" Version="1.0.0-beta.5" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.5" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.6" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Host" Version="0.1.0-alpha.2" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Process" Version="0.1.0-alpha.2" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.ProcessRuntime" Version="0.1.0-alpha.2" />

7
src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h
View File

@ -44,17 +44,16 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"OpenTelemetry.Exporter.Prometheus.HttpListener", {1, 0, 0, 0} },
{ L"OpenTelemetry.Exporter.Zipkin", {1, 0, 0, 0} },
{ L"OpenTelemetry.Extensions.Propagators", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.AspNet", {1, 7, 0, 1} },
{ L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 7, 0, 1} },
{ L"OpenTelemetry.Instrumentation.AspNet", {1, 7, 0, 2} },
{ L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 7, 0, 2} },
{ L"OpenTelemetry.Instrumentation.GrpcNetClient", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Http", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Process", {0, 5, 0, 4} },
{ L"OpenTelemetry.Instrumentation.Quartz", {1, 0, 0, 1} },
{ L"OpenTelemetry.Instrumentation.Runtime", {1, 7, 0, 0} },
{ L"OpenTelemetry.Instrumentation.SqlClient", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 14} },
{ L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 15} },
{ L"OpenTelemetry.ResourceDetectors.Azure", {1, 0, 0, 5} },
{ L"OpenTelemetry.ResourceDetectors.Container", {1, 0, 0, 5} },
{ L"OpenTelemetry.ResourceDetectors.Host", {0, 1, 0, 2} },
{ L"OpenTelemetry.ResourceDetectors.Process", {0, 1, 0, 2} },
{ L"OpenTelemetry.ResourceDetectors.ProcessRuntime", {0, 1, 0, 2} },

6
src/OpenTelemetry.AutoInstrumentation/Configurations/ResourceConfigurator.cs
View File

@ -3,7 +3,9 @@
using System.Runtime.CompilerServices;
using OpenTelemetry.ResourceDetectors.Azure;
#if NET6_0_OR_GREATER
using OpenTelemetry.ResourceDetectors.Container;
#endif
using OpenTelemetry.ResourceDetectors.Host;
using OpenTelemetry.ResourceDetectors.Process;
using OpenTelemetry.ResourceDetectors.ProcessRuntime;
@ -31,7 +33,9 @@ internal static class ResourceConfigurator
{
resourceBuilder = enabledResourceDetector switch
{
#if NET6_0_OR_GREATER
ResourceDetector.Container => Wrappers.AddContainerResourceDetector(resourceBuilder),
#endif
ResourceDetector.AzureAppService => Wrappers.AddAzureAppServiceResourceDetector(resourceBuilder),
ResourceDetector.ProcessRuntime => Wrappers.AddProcessRuntimeResourceDetector(resourceBuilder),
ResourceDetector.Process => Wrappers.AddProcessResourceDetector(resourceBuilder),
@ -58,11 +62,13 @@ internal static class ResourceConfigurator
private static class Wrappers
{
#if NET6_0_OR_GREATER
[MethodImpl(MethodImplOptions.NoInlining)]
public static ResourceBuilder AddContainerResourceDetector(ResourceBuilder resourceBuilder)
{
return resourceBuilder.AddDetector(new ContainerResourceDetector());
}
#endif
[MethodImpl(MethodImplOptions.NoInlining)]
public static ResourceBuilder AddAzureAppServiceResourceDetector(ResourceBuilder resourceBuilder)

2
src/OpenTelemetry.AutoInstrumentation/Configurations/ResourceDetector.cs
View File

@ -8,10 +8,12 @@ namespace OpenTelemetry.AutoInstrumentation.Configurations;
/// </summary>
internal enum ResourceDetector
{
#if NET6_0_OR_GREATER
/// <summary>
/// Container resource detector.
/// </summary>
Container = 0,
#endif
/// <summary>
/// Azure App Service resource detector.

2
src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj
View File

@ -38,7 +38,6 @@
<PackageReference Include="OpenTelemetry.Instrumentation.Process" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
<PackageReference Include="OpenTelemetry.ResourceDetectors.Azure" />
<PackageReference Include="OpenTelemetry.ResourceDetectors.Container" />
<PackageReference Include="OpenTelemetry.ResourceDetectors.Host" />
<PackageReference Include="OpenTelemetry.ResourceDetectors.Process" />
<PackageReference Include="OpenTelemetry.ResourceDetectors.ProcessRuntime" />
@ -56,6 +55,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" />
<PackageReference Include="OpenTelemetry.ResourceDetectors.Container" />
</ItemGroup>
<ItemGroup Label="Transient dependencies auto-generated by GenerateNetFxTransientDependencies" Condition=" '$(TargetFramework)' == 'net462' AND $(_IsPacking) != true ">

1
test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
View File

@ -83,7 +83,6 @@
\netfx\OpenTelemetry.Instrumentation.SqlClient.dll,
\netfx\OpenTelemetry.Instrumentation.Wcf.dll,
\netfx\OpenTelemetry.ResourceDetectors.Azure.dll,
\netfx\OpenTelemetry.ResourceDetectors.Container.dll,
\netfx\OpenTelemetry.ResourceDetectors.Host.dll,
\netfx\OpenTelemetry.ResourceDetectors.Process.dll,
\netfx\OpenTelemetry.ResourceDetectors.ProcessRuntime.dll,

3
test/IntegrationTests/ModuleTests.Default.NetFx.verified.txt
View File

@ -9,8 +9,7 @@
OpenTelemetry.Instrumentation.Process,
OpenTelemetry.Instrumentation.Runtime,
OpenTelemetry.ResourceDetectors.Azure,
OpenTelemetry.ResourceDetectors.Container,
OpenTelemetry.ResourceDetectors.Host,
OpenTelemetry.ResourceDetectors.Process,
OpenTelemetry.ResourceDetectors.ProcessRuntime
]
]

1
test/IntegrationTests/ModuleTests.DefaultNoExporters.NetFx.verified.txt
View File

@ -8,7 +8,6 @@
OpenTelemetry.Instrumentation.Process,
OpenTelemetry.Instrumentation.Runtime,
OpenTelemetry.ResourceDetectors.Azure,
OpenTelemetry.ResourceDetectors.Container,
OpenTelemetry.ResourceDetectors.Host,
OpenTelemetry.ResourceDetectors.Process,
OpenTelemetry.ResourceDetectors.ProcessRuntime

2
test/OpenTelemetry.AutoInstrumentation.Tests/Configurations/SettingsTests.cs
View File

@ -342,7 +342,9 @@ public class SettingsTests : IDisposable
}
[Theory]
#if NET6_0_OR_GREATER
[InlineData("CONTAINER", ResourceDetector.Container)]
#endif
[InlineData("AZUREAPPSERVICE", ResourceDetector.AzureAppService)]
[InlineData("PROCESSRUNTIME", ResourceDetector.ProcessRuntime)]
[InlineData("PROCESS", ResourceDetector.Process)]