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

add support for proxy #8339

Merged
merged 13 commits into from
Nov 22, 2023
Merged

add support for proxy #8339

merged 13 commits into from
Nov 22, 2023

Conversation

hrittikhere
Copy link
Contributor

Description: <Describe what has changed.
Adding a feature to support proxy configuration field in all exporters

Link to tracking Issue: #5761

Testing: < Describe what testing was performed and which tests were added.>

Documentation: < Describe the documentation added.>

Signed-off-by: Hrittik Roy <[email protected]>
@hrittikhere hrittikhere requested review from a team and jpkrohling August 30, 2023 15:43
@hrittikhere hrittikhere marked this pull request as draft August 30, 2023 15:43
config/confighttp/confighttp.go Outdated Show resolved Hide resolved
config/confighttp/confighttp.go Show resolved Hide resolved
Co-authored-by: Juraci Paixão Kröhling <[email protected]>
Signed-off-by: Hrittik Roy <[email protected]>
@jpkrohling
Copy link
Member

@hrittikhere, do you have an status update regarding this one?

@hrittikhere hrittikhere marked this pull request as ready for review September 13, 2023 07:19
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
Copy link
Member

@hrittikhere, are you able to fix the merge conflicts?

@hrittikhere
Copy link
Contributor Author

@jpkrohling does this looks good?

@hrittikhere
Copy link
Contributor Author

@jpkrohling did you get a chance to look into it? Let me know if there's any changes :)

@jpkrohling
Copy link
Member

LGTM!

@jpkrohling jpkrohling added the ready-to-merge Code review completed; ready to merge by maintainers label Oct 5, 2023
@codecov
Copy link

codecov bot commented Oct 5, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (d77d2c2) 90.31% compared to head (913468e) 91.55%.
Report is 138 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8339      +/-   ##
==========================================
+ Coverage   90.31%   91.55%   +1.24%     
==========================================
  Files         308      316       +8     
  Lines       15998    17117    +1119     
==========================================
+ Hits        14448    15672    +1224     
+ Misses       1259     1150     -109     
- Partials      291      295       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jpkrohling jpkrohling removed the ready-to-merge Code review completed; ready to merge by maintainers label Oct 5, 2023
@jpkrohling
Copy link
Member

Apparently, there's still a linting failure:

make[2]: Entering directory '/home/runner/work/opentelemetry-collector/opentelemetry-collector/config/confighttp'
/home/runner/work/opentelemetry-collector/opentelemetry-collector/.tools/golangci-lint run
confighttp.go:147: File is not `gofmt`-ed with `-s` (gofmt)
make[2]: *** [../../Makefile.Common:74: lint] Error 1
make[1]: *** [Makefile:123: config/confighttp] Error 2
make[1]: *** Waiting for unfinished jobs....
  
Error: confighttp.go:1[41](https://github.com/open-telemetry/opentelemetry-collector/actions/runs/6330517394/job/17424908838?pr=8339#step:5:42):13: shadow: declaration of "err" shadows declaration at line 108 (govet)
		proxyURL, err := url.Parse(hcs.ProxyURL)

@andrzej-stencel
Copy link
Member

andrzej-stencel commented Oct 5, 2023

@github-actions
Copy link
Contributor

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@github-actions github-actions bot added the Stale label Oct 20, 2023
@hrittikhere
Copy link
Contributor Author

Sure I'll add the changelog entry over the weekend. Sorry I missed the comments :(

@github-actions github-actions bot removed the Stale label Oct 21, 2023
@hrittikhere
Copy link
Contributor Author

I tried fixing the lint and I think it works. Maybe we can re run?

[build-and-test/lint             ]   ✅  Success - Main goimpi
[build-and-test/lint             ] ⭐ Run Post Cache Go
[build-and-test/lint             ]   🐳  docker exec cmd=[node /var/run/act/actions/actions-cache@v3/dist/save/index.js] user= workdir=
[build-and-test/lint             ]   💬  ::debug::Cache state/key: go-cache-linux-54ab5a16ba9fdf26f1dc2d13615853606f75f614eb63f91ef59afcc63707bb55
| Cache hit occurred on the primary key go-cache-Linux-54ab5a16ba9fdf26f1dc2d13615853606f75f614eb63f91ef59afcc63707bb55, not saving cache.
[build-and-test/lint             ]   ✅  Success - Post Cache Go
[build-and-test/lint             ] ⭐ Run Post Setup Go
[build-and-test/lint             ]   🐳  docker exec cmd=[node /var/run/act/actions/actions-setup-go@v4/dist/cache-save/index.js] user= workdir=
| [command]/opt/hostedtoolcache/go/1.20.10/x64/bin/go env GOMODCACHE
| [command]/opt/hostedtoolcache/go/1.20.10/x64/bin/go env GOCACHE
| /root/go/pkg/mod
| /root/.cache/go-build
[build-and-test/lint             ]   💬  ::debug::Checking zstd --quiet --version
[build-and-test/lint             ]   💬  ::debug::1.4.8
[build-and-test/lint             ]   💬  ::debug::zstd version: 1.4.8
[build-and-test/lint             ]   💬  ::debug::implicitDescendants 'false'
[build-and-test/lint             ]   💬  ::debug::followSymbolicLinks 'true'
[build-and-test/lint             ]   💬  ::debug::implicitDescendants 'false'
[build-and-test/lint             ]   💬  ::debug::omitBrokenSymbolicLinks 'true'
[build-and-test/lint             ]   💬  ::debug::Search path '/root/go/pkg/mod'
[build-and-test/lint             ]   💬  ::debug::Search path '/root/.cache/go-build'
[build-and-test/lint             ]   💬  ::debug::Matched: ../../root/go/pkg/mod
[build-and-test/lint             ]   💬  ::debug::Matched: ../../root/.cache/go-build
[build-and-test/lint             ]   💬  ::debug::Cache Paths:
[build-and-test/lint             ]   💬  ::debug::["../../root/go/pkg/mod","../../root/.cache/go-build"]
[build-and-test/lint             ]   💬  ::debug::Archive Path: /tmp/236e3b8b-ebb9-41b0-b8ee-c3d54308cc3d/cache.tzst
| [command]/usr/bin/tar --posix -cf cache.tzst --exclude cache.tzst -P -C /workspaces/opentelemetry-collector --files-from manifest.txt --use-compress-program zstdmt
[build-and-test/lint             ]   💬  ::debug::File Size: 357739713
[build-and-test/lint             ]   💬  ::debug::Reserving Cache
[build-and-test/lint             ]   💬  ::debug::Resource Url: http://172.16.5.4:43717/_apis/artifactcache/caches
ERRO[0486] POST /_apis/artifactcache/caches: already exist  module=artifactcache
[build-and-test/lint             ]   🚧  ::warning::Failed to save: {"error":"already exist"}
[build-and-test/lint             ]   ✅  Success - Post Setup Go
[build-and-test/lint             ] 🏁  Job succeeded

@jpkrohling
Copy link
Member

Sure, build started!

@hrittikhere
Copy link
Contributor Author

I think we're good to go? The build-and-test / test-coverage (pull_request) Failing after 6m fails, but we have tests in place? :)

@jpkrohling
Copy link
Member

jpkrohling commented Oct 23, 2023

We just need an @open-telemetry/collector-maintainers to review and push the button!

.chloggen/proxy.yaml Outdated Show resolved Hide resolved
.chloggen/proxy.yaml Outdated Show resolved Hide resolved
hrittikhere and others added 2 commits October 26, 2023 22:08
@hrittikhere hrittikhere requested a review from codeboten October 26, 2023 16:38
Copy link
Contributor

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@hrittikhere
Copy link
Contributor Author

Can we run the test coverage once more? :)

@dmitryax dmitryax merged commit 3ce3aac into open-telemetry:main Nov 22, 2023
32 checks passed
@github-actions github-actions bot added this to the next release milestone Nov 22, 2023
@jpkrohling
Copy link
Member

Thank you for your patience and perseverance, @hrittikhere .

@hrittikhere
Copy link
Contributor Author

Thanks @jpkrohling for the help throughout! Couldn't have done it without you :)

pantuza pushed a commit to pantuza/opentelemetry-collector that referenced this pull request Dec 8, 2023
**Description:**
Adding a feature to support proxy configuration field in all exporters

**Link to tracking Issue:**
open-telemetry#5761

---------

Signed-off-by: Hrittik Roy <[email protected]>
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Co-authored-by: Juraci Paixão Kröhling <[email protected]>
Co-authored-by: Juraci Paixão Kröhling <[email protected]>
Co-authored-by: Andrzej Stencel <[email protected]>
Co-authored-by: Alex Boten <[email protected]>
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.

7 participants