Skip to content
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.

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

Show Promitor version during startup #1275

Merged
merged 2 commits into from
Sep 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog/content/experimental/unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ version:
- {{% tag added %}} New validation rule to ensure declarative or dynamic discovery for metrics to scrape are configured
- {{% tag added %}} New System API endpoint giving runtime information ([docs](https://promitor.io/operations/#system)
| [#1208](https://github.com/tomkerkhove/promitor/issues/1208))
- {{% tag changed %}} Show Promitor version during startup
- {{% tag changed %}} Provide capability to scrape all queues in Azure Service Bus, instead of having to declare the
queue name. ([#529](https://github.com/tomkerkhove/promitor/issues/529)).
- {{% tag changed %}} Handle validation failures on startup more gracefully. ([#1113](https://github.com/tomkerkhove/promitor/issues/1113) | Contributed by [@adamconnelly](https://github.com/adamconnelly) 🎉).
Expand Down
16 changes: 15 additions & 1 deletion src/Promitor.Agents.Core/AgentProgram.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using GuardNet;
using System;
using GuardNet;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Promitor.Agents.Core.Configuration.Server;
using Serilog;
using Version = Promitor.Core.Version;

namespace Promitor.Agents.Core
{
Expand Down Expand Up @@ -51,10 +53,22 @@ protected static int DetermineHttpPort(ServerConfiguration serverConfiguration)
/// </summary>
protected static void ConfigureStartupLogging()
{
string agentVersion = Version.Get();
Log.Logger = new LoggerConfiguration()
.Enrich.FromLogContext()
.Enrich.WithProperty("Version", agentVersion)
.WriteTo.Console()
.CreateLogger();
}

/// <summary>
/// Welcome our users and boot up!
/// </summary>
protected static void Welcome()
{
string agentVersion = Version.Get();
Console.WriteLine(Constants.Texts.Welcome);
Log.Logger.Information($"Booting up Promitor v{agentVersion} - Thank you for using Promitor!");
}
}
}
9 changes: 2 additions & 7 deletions src/Promitor.Agents.ResourceDiscovery/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ public static int Main(string[] args)
{
try
{
Welcome();

// Let's hook in a logger for start-up purposes.
ConfigureStartupLogging();

Welcome();

var configurationFolder = Environment.GetEnvironmentVariable(EnvironmentVariables.Configuration.Folder);
if (string.IsNullOrWhiteSpace(configurationFolder))
{
Expand Down Expand Up @@ -65,11 +65,6 @@ public static int Main(string[] args)
}
}

private static void Welcome()
{
Console.WriteLine(Constants.Texts.Welcome);
}

public static IHostBuilder CreateHostBuilder(string[] args, string configurationFolder)
{
IConfiguration configuration = BuildConfiguration(args, configurationFolder);
Expand Down
10 changes: 2 additions & 8 deletions src/Promitor.Agents.Scraper/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Promitor.Agents.Core.Validation;
using Promitor.Core;
using Serilog;
using Constants = Promitor.Agents.Core.Constants;

namespace Promitor.Agents.Scraper
{
Expand All @@ -19,11 +18,11 @@ public static int Main(string[] args)
{
try
{
Welcome();

// Let's hook in a logger for start-up purposes.
ConfigureStartupLogging();

Welcome();

var configurationFolder = Environment.GetEnvironmentVariable(EnvironmentVariables.Configuration.Folder);
Log.Logger.Information($"Using configuration folder '{configurationFolder}'");
if (string.IsNullOrWhiteSpace(configurationFolder))
Expand Down Expand Up @@ -67,11 +66,6 @@ public static int Main(string[] args)
}
}

private static void Welcome()
{
Console.WriteLine(Constants.Texts.Welcome);
}

public static IHostBuilder CreateHostBuilder(string[] args, string configurationFolder)
{
IConfiguration configuration = BuildConfiguration(configurationFolder);
Expand Down