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

Vendor go.opentelemetry.io/collector #4660

Merged
merged 5 commits into from
Feb 1, 2021
Merged

Conversation

axw
Copy link
Member

@axw axw commented Jan 28, 2021

Motivation/summary

Vendor go.opentelemetry.io/collector, with some additional "mixin" sources, into internal/otel_collector. We add a local module replacement to go.mod so we can use the usual import paths.

This is necessary to support registering the OTLP/gRPC services with our gmux'ed gRPC server, as the registration functions are in an inaccessible internal package in go.opentelemetry.io. We mix in some functions to expose them.

The first commit is hand-written, the second commit is the generated output. Reviewers should focus on the first.

How to test these changes

Non-functional change.

Related issues

Required for #4503

@apmmachine
Copy link
Contributor

apmmachine commented Jan 28, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #4660 updated

    • Start Time: 2021-02-01T09:58:42.818+0000
  • Duration: 34 min 41 sec

  • Commit: 34cf17f

Test stats 🧪

Test Results
Failed 0
Passed 4361
Skipped 123
Total 4484

Steps errors 3

Expand to view the steps failures

Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage
Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests
Test Sync
  • Took 4 min 35 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@axw axw force-pushed the vendor-otel-collector branch 4 times, most recently from 5e74568 to 93b2242 Compare January 28, 2021 07:12
Add a script to vendor go.opentelemetry.io/collector,
along with mixin sources in "internal/.otel_collector_mixin",
into "internal/otel_collector". The script will update go.mod
to use this as a local replacement. Run this as part of the
"go-generate" make target.

We also add a requirement on go-licence-detector 0.5.0,
which added support for local module replacements.
@axw axw marked this pull request as ready for review January 28, 2021 08:36
@axw axw requested a review from a team January 28, 2021 08:36
@codecov-io
Copy link

Codecov Report

Merging #4660 (8f1d7d0) into master (1e3112b) will increase coverage by 0.04%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #4660      +/-   ##
==========================================
+ Coverage   76.06%   76.10%   +0.04%     
==========================================
  Files         161      161              
  Lines        9898     9899       +1     
==========================================
+ Hits         7529     7534       +5     
+ Misses       2369     2365       -4     
Impacted Files Coverage Δ
x-pack/apm-server/main.go 0.00% <0.00%> (ø)
...ack/apm-server/aggregation/txmetrics/aggregator.go 93.36% <0.00%> (ø)
kibana/connecting_client.go 70.17% <0.00%> (+8.77%) ⬆️

@axw
Copy link
Member Author

axw commented Feb 1, 2021

jenkins run the tests please

@axw axw merged commit 7ba4079 into elastic:master Feb 1, 2021
@axw axw deleted the vendor-otel-collector branch February 1, 2021 11:51
axw added a commit to axw/apm-server that referenced this pull request Feb 18, 2021
* Support vendoring go.opentelemetry.io/collector

Add a script to vendor go.opentelemetry.io/collector,
along with mixin sources in "internal/.otel_collector_mixin",
into "internal/otel_collector". The script will update go.mod
to use this as a local replacement. Run this as part of the
"go-generate" make target.

We also add a requirement on go-licence-detector 0.5.0,
which added support for local module replacements.

* Vendor go.opentelemetry.io/collector

* Fix goimports
axw added a commit that referenced this pull request Feb 18, 2021
[7.x] Vendor go.opentelemetry.io/collector (#4660)
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.

4 participants