Skip to content

Commit 0f95528

Browse files
Remove beta OpenTelemetry.Resources.Azure package and use vendored implementation (#3095)
1 parent a255e72 commit 0f95528

8 files changed

Lines changed: 14 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- OpenTelemetry.Instrumentation.AspNet 1.15.1
1212
- OpenTelemetry.Instrumentation.Http 1.15.0
1313
- OpenTelemetry.Instrumentation.SqlClient 1.15.0
14-
- OpenTelemetry.Resources.Azure 1.15.0-beta.1
14+
- [Vendored OpenTelemetry.Resources.Azure resource detectors to NETCORE shared folder, replaced package with vendored implementation](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3095)
1515
- [Added support to disable telemetry via TelemetryConfiguration.DisableTelemetry](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3084)
1616
- [Removed `EnabledAdaptiveSampling` and replaced with `TracesPerSecond` and `SamplingRatio`](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3085)
1717
- [Added `EnableTraceBasedLogsSampler` property to `ApplicationInsightsServiceOptions` for ASP.NET Core and WorkerService packages](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3088)

Directory.Packages.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.15.0" />
3434
</ItemGroup>
3535

36-
<ItemGroup Label="OpenTelemetry - Resources (Beta)">
37-
<PackageVersion Include="OpenTelemetry.Resources.Azure" Version="1.15.0-beta.1" />
38-
</ItemGroup>
39-
4036
<!--
4137
==============================================================================
4238
AZURE MONITOR PACKAGES

NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.ApplicationInsights.Extensibility;
1313
using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
1414
using Microsoft.ApplicationInsights.Internal;
15+
using Microsoft.ApplicationInsights.Shared.Vendoring.OpenTelemetry.Resources;
1516
using Microsoft.Extensions.Configuration;
1617
using Microsoft.Extensions.Options;
1718
using OpenTelemetry;

NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
2727
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
2828
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
29-
<PackageReference Include="OpenTelemetry.Resources.Azure" />
3029
</ItemGroup>
3130

3231
<ItemGroup>

NETCORE/src/Microsoft.ApplicationInsights.WorkerService/ApplicationInsightsExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.ApplicationInsights.Extensibility;
1010
using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
1111
using Microsoft.ApplicationInsights.Internal;
12+
using Microsoft.ApplicationInsights.Shared.Vendoring.OpenTelemetry.Resources;
1213
using Microsoft.ApplicationInsights.WorkerService;
1314
using Microsoft.ApplicationInsights.WorkerService.Implementation.Tracing;
1415
using Microsoft.Extensions.Configuration;

NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
2525
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
2626
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
27-
<PackageReference Include="OpenTelemetry.Resources.Azure" />
2827
</ItemGroup>
2928

3029
<ItemGroup>

WEB/Src/Web/Web/Extensions/ApplicationInsightsExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Collections.Generic;
55
using System.Diagnostics;
66
using Microsoft.ApplicationInsights.Internal;
7+
using Microsoft.ApplicationInsights.Shared.Vendoring.OpenTelemetry.Resources;
78
using OpenTelemetry;
89
using OpenTelemetry.Metrics;
910
using OpenTelemetry.Resources;

WEB/Src/Web/Web/Web.csproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" />
2828
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
2929
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
30-
<PackageReference Include="OpenTelemetry.Resources.Azure" />
3130
</ItemGroup>
3231

3332
<ItemGroup>
@@ -49,5 +48,15 @@
4948

5049
<ItemGroup>
5150
<Compile Include="..\..\..\..\NETCORE\src\Shared\ActivityFilterProcessor.cs" Link="Implementation\ActivityFilterProcessor.cs" />
51+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AppServiceResourceDetector.cs" Link="Implementation\Vendoring\AppServiceResourceDetector.cs" />
52+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureContainerAppsResourceDetector.cs" Link="Implementation\Vendoring\AzureContainerAppsResourceDetector.cs" />
53+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureResourceBuilderExtensions.cs" Link="Implementation\Vendoring\AzureResourceBuilderExtensions.cs" />
54+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureVmMetaDataRequestor.cs" Link="Implementation\Vendoring\AzureVmMetaDataRequestor.cs" />
55+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureVmMetadataResponse.cs" Link="Implementation\Vendoring\AzureVmMetadataResponse.cs" />
56+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureVMResourceDetector.cs" Link="Implementation\Vendoring\AzureVMResourceDetector.cs" />
57+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\Guard.cs" Link="Implementation\Vendoring\Guard.cs" />
58+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\ResourceAttributeConstants.cs" Link="Implementation\Vendoring\ResourceAttributeConstants.cs" />
59+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\ResourceSemanticConventions.cs" Link="Implementation\Vendoring\ResourceSemanticConventions.cs" />
60+
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\SourceGenerationContext.cs" Link="Implementation\Vendoring\SourceGenerationContext.cs" />
5261
</ItemGroup>
5362
</Project>

0 commit comments

Comments
 (0)