Skip to content

Commit 94f67d8

Browse files
authored
Revert "[sdk] Use reflection and dynamic types to start providers (#4151)" (#4173)
This reverts commit b549e12.
1 parent 287295f commit 94f67d8

File tree

42 files changed

+636
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+636
-663
lines changed

build/Common.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
<MicrosoftCodeCoveragePkgVer>[17.4.1]</MicrosoftCodeCoveragePkgVer>
3838
<MicrosoftExtensionsDependencyInjectionPkgVer>[3.1.0,)</MicrosoftExtensionsDependencyInjectionPkgVer>
3939
<MicrosoftExtensionsDependencyInjectionAbstractionsPkgVer>$(MicrosoftExtensionsDependencyInjectionPkgVer)</MicrosoftExtensionsDependencyInjectionAbstractionsPkgVer>
40-
<MicrosoftExtensionsHostingPkgVer>[2.1.0,)</MicrosoftExtensionsHostingPkgVer>
41-
<MicrosoftExtensionsHostingAbstractionsPkgVer>$(MicrosoftExtensionsHostingPkgVer)</MicrosoftExtensionsHostingAbstractionsPkgVer>
40+
<MicrosoftExtensionsHostingAbstractionsPkgVer>[2.1.0,)</MicrosoftExtensionsHostingAbstractionsPkgVer>
4241
<MicrosoftExtensionsLoggingPkgVer>[3.1.0,)</MicrosoftExtensionsLoggingPkgVer>
4342
<MicrosoftExtensionsLoggingConfigurationPkgVer>$(MicrosoftExtensionsLoggingPkgVer)</MicrosoftExtensionsLoggingConfigurationPkgVer>
4443
<MicrosoftExtensionsOptionsPkgVer>[3.1.0,)</MicrosoftExtensionsOptionsPkgVer>

docs/trace/getting-started-aspnetcore/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
.AddService(serviceName: "OTel.NET Getting Started"))
2828
.WithTracing(builder => builder
2929
.AddAspNetCoreInstrumentation()
30-
.AddConsoleExporter());
30+
.AddConsoleExporter())
31+
.StartWithHost();
3132

3233
var app = appBuilder.Build();
3334

docs/trace/getting-started-aspnetcore/getting-started-aspnetcore.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup>
1010
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
11+
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Hosting\OpenTelemetry.Extensions.Hosting.csproj" />
1112
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNetCore\OpenTelemetry.Instrumentation.AspNetCore.csproj" />
1213
</ItemGroup>
1314

examples/AspNetCore/Examples.AspNetCore.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13+
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Hosting\OpenTelemetry.Extensions.Hosting.csproj" />
1314
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
1415
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.OpenTelemetryProtocol\OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj" />
1516
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.csproj" />

examples/AspNetCore/Program.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
// for manual instrumentation
4545
appBuilder.Services.AddSingleton<Instrumentation>();
4646

47-
// Configure OpenTelemetry tracing & metrics.
47+
// Configure OpenTelemetry tracing & metrics with auto-start using the
48+
// StartWithHost extension from OpenTelemetry.Extensions.Hosting.
4849
appBuilder.Services.AddOpenTelemetry()
4950
.ConfigureResource(configureResource)
5051
.WithTracing(builder =>
@@ -126,7 +127,8 @@
126127
builder.AddConsoleExporter();
127128
break;
128129
}
129-
});
130+
})
131+
.StartWithHost();
130132

131133
// Clear default logging providers used by WebApplication host.
132134
appBuilder.Logging.ClearProviders();

examples/GrpcService/Examples.GrpcService.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
1717
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Jaeger\OpenTelemetry.Exporter.Jaeger.csproj" />
1818
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Zipkin\OpenTelemetry.Exporter.Zipkin.csproj" />
19+
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Hosting\OpenTelemetry.Extensions.Hosting.csproj" />
1920
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNetCore\OpenTelemetry.Instrumentation.AspNetCore.csproj" />
2021
</ItemGroup>
2122

examples/GrpcService/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public void ConfigureServices(IServiceCollection services)
6161
builder.AddConsoleExporter();
6262
break;
6363
}
64-
});
64+
})
65+
.StartWithHost();
6566
}
6667

6768
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

examples/MicroserviceExample/WebApi/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public void ConfigureServices(IServiceCollection services)
4343
{
4444
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
4545
b.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
46-
}));
46+
}))
47+
.StartWithHost();
4748
}
4849

4950
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

examples/MicroserviceExample/WebApi/WebApi.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<ItemGroup>
1111
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNetCore\OpenTelemetry.Instrumentation.AspNetCore.csproj" />
1212
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Zipkin\OpenTelemetry.Exporter.Zipkin.csproj" />
13+
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Hosting\OpenTelemetry.Extensions.Hosting.csproj" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

examples/MicroserviceExample/WorkerService/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
4242
{
4343
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
4444
b.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
45-
}));
45+
}))
46+
.StartWithHost();
4647
});
4748
}
4849
}

0 commit comments

Comments
 (0)