mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 05:34:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
prometheus/storage/remote/otlptranslator
History
Goutham a99f48cc9f
Bump OTel Collector dependency to v0.88.0 
I initially didn't copy the otlptranslator/prometheus folder because I
assumed it wouldn't get changes. But it did. So this PR fixes that and
updates the Collector version.

Supersedes: https://github.com/prometheus/prometheus/pull/12809

Signed-off-by: Goutham <gouthamve@gmail.com>
2023-11-15 15:18:14 +01:00
..
prometheus Bump OTel Collector dependency to v0.88.0 2023-11-15 15:18:14 +01:00
prometheusremotewrite Bump OTel Collector dependency to v0.88.0 2023-11-15 15:18:14 +01:00
README.md Add OTLP Ingestion endpoint (#12571) 2023-07-28 12:35:28 +02:00
update-copy.sh Bump OTel Collector dependency to v0.88.0 2023-11-15 15:18:14 +01:00

README.md

Copying from opentelemetry/opentelemetry-collector-contrib

This files in the prometheus/ and prometheusremotewrite/ are copied from the OpenTelemetry Project1.

This is done instead of adding a go.mod dependency because OpenTelemetry depends on prometheus/prometheus and a cyclic dependency will be created. This is just a temporary solution and the long-term solution is to move the required packages from OpenTelemetry into prometheus/prometheus. We don't copy in ./prometheus through this script because that package imports a collector specific featuregate package we don't want to import. The featuregate package is being removed now, and in the future we will copy this folder too.

To update the dependency is a multi-step process:

  1. Vendor the latest prometheus/prometheus@main into opentelemetry/opentelemetry-collector-contrib
  2. Update the VERSION in update-copy.sh.
  3. Run ./update-copy.sh.

Why copy?

This is because the packages we copy depend on the prompb package. While the package is relatively stable, there are still changes. For example, https://github.com/prometheus/prometheus/pull/11935 changed the types. This means if we depend on the upstream packages directly, we will never able to make the changes like above. Hence we're copying the code for now.

I need to manually change these files

When we do want to make changes to the types in prompb, we might need to edit the files directly. That is OK, please let @gouthamve or @jesusvazquez know so they can take care of updating the upstream code (by vendoring in prometheus/prometheus upstream and resolving conflicts) and then will run the copy script again to keep things updated.