Skip to content

Remove namespace from Otel span name. #908

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
merged 3 commits into from
Nov 21, 2023
Merged

Remove namespace from Otel span name. #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e59c979
Remove namespace from Otel span name. Leave only module plus program …
sjuarezgx Nov 19, 2023
bfbd3db
Remove duplicate code.
claudiamurialdo Nov 20, 2023
71bc491
Remove preceding dot from span name.
sjuarezgx Nov 21, 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
3 changes: 1 addition & 2 deletions dotnet/src/dotnetcore/GxClasses.Web/Middleware/GXRouting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,7 @@ public GxRestWrapper GetController(HttpContext context, ControllerInfo controlle
GxContext gxContext = GxContext.CreateDefaultInstance();
gxContext.HttpContext = context;
context.NewSessionCheck();
string nspace;
Config.GetValueOf("AppMainNamespace", out nspace);
string nspace = Preferences.AppMainNamespace;

String tmpController = controller;
String addNspace = string.Empty;
Expand Down
3 changes: 1 addition & 2 deletions dotnet/src/dotnetcore/GxClasses.Web/Notifications/WebSocket/WSHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ private bool ExecuteHandler(HandlerType type, Object[] parameters)
{
try
{
string nSpace = string.Empty;
Config.GetValueOf("AppMainNamespace", out nSpace);
string nSpace = Preferences.AppMainNamespace;
GXProcedure obj = null;
try
{
Expand Down
17 changes: 8 additions & 9 deletions dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
<PackageTags>OpenTelemetry GeneXus DotNet </PackageTags>
<PackageId>GeneXus.OpenTelemetry.OpenTelemetry</PackageId>
<NoWarn>NU1605</NoWarn>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
<PackageTags>OpenTelemetry GeneXus DotNet </PackageTags>
<PackageId>GeneXus.OpenTelemetry.OpenTelemetry</PackageId>
<NoWarn>NU1605</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />
Expand Down
8 changes: 8 additions & 0 deletions dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,14 @@ public class Preferences
const string DEFAULT_DS = "Default";
static int httpclient_max_per_route = -1;
static int sessionTimeout = -1;
internal static string AppMainNamespace
{
get
{
Config.GetValueOf("AppMainNamespace", out string nameSpace);
return nameSpace;
}
}
internal static string DefaultDatastore
{
get
Expand Down
11 changes: 10 additions & 1 deletion dotnet/src/dotnetframework/GxClasses/Model/GXBaseObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using GeneXus.Configuration;
using GeneXus.Data.NTier;
using GeneXus.Encryption;
using GeneXus.Http;
Expand Down Expand Up @@ -60,9 +61,17 @@ protected virtual void ExecutePrivate()

}
#if NETCORE
internal static string GetObjectNameWithoutNamespace(string gxObjFullName)
{
string mainNamespace = Preferences.AppMainNamespace;
if (gxObjFullName.StartsWith(mainNamespace))
gxObjFullName = gxObjFullName.Remove(0, mainNamespace.Length + 1);
return gxObjFullName;
}
private void ExecuteUsingSpanCode()
{
using (Activity activity = ActivitySource.StartActivity($"{this.GetType().FullName}.execute"))
string gxObjFullName = GetObjectNameWithoutNamespace(GetType().FullName);
using (Activity activity = ActivitySource.StartActivity($"{gxObjFullName}.execute"))
{
ExecutePrivate();
}
Expand Down
3 changes: 2 additions & 1 deletion dotnet/src/dotnetframework/GxClasses/Model/GXSilentTrn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ private Activity InitializeSpan(string methodName)
{
if (GenOtelSpanEnabled())
{
return GXBaseObject.ActivitySource.StartActivity($"{this.GetType().FullName}.{methodName}");
string gxObjFullName = GXBaseObject.GetObjectNameWithoutNamespace(GetType().FullName);
return GXBaseObject.ActivitySource.StartActivity($"{gxObjFullName}.{methodName}");
}
return null;
}
Expand Down