Skip to content
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.

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

Merging 1.18 back to main #1414

Merged
merged 3 commits into from
Dec 28, 2023
Merged

Merging 1.18 back to main #1414

merged 3 commits into from
Dec 28, 2023

Conversation

ArthurSens
Copy link
Member

No description provided.

ArthurSens and others added 3 commits December 27, 2023 20:00
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
(cherry picked from commit 2280fb1)

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
// a new http.Client based on the provided RoundTripper (or DefaultRoundTripper) will be used.
Client HttpClient
// a new one based on the provided RoundTripper (or DefaultRoundTripper) will be used.
Client *http.Client
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is weird, why we see this change again given 96f1aec

Like I see on main we have *http.Client as it should be already https://github.com/prometheus/client_golang/blob/main/api/client.go#L46

🤔

Something is off

Copy link
Member

@bwplotka bwplotka Dec 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try anyway, but this has little sense, this file shouldn't change.

@bwplotka bwplotka merged commit a88230e into main Dec 28, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants