diff --git a/src/AgileConfig.Server.Apisite/Appsettings.cs b/src/AgileConfig.Server.Apisite/Appsettings.cs index bafe33ba..acbd4ef2 100644 --- a/src/AgileConfig.Server.Apisite/Appsettings.cs +++ b/src/AgileConfig.Server.Apisite/Appsettings.cs @@ -48,6 +48,7 @@ public class Appsettings public static string OtlpMetricsEndpoint => Global.Config["otlp:metrics:endpoint"]; public static string OtlpMetricsProtocol => Global.Config["otlp:metrics:protocol"]; + public static string OtlpInstanceId => Global.Config["otlp:instanceId"]; } } diff --git a/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs b/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs index d734660d..706b7133 100644 --- a/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs +++ b/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs @@ -68,7 +68,7 @@ public MeterService(IServiceScopeFactory sf) { return _serverNodeCount; }, "", "The number of nodes"); - PullAppConfigCounter = AgileConfigMeter.CreateCounter("PullAppConfigCounter", "The number of times the app configuration was pulled"); + PullAppConfigCounter = AgileConfigMeter.CreateCounter("PullAppConfigCounter", "", "The number of times the app configuration was pulled"); } public void Start() diff --git a/src/AgileConfig.Server.Apisite/Program.cs b/src/AgileConfig.Server.Apisite/Program.cs index e19cb83b..0193cb1f 100644 --- a/src/AgileConfig.Server.Apisite/Program.cs +++ b/src/AgileConfig.Server.Apisite/Program.cs @@ -57,7 +57,9 @@ private static void AddOtlpLogging(ILoggingBuilder builder) builder.AddOpenTelemetry(options => { - options.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(Program.AppName)); + options.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(Program.AppName + , null, null, string.IsNullOrEmpty(Appsettings.OtlpInstanceId), Appsettings.OtlpInstanceId) + ); options .AddOtlpExporter(expOp => { diff --git a/src/AgileConfig.Server.Apisite/Startup.cs b/src/AgileConfig.Server.Apisite/Startup.cs index 151b058a..3b2ed44a 100644 --- a/src/AgileConfig.Server.Apisite/Startup.cs +++ b/src/AgileConfig.Server.Apisite/Startup.cs @@ -95,7 +95,8 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddOpenTelemetry() - .ConfigureResource(resource => resource.AddService(Program.AppName)) + .ConfigureResource(resource => resource.AddService(Program.AppName, + null, null, string.IsNullOrEmpty(Appsettings.OtlpInstanceId), Appsettings.OtlpInstanceId)) .AddOtlpTraces() .AddOtlpMetrics(); } diff --git a/src/AgileConfig.Server.Apisite/agile_config.db-journal b/src/AgileConfig.Server.Apisite/agile_config.db-journal deleted file mode 100644 index 504ed9d0..00000000 Binary files a/src/AgileConfig.Server.Apisite/agile_config.db-journal and /dev/null differ diff --git a/src/AgileConfig.Server.Apisite/appsettings.Development.json b/src/AgileConfig.Server.Apisite/appsettings.Development.json index ec215cae..4c5077e8 100644 --- a/src/AgileConfig.Server.Apisite/appsettings.Development.json +++ b/src/AgileConfig.Server.Apisite/appsettings.Development.json @@ -8,6 +8,7 @@ } }, "otlp": { + "instanceId": "agileconfig server -1", // if empty, will generate a new one "logs": { "protocol": "http", // http grpc "endpoint": "http://192.168.0.201:5341/ingest/otlp/v1/logs" diff --git a/src/AgileConfig.Server.Apisite/appsettings.json b/src/AgileConfig.Server.Apisite/appsettings.json index 761cbbd1..ba6d242a 100644 --- a/src/AgileConfig.Server.Apisite/appsettings.json +++ b/src/AgileConfig.Server.Apisite/appsettings.json @@ -8,6 +8,7 @@ } }, "otlp": { + "instanceId": "", // if empty, will generate a new one "logs": { "protocol": "http", // http grpc "endpoint": ""