Skip to content

Commit 19c97ab

Browse files
OTel related package update (#11216)
1 parent 3a5d101 commit 19c97ab

File tree

7 files changed

+421
-444
lines changed

7 files changed

+421
-444
lines changed

release_notes.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
- My change description (#PR)
55
-->
66
- Add JitTrace Files for v4.1042
7-
- Moving to version 1.5.7 of Microsoft.Azure.AppService.Middleware.Functions (https://github.com/Azure/azure-functions-host/pull/11231)
7+
- Updating OTel related nuget packages (#11216)
8+
- Moving to version 1.5.7 of Microsoft.Azure.AppService.Middleware.Functions (https://github.com/Azure/azure-functions-host/pull/11231)
9+

src/WebJobs.Script/Diagnostics/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ private static IOpenTelemetryBuilder ConfigureTracing(this IOpenTelemetryBuilder
124124
if (enableAzureMonitor)
125125
{
126126
builder.AddAzureMonitorTraceExporter(opt => ConfigureAzureMonitorOptions(opt, azMonConnectionString, credential));
127-
builder.AddLiveMetrics(opt => ConfigureAzureMonitorOptions(opt, azMonConnectionString, credential));
128127
}
129128
}
130129

@@ -226,14 +225,5 @@ private static void ConfigureAzureMonitorOptions(AzureMonitorExporterOptions opt
226225
options.Credential = credential;
227226
}
228227
}
229-
230-
private static void ConfigureAzureMonitorOptions(LiveMetricsExporterOptions options, string connectionString, TokenCredential credential)
231-
{
232-
options.ConnectionString = connectionString;
233-
if (credential is not null)
234-
{
235-
options.Credential = credential;
236-
}
237-
}
238228
}
239229
}

src/WebJobs.Script/WebJobs.Script.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Azure.Core" Version="1.47.1" />
3030
<PackageReference Include="Azure.Data.Tables" Version="12.8.3" />
3131
<PackageReference Include="Azure.Identity" Version="1.14.2" />
32-
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0-beta.2" />
32+
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
3333
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
3434
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
3535
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
@@ -48,18 +48,18 @@
4848
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.42-12121" />
4949
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.3.1" />
5050
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
51-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
51+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.6" />
5252
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
5353
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
5454
<PackageReference Include="NuGet.ProjectModel" Version="5.11.6" />
55-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
56-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
57-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
58-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
55+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
56+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
57+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
58+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
5959
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.7" />
60-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
60+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
6161
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
62-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
62+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.6" />
6363
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
6464
<PackageReference Include="System.Formats.Asn1" Version="6.0.1" />
6565
<PackageReference Include="System.IO.Abstractions" Version="2.1.0.227" NoWarn="NU1701" />

src/WebJobs.Script/runtimeassemblies.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
"name": "Azure.Identity",
2020
"resolutionPolicy": "private"
2121
},
22-
{
23-
"name": "Azure.Monitor.OpenTelemetry.AspNetCore",
24-
"resolutionPolicy": "private"
25-
},
2622
{
2723
"name": "Azure.Monitor.OpenTelemetry.Exporter",
2824
"resolutionPolicy": "private"
@@ -926,11 +922,7 @@
926922
{
927923
"name": "OpenTelemetry.Api.ProviderBuilderExtensions",
928924
"resolutionPolicy": "private"
929-
},
930-
{
931-
"name": "OpenTelemetry.Exporter.Console",
932-
"resolutionPolicy": "private"
933-
},
925+
},
934926
{
935927
"name": "OpenTelemetry.Exporter.OpenTelemetryProtocol",
936928
"resolutionPolicy": "private"

test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.3.1" />
11-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.6" />
1212
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
1313
</ItemGroup>
1414

0 commit comments

Comments
 (0)