Skip to content

Commit cdf2e22

Browse files
authored
Remove namespace from Otel span name. (#908)
1 parent b111547 commit cdf2e22

File tree

6 files changed

+30
-15
lines changed

6 files changed

+30
-15
lines changed

dotnet/src/dotnetcore/GxClasses.Web/Middleware/GXRouting.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,7 @@ public GxRestWrapper GetController(HttpContext context, ControllerInfo controlle
377377
GxContext gxContext = GxContext.CreateDefaultInstance();
378378
gxContext.HttpContext = context;
379379
context.NewSessionCheck();
380-
string nspace;
381-
Config.GetValueOf("AppMainNamespace", out nspace);
380+
string nspace = Preferences.AppMainNamespace;
382381

383382
String tmpController = controller;
384383
String addNspace = string.Empty;

dotnet/src/dotnetcore/GxClasses.Web/Notifications/WebSocket/WSHandler.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ private bool ExecuteHandler(HandlerType type, Object[] parameters)
119119
{
120120
try
121121
{
122-
string nSpace = string.Empty;
123-
Config.GetValueOf("AppMainNamespace", out nSpace);
122+
string nSpace = Preferences.AppMainNamespace;
124123
GXProcedure obj = null;
125124
try
126125
{

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
8-
<PackageTags>OpenTelemetry GeneXus DotNet </PackageTags>
9-
<PackageId>GeneXus.OpenTelemetry.OpenTelemetry</PackageId>
10-
<NoWarn>NU1605</NoWarn>
11-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
5+
<Nullable>enable</Nullable>
6+
<AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
7+
<PackageTags>OpenTelemetry GeneXus DotNet </PackageTags>
8+
<PackageId>GeneXus.OpenTelemetry.OpenTelemetry</PackageId>
9+
<NoWarn>NU1605</NoWarn>
10+
</PropertyGroup>
1211

1312
<ItemGroup>
1413
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />

dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,14 @@ public class Preferences
826826
const string DEFAULT_DS = "Default";
827827
static int httpclient_max_per_route = -1;
828828
static int sessionTimeout = -1;
829+
internal static string AppMainNamespace
830+
{
831+
get
832+
{
833+
Config.GetValueOf("AppMainNamespace", out string nameSpace);
834+
return nameSpace;
835+
}
836+
}
829837
internal static string DefaultDatastore
830838
{
831839
get

dotnet/src/dotnetframework/GxClasses/Model/GXBaseObject.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using GeneXus.Configuration;
12
using GeneXus.Data.NTier;
23
using GeneXus.Encryption;
34
using GeneXus.Http;
@@ -60,9 +61,17 @@ protected virtual void ExecutePrivate()
6061

6162
}
6263
#if NETCORE
64+
internal static string GetObjectNameWithoutNamespace(string gxObjFullName)
65+
{
66+
string mainNamespace = Preferences.AppMainNamespace;
67+
if (gxObjFullName.StartsWith(mainNamespace))
68+
gxObjFullName = gxObjFullName.Remove(0, mainNamespace.Length + 1);
69+
return gxObjFullName;
70+
}
6371
private void ExecuteUsingSpanCode()
6472
{
65-
using (Activity activity = ActivitySource.StartActivity($"{this.GetType().FullName}.execute"))
73+
string gxObjFullName = GetObjectNameWithoutNamespace(GetType().FullName);
74+
using (Activity activity = ActivitySource.StartActivity($"{gxObjFullName}.execute"))
6675
{
6776
ExecutePrivate();
6877
}

dotnet/src/dotnetframework/GxClasses/Model/GXSilentTrn.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ private Activity InitializeSpan(string methodName)
191191
{
192192
if (GenOtelSpanEnabled())
193193
{
194-
return GXBaseObject.ActivitySource.StartActivity($"{this.GetType().FullName}.{methodName}");
194+
string gxObjFullName = GXBaseObject.GetObjectNameWithoutNamespace(GetType().FullName);
195+
return GXBaseObject.ActivitySource.StartActivity($"{gxObjFullName}.{methodName}");
195196
}
196197
return null;
197198
}

0 commit comments

Comments
 (0)