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.

Sign up for GitHub

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

Use assembly information version for User-Agent #4143

Merged
merged 2 commits into from
Feb 8, 2023
Merged

Use assembly information version for User-Agent #4143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da53a18
Use assembly information version for User-Agent
martincostello Feb 3, 2023
5d47539
Merge branch 'main' into change-user-agent-version
alanwest Feb 8, 2023
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
9 changes: 5 additions & 4 deletions src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// </copyright>

using System.Diagnostics;
using System.Reflection;
#if NETFRAMEWORK
using System.Net.Http;
#endif
Expand Down Expand Up @@ -51,7 +52,7 @@ public class OtlpExporterOptions
private const OtlpExportProtocol DefaultOtlpExportProtocol = OtlpExportProtocol.Grpc;
private const string UserAgentProduct = "OTel-OTLP-Exporter-Dotnet";

private static readonly Version UserAgentProductVersion = GetAssemblyVersion();
private static readonly string UserAgentProductVersion = GetAssemblyVersion();

private Uri endpoint;

Expand Down Expand Up @@ -204,12 +205,12 @@ internal static void RegisterOtlpExporterOptionsFactory(IServiceCollection servi
sp.GetRequiredService<IOptionsMonitor<BatchExportActivityProcessorOptions>>().Get(name)));
}

private static Version GetAssemblyVersion()
private static string GetAssemblyVersion()
{
try
{
var assemblyName = typeof(OtlpExporterOptions).Assembly.GetName();
return assemblyName.Version;
var assemblyVersion = typeof(OtlpExporterOptions).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
return assemblyVersion.InformationalVersion;
}
catch (Exception)
{
Expand Down