Skip to content

Commit 74212a2

Browse files
authored
[sdk+hosting] Move AddOpenTelemetry & OpenTelemetryBuilder into Hosting package (#4174)
* Move AddOpenTelemetry & OpenTelemetryBuilder into Hosting package. * Added Azure Functions warning. * Test fixes. * Test fixes. * Patch CHANGELOGs. * Hosting README updates. * Comment tweak. * Clean up. * Test cleanup. * MD lint. * Test fixes.
1 parent 94f67d8 commit 74212a2

File tree

40 files changed

+499
-747
lines changed

40 files changed

+499
-747
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// </copyright>
1616

1717
using System.Diagnostics;
18-
using OpenTelemetry;
1918
using OpenTelemetry.Resources;
2019
using OpenTelemetry.Trace;
2120

@@ -27,8 +26,7 @@
2726
.AddService(serviceName: "OTel.NET Getting Started"))
2827
.WithTracing(builder => builder
2928
.AddAspNetCoreInstrumentation()
30-
.AddConsoleExporter())
31-
.StartWithHost();
29+
.AddConsoleExporter());
3230

3331
var app = appBuilder.Build();
3432

examples/AspNetCore/Program.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// </copyright>
1616

1717
using Examples.AspNetCore;
18-
using OpenTelemetry;
1918
using OpenTelemetry.Exporter;
2019
using OpenTelemetry.Instrumentation.AspNetCore;
2120
using OpenTelemetry.Logs;
@@ -45,7 +44,7 @@
4544
appBuilder.Services.AddSingleton<Instrumentation>();
4645

4746
// Configure OpenTelemetry tracing & metrics with auto-start using the
48-
// StartWithHost extension from OpenTelemetry.Extensions.Hosting.
47+
// AddOpenTelemetry extension from OpenTelemetry.Extensions.Hosting.
4948
appBuilder.Services.AddOpenTelemetry()
5049
.ConfigureResource(configureResource)
5150
.WithTracing(builder =>
@@ -127,8 +126,7 @@
127126
builder.AddConsoleExporter();
128127
break;
129128
}
130-
})
131-
.StartWithHost();
129+
});
132130

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

examples/GrpcService/Startup.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// limitations under the License.
1515
// </copyright>
1616

17-
using OpenTelemetry;
1817
using OpenTelemetry.Resources;
1918
using OpenTelemetry.Trace;
2019

@@ -61,8 +60,7 @@ public void ConfigureServices(IServiceCollection services)
6160
builder.AddConsoleExporter();
6261
break;
6362
}
64-
})
65-
.StartWithHost();
63+
});
6664
}
6765

6866
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

examples/MicroserviceExample/WebApi/Startup.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// limitations under the License.
1515
// </copyright>
1616

17-
using OpenTelemetry;
1817
using OpenTelemetry.Trace;
1918
using Utils.Messaging;
2019

@@ -43,8 +42,7 @@ public void ConfigureServices(IServiceCollection services)
4342
{
4443
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
4544
b.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
46-
}))
47-
.StartWithHost();
45+
}));
4846
}
4947

5048
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

examples/MicroserviceExample/WorkerService/Program.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// limitations under the License.
1515
// </copyright>
1616

17-
using OpenTelemetry;
1817
using OpenTelemetry.Trace;
1918
using Utils.Messaging;
2019

@@ -42,8 +41,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
4241
{
4342
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";
4443
b.Endpoint = new Uri($"http://{zipkinHostName}:9411/api/v2/spans");
45-
}))
46-
.StartWithHost();
44+
}));
4745
});
4846
}
4947
}

src/OpenTelemetry.Exporter.Jaeger/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ services.AddOpenTelemetry()
9898
client.DefaultRequestHeaders.Add("X-MyCustomHeader", "value");
9999
return client;
100100
};
101-
}))
102-
.StartWithHost();
101+
}));
103102
```
104103

105104
For users using

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ services.AddOpenTelemetry()
135135
client.DefaultRequestHeaders.Add("X-MyCustomHeader", "value");
136136
return client;
137137
};
138-
}))
139-
.StartWithHost();
138+
}));
140139
```
141140

142141
For users using

src/OpenTelemetry.Exporter.Prometheus.AspNetCore/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ dotnet add package --prerelease OpenTelemetry.Exporter.Prometheus.AspNetCore
2828
```csharp
2929
services.AddOpenTelemetry()
3030
.WithMetrics(builder => builder
31-
.AddPrometheusExporter())
32-
.StartWithHost();
31+
.AddPrometheusExporter());
3332
```
3433

3534
* Or configure directly:

src/OpenTelemetry.Exporter.Zipkin/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ services.AddOpenTelemetry()
8787
HttpClient client = new HttpClient();
8888
client.DefaultRequestHeaders.Add("X-MyCustomHeader", "value");
8989
return client;
90-
}))
91-
.StartWithHost();
90+
}));
9291
```
9392

9493
For users using
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable

0 commit comments

Comments
 (0)