Skip to content

Commit fbbe939

Browse files
authored
[Examples.Microservice] migrate to Minimal Hosting Model (#6247)
1 parent 7c0eab2 commit fbbe939

File tree

3 files changed

+44
-85
lines changed

3 files changed

+44
-85
lines changed
Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
namespace WebApi;
4+
using OpenTelemetry.Trace;
5+
using Utils.Messaging;
56

6-
internal static class Program
7+
var builder = WebApplication.CreateBuilder(args);
8+
9+
builder.Services.AddControllers();
10+
11+
builder.Services.AddSingleton<MessageSender>();
12+
13+
builder.Services.AddOpenTelemetry()
14+
.WithTracing(b => b
15+
.AddAspNetCoreInstrumentation()
16+
.AddSource(nameof(MessageSender))
17+
.AddZipkinExporter(o =>
18+
{
19+
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
20+
o.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
21+
}));
22+
23+
builder.WebHost.UseUrls("http://*:5000");
24+
25+
var app = builder.Build();
26+
27+
if (app.Environment.IsDevelopment())
728
{
8-
public static void Main(string[] args)
9-
{
10-
CreateHostBuilder(args).Build().Run();
11-
}
12-
13-
public static IHostBuilder CreateHostBuilder(string[] args) =>
14-
Host.CreateDefaultBuilder(args)
15-
.ConfigureWebHostDefaults(webBuilder =>
16-
{
17-
webBuilder.UseUrls("http://*:5000").UseStartup<Startup>();
18-
});
29+
app.UseDeveloperExceptionPage();
1930
}
31+
32+
app.UseRouting();
33+
34+
app.MapControllers();
35+
36+
app.Run();

examples/MicroserviceExample/WebApi/Startup.cs

Lines changed: 0 additions & 49 deletions
This file was deleted.

examples/MicroserviceExample/WorkerService/Program.cs

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,22 @@
33

44
using OpenTelemetry.Trace;
55
using Utils.Messaging;
6+
using WorkerService;
67

7-
namespace WorkerService;
8+
var builder = Host.CreateApplicationBuilder(args);
89

9-
internal static class Program
10-
{
11-
public static void Main(string[] args)
12-
{
13-
CreateHostBuilder(args).Build().Run();
14-
}
10+
builder.Services.AddHostedService<Worker>();
11+
builder.Services.AddSingleton<MessageReceiver>();
1512

16-
public static IHostBuilder CreateHostBuilder(string[] args) =>
17-
Host.CreateDefaultBuilder(args)
18-
.ConfigureServices((hostContext, services) =>
19-
{
20-
services.AddHostedService<Worker>();
13+
builder.Services.AddOpenTelemetry()
14+
.WithTracing(b => b
15+
.AddSource(nameof(MessageReceiver))
16+
.AddZipkinExporter(o =>
17+
{
18+
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
19+
o.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
20+
}));
2121

22-
services.AddSingleton<MessageReceiver>();
22+
var app = builder.Build();
2323

24-
services.AddOpenTelemetry()
25-
.WithTracing(builder => builder
26-
.AddSource(nameof(MessageReceiver))
27-
.AddZipkinExporter(b =>
28-
{
29-
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
30-
b.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
31-
}));
32-
});
33-
}
24+
app.Run();

0 commit comments

Comments
 (0)