Skip to content

Azure Monitor Exporter - Modified ExtractRoleInfo to read roleinstance and rolename once #16551

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

Merged
rajkumar-rangaraj merged 2 commits into from
Nov 4, 2020
Merged

Azure Monitor Exporter - Modified ExtractRoleInfo to read roleinstance and rolename once #16551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4a5f92
SetResource
rajkumar-rangaraj Nov 3, 2020
7ba5a3b
Rename ExtractRoleInfo to InitRoleInfo
rajkumar-rangaraj Nov 4, 2020
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
28 changes: 18 additions & 10 deletions sdk/monitor/Microsoft.Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ internal static class AzureMonitorConverter
[TelemetryType.Event] = "Event",
};

internal static string RoleName { get; set; } = null;

internal static string RoleInstance { get; set; } = null;

internal static List<TelemetryItem> Convert(Batch<Activity> batchActivity, string instrumentationKey)
{
List<TelemetryItem> telemetryItems = new List<TelemetryItem>();
Expand All @@ -57,9 +61,9 @@ internal static List<TelemetryItem> Convert(Batch<Activity> batchActivity, strin
internal static TelemetryItem GeneratePartAEnvelope(Activity activity)
{
TelemetryItem telemetryItem = new TelemetryItem(PartA_Name_Mapping[activity.GetTelemetryType()], activity.StartTimeUtc.ToString(CultureInfo.InvariantCulture));
ExtractRoleInfo(activity.GetResource(), out var roleName, out var roleInstance);
telemetryItem.Tags[ContextTagKeys.AiCloudRole.ToString()] = roleName;
telemetryItem.Tags[ContextTagKeys.AiCloudRoleInstance.ToString()] = roleInstance;
InitRoleInfo(activity);
telemetryItem.Tags[ContextTagKeys.AiCloudRole.ToString()] = RoleName;
telemetryItem.Tags[ContextTagKeys.AiCloudRoleInstance.ToString()] = RoleInstance;
telemetryItem.Tags[ContextTagKeys.AiOperationId.ToString()] = activity.TraceId.ToHexString();
if (activity.Parent != null)
{
Expand All @@ -71,18 +75,22 @@ internal static TelemetryItem GeneratePartAEnvelope(Activity activity)
return telemetryItem;
}

internal static void ExtractRoleInfo(Resource resource, out string roleName, out string roleInstance)
Comment thread
rajkumar-rangaraj marked this conversation as resolved.
internal static void InitRoleInfo(Activity activity)
{
if (RoleName != null || RoleInstance != null)
{
return;
}

var resource = activity.GetResource();

if (resource == null)
{
roleName = null;
roleInstance = null;
return;
}

string serviceName = null;
string serviceNamespace = null;
roleInstance = null;

foreach (var attribute in resource.Attributes)
{
Expand All @@ -96,17 +104,17 @@ internal static void ExtractRoleInfo(Resource resource, out string roleName, out
}
else if (attribute.Key == Resource.ServiceInstanceIdKey && attribute.Value is string)
{
roleInstance = attribute.Value.ToString();
RoleInstance = attribute.Value.ToString();
}
}

if (serviceName != null && serviceNamespace != null)
{
roleName = string.Concat(serviceNamespace, ".", serviceName);
RoleName = string.Concat(serviceNamespace, ".", serviceName);
}
else
{
roleName = serviceName;
RoleName = serviceName;
}
}

Expand Down
85 changes: 49 additions & 36 deletions .../tests/Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Tests/AzureMonitorConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,68 +30,81 @@ static AzureMonitorConverterTests()
ActivitySource.AddActivityListener(listener);
}

public AzureMonitorConverterTests()
{
AzureMonitorConverter.RoleName = null;
AzureMonitorConverter.RoleInstance = null;
}

[Fact]
public void ExtractRoleInfo_NullResource()
public void InitRoleInfo_NullResource()
{
AzureMonitorConverter.ExtractRoleInfo(null, out var roleName, out var roleInstance);
Assert.Null(roleName);
Assert.Null(roleInstance);
AzureMonitorConverter.InitRoleInfo(null);

Assert.Null(AzureMonitorConverter.RoleName);
Assert.Null(AzureMonitorConverter.RoleInstance);
}

[Fact]
public void ExtractRoleInfo_Empty()
public void InitRoleInfo_Empty()
{
var resource = Resources.CreateServiceResource(null);
AzureMonitorConverter.ExtractRoleInfo(resource, out var roleName, out var roleInstance);
Assert.Null(roleName);
Assert.Null(roleInstance);
using var activity = new Activity("InitRoleInfo_Empty");
activity.SetCustomProperty(ResourcePropertyName, Resources.CreateServiceResource(null));

AzureMonitorConverter.InitRoleInfo(activity);
Assert.Null(AzureMonitorConverter.RoleName);
Assert.Null(AzureMonitorConverter.RoleInstance);
}

[Fact]
public void ExtractRoleInfo_ServiceName()
public void InitRoleInfo_ServiceName()
{
var resource = Resources.CreateServiceResource("my-service");
AzureMonitorConverter.ExtractRoleInfo(resource, out var roleName, out var roleInstance);
Assert.Equal("my-service", roleName);
Assert.True(Guid.TryParse(roleInstance, out var guid));
using var activity = new Activity("InitRoleInfo_ServiceName");
activity.SetCustomProperty(ResourcePropertyName, Resources.CreateServiceResource("my-service"));
AzureMonitorConverter.InitRoleInfo(activity);
Assert.Equal("my-service", AzureMonitorConverter.RoleName);
Assert.True(Guid.TryParse(AzureMonitorConverter.RoleInstance, out var guid));
}

[Fact]
public void ExtractRoleInfo_ServiceInstance()
public void InitRoleInfo_ServiceInstance()
{
var resource = Resources.CreateServiceResource(null, "roleInstance_1");
AzureMonitorConverter.ExtractRoleInfo(resource, out var roleName, out var roleInstance);
Assert.Empty(resource.Attributes);
Assert.Null(roleName);
Assert.Null(roleInstance);
using var activity = new Activity("InitRoleInfo_ServiceInstance");
activity.SetCustomProperty(ResourcePropertyName, Resources.CreateServiceResource(null, "roleInstance_1"));
AzureMonitorConverter.InitRoleInfo(activity);

Assert.Null(AzureMonitorConverter.RoleName);
Assert.Null(AzureMonitorConverter.RoleInstance);
}

[Fact]
public void ExtractRoleInfo_ServiceNamespace()
public void InitRoleInfo_ServiceNamespace()
{
var resource = Resources.CreateServiceResource(null, null, "my-namespace");
AzureMonitorConverter.ExtractRoleInfo(resource, out var roleName, out var roleInstance);
Assert.Empty(resource.Attributes);
Assert.Null(roleName);
Assert.Null(roleInstance);
using var activity = new Activity("InitRoleInfo_ServiceNamespace");
activity.SetCustomProperty(ResourcePropertyName, Resources.CreateServiceResource(null, null, "my-namespace"));
AzureMonitorConverter.InitRoleInfo(activity);
Assert.Null(AzureMonitorConverter.RoleName);
Assert.Null(AzureMonitorConverter.RoleInstance);
}

[Fact]
public void ExtractRoleInfo_ServiceNameAndInstance()
public void InitRoleInfo_ServiceNameAndInstance()
{
var resource = Resources.CreateServiceResource("my-service", "roleInstance_1");
AzureMonitorConverter.ExtractRoleInfo(resource, out var roleName, out var roleInstance);
Assert.Equal("my-service", roleName);
Assert.Equal("roleInstance_1", roleInstance);
using var activity = new Activity("InitRoleInfo_ServiceNameAndInstance");
activity.SetCustomProperty(ResourcePropertyName, Resources.CreateServiceResource("my-service", "roleInstance_1"));
AzureMonitorConverter.InitRoleInfo(activity);
Assert.Equal("my-service", AzureMonitorConverter.RoleName);
Assert.Equal("roleInstance_1", AzureMonitorConverter.RoleInstance);
}

[Fact]
public void ExtractRoleInfo_ServiceNameAndInstanceAndNamespace()
public void InitRoleInfo_ServiceNameAndInstanceAndNamespace()
{
var resource = Resources.CreateServiceResource("my-service", "roleInstance_1", "my-namespace");
AzureMonitorConverter.ExtractRoleInfo(resource, out var roleName, out var roleInstance);
Assert.Equal("my-namespace.my-service", roleName);
Assert.Equal("roleInstance_1", roleInstance);
using var activity = new Activity("InitRoleInfo_ServiceNameAndInstanceAndNamespace");
activity.SetCustomProperty(ResourcePropertyName, Resources.CreateServiceResource("my-service", "roleInstance_1", "my-namespace"));
AzureMonitorConverter.InitRoleInfo(activity);
Assert.Equal("my-namespace.my-service", AzureMonitorConverter.RoleName);
Assert.Equal("roleInstance_1", AzureMonitorConverter.RoleInstance);
}

[Fact]
Expand Down