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

OpenTelemetry Protocol with Apache Arrow Receiver component #32015

Merged
merged 28 commits into from
Apr 24, 2024

Conversation

jmacd
Copy link
Contributor

@jmacd jmacd commented Mar 27, 2024

Description:

This is the same code as OTel-Arrow at 14c63d1eaac7c53585e6b9195d09f1f9703869ed, at which point lint fixes required for this repository were applied. Only import statements change here, to match the host repository.

Link to tracking Issue: #26491

Testing: Test coverage is approximately 90%.

Documentation: I double-checked and the existing README, no changes required.

@jmacd jmacd marked this pull request as ready for review March 27, 2024 21:43
@jmacd jmacd requested review from a team and atoulme March 27, 2024 21:43
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

thanks for continuing to push this work forward @jmacd, just a couple of questions. Please resolve the conflicts and we can move this forward.

receiver/otelarrowreceiver/factory.go Outdated Show resolved Hide resolved
receiver/otelarrowreceiver/config_test.go Outdated Show resolved Hide resolved
receiver/otelarrowreceiver/config_test.go Outdated Show resolved Hide resolved
@jmacd
Copy link
Contributor Author

jmacd commented Apr 12, 2024

Will re-open this.

@jmacd jmacd closed this Apr 12, 2024
@jmacd jmacd reopened this Apr 22, 2024
@github-actions github-actions bot added the cmd/otelcontribcol otelcontribcol command label Apr 22, 2024
@codeboten
Copy link
Contributor

Needs a make genotelcontribcol

@jmacd
Copy link
Contributor Author

jmacd commented Apr 23, 2024

Generated code is out of date, please run "make genotelcontribcol" and commit the changes in this PR.

Somehow make genotelcontribcol is doing nothing for me, locally. 😭

@codeboten
Copy link
Contributor

@jmacd hmmm.... the same thing on my end, will take a look to see what's going on

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
@codeboten
Copy link
Contributor

@jmacd the problem is caused by CICD using go 1.21.9 when running make genotelcontribcol, which causes a diff in the toolchain:

--- a/cmd/otelcontribcol/go.mod
+++ b/cmd/otelcontribcol/go.mod
@@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib
 
 go 1.21.0
 
-toolchain go1.22.2
+toolchain go1.21.9

I've pushed the change, but if you run make genotelcontribcol locally, it will be set back to 1.22.2 😮‍💨

@codeboten
Copy link
Contributor

Long story short, if you can resolve the last conflict, we can get this merged and never think about it again. Sadly, this new toolchain directive is causing all sorts of problems :(

@codeboten codeboten merged commit 9527fbc into open-telemetry:main Apr 24, 2024
171 checks passed
@github-actions github-actions bot added this to the next release milestone Apr 24, 2024
@jmacd jmacd deleted the jmacd/arrow_receiver branch April 24, 2024 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants