Skip to content

Bump OpenTelemetry.Instrumentation.Http from 1.12.0 to 1.15.1 #1756

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

Open
dependabot wants to merge 5 commits into
base: master
Choose a base branch
from
+9 −7
Open

Bump OpenTelemetry.Instrumentation.Http from 1.12.0 to 1.15.1 #1756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c1e363
Bump OpenTelemetry.Instrumentation.Http from 1.12.0 to 1.15.1
dependabot[bot] May 4, 2026
9dc5183
test: retry pod update on conflict in ClientSet e2e test
Copilot May 6, 2026
7ba3c07
test: clarify conflict retry attempt count in ClientSet test
Copilot May 6, 2026
213238c
test: assert pod update succeeds after conflict retries
Copilot May 6, 2026
a6ab926
Merge origin/master and resolve MinikubeTests conflict
Copilot May 10, 2026
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
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
<PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
<PackageVersion Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.4" />
Expand Down
14 changes: 8 additions & 6 deletions tests/E2E.Tests/MinikubeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,23 +752,25 @@ await clientSet.CoreV1.Pod

// replace + get (retry on conflict due to Kubernetes optimistic concurrency)
{
var retries = 5;
while (retries-- > 0)
const int maxAttempts = 5;
var updated = false;
for (var attempt = 1; attempt <= maxAttempts; attempt++)
{
var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false);
pod.Spec.Containers[0].Image = "httpd";
try
{
var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false);
pod.Spec.Containers[0].Image = "httpd";
await clientSet.CoreV1.Pod.UpdateAsync(pod, podName, namespaceParameter).ConfigureAwait(false);
updated = true;
break;
}
catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict)
catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict && attempt < maxAttempts)
{
if (retries == 0) throw;
await Task.Delay(TimeSpan.FromSeconds(1)).ConfigureAwait(false);
}
}

Assert.True(updated, "Failed to update pod after retries due to conflicts.");
var updatedPod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false);
Assert.Equal("httpd", updatedPod.Spec.Containers[0].Image);
}
Expand Down
Loading