Skip to content

[Traces] Support named options in HttpClient instrumentation #3664

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.

Sign up for GitHub

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

Merged
CodeBlanch merged 4 commits into from
Sep 15, 2022
Merged

[Traces] Support named options in HttpClient instrumentation #3664

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0988a82
Enabled named options in httpclient instrumentation.
CodeBlanch Sep 14, 2022
c13c462
Tests.
CodeBlanch Sep 14, 2022
16e8b82
CHANGELOG update.
CodeBlanch Sep 14, 2022
c1ed5f3
Merge branch 'main' into httpclient-namedoptions
cijothomas Sep 15, 2022
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
Prev Previous commit
Next Next commit
Tests.
  • Loading branch information
@CodeBlanch
CodeBlanch committed Sep 14, 2022
commit c13c4629290c3a979bbe6218d0d34e06c16700e8
22 changes: 22 additions & 0 deletions test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Instrumentation.Http.Implementation;
Expand Down Expand Up @@ -47,6 +48,27 @@ public HttpClientTests()
this.url = $"http://{host}:{port}/";
}

[Fact]
public void AddHttpClientInstrumentation_NamedOptions()
{
int defaultExporterOptionsConfigureOptionsInvocations = 0;
int namedExporterOptionsConfigureOptionsInvocations = 0;

using var tracerProvider = Sdk.CreateTracerProviderBuilder()
.ConfigureServices(services =>
{
services.Configure<HttpClientInstrumentationOptions>(o => defaultExporterOptionsConfigureOptionsInvocations++);

services.Configure<HttpClientInstrumentationOptions>("Instrumentation2", o => namedExporterOptionsConfigureOptionsInvocations++);
})
.AddHttpClientInstrumentation()
.AddHttpClientInstrumentation("Instrumentation2", configureHttpClientInstrumentationOptions: null)
.Build();

Assert.Equal(1, defaultExporterOptionsConfigureOptionsInvocations);
Assert.Equal(1, namedExporterOptionsConfigureOptionsInvocations);
}

[Fact]
public void AddHttpClientInstrumentation_BadArgs()
{
Expand Down