Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- OpenTelemetry.Instrumentation.AspNet 1.15.1
- OpenTelemetry.Instrumentation.Http 1.15.0
- OpenTelemetry.Instrumentation.SqlClient 1.15.0
- OpenTelemetry.Resources.Azure 1.15.0-beta.1
- [Vendored OpenTelemetry.Resources.Azure resource detectors to NETCORE shared folder, replaced package with vendored implementation](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3095)
- [Added support to disable telemetry via TelemetryConfiguration.DisableTelemetry](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3084)
- [Removed `EnabledAdaptiveSampling` and replaced with `TracesPerSecond` and `SamplingRatio`](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3085)
- [Added `EnableTraceBasedLogsSampler` property to `ApplicationInsightsServiceOptions` for ASP.NET Core and WorkerService packages](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3088)
Expand Down
4 changes: 0 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.15.0" />
</ItemGroup>

<ItemGroup Label="OpenTelemetry - Resources (Beta)">
<PackageVersion Include="OpenTelemetry.Resources.Azure" Version="1.15.0-beta.1" />
</ItemGroup>

<!--
==============================================================================
AZURE MONITOR PACKAGES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
using Microsoft.ApplicationInsights.Internal;
using Microsoft.ApplicationInsights.Shared.Vendoring.OpenTelemetry.Resources;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
using OpenTelemetry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
<PackageReference Include="OpenTelemetry.Resources.Azure" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
using Microsoft.ApplicationInsights.Internal;
using Microsoft.ApplicationInsights.Shared.Vendoring.OpenTelemetry.Resources;
using Microsoft.ApplicationInsights.WorkerService;
using Microsoft.ApplicationInsights.WorkerService.Implementation.Tracing;
using Microsoft.Extensions.Configuration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
<PackageReference Include="OpenTelemetry.Resources.Azure" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using Microsoft.ApplicationInsights.Internal;
using Microsoft.ApplicationInsights.Shared.Vendoring.OpenTelemetry.Resources;
using OpenTelemetry;
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
Expand Down
11 changes: 10 additions & 1 deletion WEB/Src/Web/Web/Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
<PackageReference Include="OpenTelemetry.Resources.Azure" />
</ItemGroup>

<ItemGroup>
Expand All @@ -49,5 +48,15 @@

<ItemGroup>
<Compile Include="..\..\..\..\NETCORE\src\Shared\ActivityFilterProcessor.cs" Link="Implementation\ActivityFilterProcessor.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AppServiceResourceDetector.cs" Link="Implementation\Vendoring\AppServiceResourceDetector.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureContainerAppsResourceDetector.cs" Link="Implementation\Vendoring\AzureContainerAppsResourceDetector.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureResourceBuilderExtensions.cs" Link="Implementation\Vendoring\AzureResourceBuilderExtensions.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureVmMetaDataRequestor.cs" Link="Implementation\Vendoring\AzureVmMetaDataRequestor.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureVmMetadataResponse.cs" Link="Implementation\Vendoring\AzureVmMetadataResponse.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\AzureVMResourceDetector.cs" Link="Implementation\Vendoring\AzureVMResourceDetector.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\Guard.cs" Link="Implementation\Vendoring\Guard.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\ResourceAttributeConstants.cs" Link="Implementation\Vendoring\ResourceAttributeConstants.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\ResourceSemanticConventions.cs" Link="Implementation\Vendoring\ResourceSemanticConventions.cs" />
<Compile Include="..\..\..\..\NETCORE\src\Shared\Vendoring\OpenTelemetry.Resources.Azure\SourceGenerationContext.cs" Link="Implementation\Vendoring\SourceGenerationContext.cs" />
</ItemGroup>
</Project>
Loading