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

Remove semVer prefix (#3929) 

* Remove semVer prefix

* Use default instrumentation version as 1.0.0.0
This commit is contained in:
Utkarsh Umesan Pillai 2022-11-21 16:20:11 -08:00 committed by GitHub
parent c5ecd05c72
commit 82d3bacd68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenTelemetry.Api/README.md
View File

@ -186,7 +186,7 @@ here as well.
```csharp
static ActivitySource activitySource = new ActivitySource(
"companyname.product.instrumentationlibrary",
"semver1.0.0");
"1.0.0");
```
The above requires import of the `System.Diagnostics` namespace.
@ -483,7 +483,7 @@ Windows-based .NET implementation).
```csharp
static Meter meter = new Meter(
"companyname.product.instrumentationlibrary",
"semver1.0.0");
"1.0.0");
```
The above requires import of the `System.Diagnostics.Metrics` namespace.

3
src/OpenTelemetry/Metrics/Builder/MeterProviderBuilderBase.cs
View File

@ -38,6 +38,7 @@ namespace OpenTelemetry.Metrics
public abstract class MeterProviderBuilderBase : MeterProviderBuilder, IDeferredMeterProviderBuilder
{
internal readonly MeterProviderBuilderState? State;
private const string DefaultInstrumentationVersion = "1.0.0.0";
private readonly bool ownsServices;
private IServiceCollection? services;
@ -281,7 +282,7 @@ namespace OpenTelemetry.Metrics
this.ConfigureState((sp, state)
=> state.AddInstrumentation(
typeof(T).Name,
"semver:" + typeof(T).Assembly.GetName().Version,
typeof(T).Assembly.GetName().Version?.ToString() ?? DefaultInstrumentationVersion,
instrumentationFactory(sp)));
return this;

3
src/OpenTelemetry/Trace/Builder/TracerProviderBuilderBase.cs
View File

@ -36,6 +36,7 @@ namespace OpenTelemetry.Trace
public abstract class TracerProviderBuilderBase : TracerProviderBuilder, IDeferredTracerProviderBuilder
{
internal readonly TracerProviderBuilderState? State;
private const string DefaultInstrumentationVersion = "1.0.0.0";
private readonly bool ownsServices;
private IServiceCollection? services;
@ -260,7 +261,7 @@ namespace OpenTelemetry.Trace
this.ConfigureState((sp, state)
=> state.AddInstrumentation(
typeof(T).Name,
"semver:" + typeof(T).Assembly.GetName().Version,
typeof(T).Assembly.GetName().Version?.ToString() ?? DefaultInstrumentationVersion,
instrumentationFactory(sp)));
return this;

4
test/OpenTelemetry.Tests/Resources/ResourceBuilderTests.cs
View File

@ -55,12 +55,12 @@ namespace OpenTelemetry.Resources.Tests
[Fact]
public void ServiceResource_ServiceNameAndInstanceAndNamespaceAndVersion()
{
var resource = ResourceBuilder.CreateEmpty().AddService("my-service", "my-namespace", "semVer:1.2.3", serviceInstanceId: "123").Build();
var resource = ResourceBuilder.CreateEmpty().AddService("my-service", "my-namespace", "1.2.3", serviceInstanceId: "123").Build();
Assert.Equal(4, resource.Attributes.Count());
Assert.Contains(new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceName, "my-service"), resource.Attributes);
Assert.Contains(new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceInstance, "123"), resource.Attributes);
Assert.Contains(new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceNamespace, "my-namespace"), resource.Attributes);
Assert.Contains(new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceVersion, "semVer:1.2.3"), resource.Attributes);
Assert.Contains(new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceVersion, "1.2.3"), resource.Attributes);
}
[Fact]