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

otlp: Prometheus to own its own copy of the otlptranslator package #13991

Merged

Conversation

jesusvazquez
Copy link
Member

Relates to #13842

After a lot of productive discussion between the Prometheus and OpenTelemetry community we decided that it made sense for Prometheus to own its own copy of the code in charge for handling OTLP ingestion traffic.

This commit is removing the README and update-copy.sh files that had the previous steps to update the code.

Also it is updating the licensing of all the files to make sure the OpenTelemetry provenance is explicit and to state the new ownership.

Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏽

Copy link
Contributor

@aknuds1 aknuds1 left a comment

Choose a reason for hiding this comment

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

LGTM, assuming the Provenance-includes-* headers are confirmed :)

@jesusvazquez
Copy link
Member Author

Yes, I just want to make sure I'm doing it right before merging 👍

@aknuds1 aknuds1 changed the title otlp: Prometheus to own its own copy of the otlptrranslator package otlp: Prometheus to own its own copy of the otlptranslator package Apr 26, 2024
@aknuds1
Copy link
Contributor

aknuds1 commented Apr 26, 2024

@jesusvazquez could you fix the typo in the commit message (otlptrranslator)? It's kind of a charming typo, but still :D

Relates to #13842

After a lot of productive discussion between the Prometheus and
OpenTelemetry community we decided that it made sense for Prometheus to
own its own copy of the code in charge for handling OTLP ingestion
traffic.

This commit is removing the README and update-copy.sh files that had the
previous steps to update the code.

Also it is updating the licensing of all the files to make sure the
OpenTelemetry provenance is explicit and to state the new ownership.

Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
@jesusvazquez jesusvazquez force-pushed the jvp/update-otlptranslator-code-to-be-owned-by-prometheus branch from ad17b79 to 6f396be Compare April 26, 2024 10:14
@jesusvazquez
Copy link
Member Author

Just did 👍

This commit updates all the files to 95e8f8fdc2a9dc87230406c9a3cf02be4fd68bea
in the opentelemetry-collector-contrib repo.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
@jesusvazquez jesusvazquez force-pushed the jvp/update-otlptranslator-code-to-be-owned-by-prometheus branch from 1af3655 to 8e9818e Compare April 30, 2024 09:11
@jesusvazquez jesusvazquez marked this pull request as ready for review April 30, 2024 09:22
@jesusvazquez jesusvazquez merged commit 7554384 into main Apr 30, 2024
40 checks passed
@jesusvazquez jesusvazquez deleted the jvp/update-otlptranslator-code-to-be-owned-by-prometheus branch April 30, 2024 09:29
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

5 participants