34 Commits

Author	SHA1	Message	Date
Bryan Boreham	36ec1e4fb0	Merge branch 'main' into merge-3.5-into-main ... Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2025-07-14 15:29:00 +01:00
Arthur Silva Sens	4b9d0fb92f	Revert: OTLP Support including scope metadata as metric labels (#16842) ... Reverts #16730 and #16760 This is being done because we've noticed a problem in the spec that could lead to name collisions if attributes name, version or schema_url are added to the scope. They would collide with the already reserved labels otel_scope_name, otel_scope_version and otel_scope_schema_url. Since this new configuration option never made it into a release, we can safely remove it from the 3.5 release. We'll sort this out for the 3.6 release Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>	2025-07-08 10:37:19 +00:00
Arve Knudsen	f561aa795d	OTLP receiver: Generate `target_info` samples between the earliest and latest samples per resource (#16737) ... * OTLP receiver: Generate target_info samples between the earliest and latest samples per resource Modify the OTLP receiver to generate target_info samples between the earliest and latest samples per resource instead of only one for the latest timestamp. The samples are spaced lookback delta/2 apart. --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2025-07-04 14:38:16 +00:00
Arthur Silva Sens	0502f2d8fb	Bump otlptranslator to latest SHA ... Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>	2025-07-02 14:55:51 -03:00
Arve Knudsen	c701636034	OTLP receiver: Rename `otlp.convert_scope_metadata` to `otlp.promote_scope_metadata` (#16760) ... * Rename otlp.convert_scope_metadata to otlp.promote_scope_metadata --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Julius Hinze <juliusmh@proton.me>	2025-06-20 13:09:02 +00:00
Arve Knudsen	964bd7d1a9	OTLP: Support including scope metadata as metric labels (#16730) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2025-06-18 09:13:51 +02:00
Antonio Jimenez	2834a665ed	Add support for promoting all OTel resource attributes (#16426) ... Add support for promoting all OTel resource attributes via `promote_all_resource_attributes`, except for those ignored using 'ignore_resource_attributes'. --------- Signed-off-by: Antonio Jimenez <antonjim@thousandEyes.com> Signed-off-by: Antonio Jimenez <123171955+antonjim-te@users.noreply.github.com>	2025-05-26 18:15:01 +02:00
Arve Knudsen	e7e3ab2824	Fix linting issues found by golangci-lint v2.0.2 (#16368) ... * Fix linting issues found by golangci-lint v2.0.2 --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2025-05-03 19:05:13 +02:00
Fiona Liao	7ec63b1fa1	Add primitive support for ingesting OTLP delta metrics as-is (#16360) ... * Add simple delta support Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Rename delta2cumulative part Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Whoops bad refactor Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add example yml Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Feature flag instead and histogram hint handling Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Delete otel_delta.yml - outdated Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Renaming to native delta support Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add more explanatory comments Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add more explanation to histograms Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Correct comment on d2c consumer Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add tests for counters and fix bug Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add histogram tests Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add docs Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Sort series to make test deterministic Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * More formatting Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Change flag name to ingestion Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Explain where rate calculation can go wrong Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add warning about duplicate timestamps Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Update docs/feature_flags.md Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com> Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Fix tests Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Remove unnecessary if Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Add warning to d2c section Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Make unknown type error when getting temporality Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Correct type comment - not planning to add delta metric metadata type Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Remove unused param for empty type Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Rewrite temporality logic to be clearer Signed-off-by: Fiona Liao <fiona.liao@grafana.com> * Change spurious to unnecessary - better description Signed-off-by: Fiona Liao <fiona.liao@grafana.com> --------- Signed-off-by: Fiona Liao <fiona.liao@grafana.com> Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>	2025-04-23 09:58:02 -03:00
Arve Knudsen	f5f22e7201	Remove golangci-lint exclusions for OTLP code (#16250) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2025-03-20 18:43:22 +01:00
Arthur Silva Sens	b39672736a	Migrate otlptranslator package to prometheus/otlptranslator (#16240) ... * Migrate otlptranslator package to prometheus/otlp-prometheus-translator --------- Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>	2025-03-20 16:13:26 +01:00
David Ashpole	953a873342	update links to openmetrics to reference the v1.0.0 release ... Signed-off-by: David Ashpole <dashpole@google.com>	2024-12-13 21:32:27 +00:00
Arve Knudsen	a574335d6b	OTLP receiver: Don't call NormalizeLabel in NoUTF8EscapingWithSuffixes mode ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-12-04 17:01:08 +01:00
György Krajcsovits	174f828d70	Rename to keep_identifying_resource_attributes ... Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-11-29 15:19:14 +01:00
György Krajcsovits	ffabc04829	Make the behavior configurable ... Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-11-29 15:12:57 +01:00
György Krajcsovits	a53b48a912	OTLP translate: keep identifying attributes in target_info ... Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-11-25 09:27:50 +01:00
Arthur Silva Sens	03995775a7	Allow UTF-8 characters in metric and label names as opt-in feature (#15258) ... * Allow UTF-8 characters in metric and label names as opt-in feature --------- Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>	2024-11-08 10:02:48 -03:00
Charlie Le	d87f7440ca	support int exemplar value type ... When the exemplar type is an int, it incorrectly gets converted to a 0 when DoubleValue() is called on the exemplar. This adds a check to ensure that the value is converted properly based on the type. Signed-off-by: Charlie Le <charlie_le@apple.com>	2024-10-25 08:47:54 -07:00
Arve Knudsen	4fc562f9e7	OTLP: Support context cancellation/timeout during translation (#14612) ... * OTLP: Support context cancellation/timeout during translation --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-09-08 17:13:40 +02:00
Bryan Boreham	f90c7a11d1	[REFACTOR] OTLP translator: simplify time conversion ... We don't need multiple levels of abstraction to convert nanoseconds to milliseconds. We do benefit from tests, however. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-29 12:00:01 +01:00
Arve Knudsen	a25b626792	prometheusremotewrite: Support resource attribute promotion ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-07-16 11:51:10 +02:00
Arve Knudsen	9595b174e5	otlp: Document regular and exponential histogram conversions ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-07-01 13:35:40 +02:00
Arve Knudsen	24b78bef32	otlp: Clean up exponential histogram code slightly ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-07-01 11:07:07 +02:00
Arve Knudsen	99f3051f45	OTLP: Use PrometheusConverter directly ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-04-30 13:10:27 +02:00
Arve Knudsen	759ca8b207	Merge branch 'main' into refactor/add_max_func_to_maxTimestamp ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-04-30 11:50:37 +02:00
Jesus Vazquez	7554384dac	otlp: Prometheus to own its own copy of the otlptranslator package (#13991) ... 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>	2024-04-30 11:29:52 +02:00
komisan19	b974a99279	fix ... Signed-off-by: komisan19 <18901496+komisan19@users.noreply.github.com>	2024-04-30 10:45:50 +09:00
komisan19	3d84d4d6dc	fix ... Signed-off-by: komisan19 <18901496+komisan19@users.noreply.github.com>	2024-04-22 19:04:00 +09:00
komisan19	5ab24a06d0	refactor: add max func to maxTimestamp ... Signed-off-by: komisan19 <18901496+komisan19@users.noreply.github.com>	2024-04-21 23:39:25 +09:00
Arve Knudsen	bf5ca8cf38	otlptranslator: Upgrade to v0.95.0 ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-02-22 09:12:07 +01:00
Goutham	aee6896c47	Minor fixes to otlp vendor update script ... Signed-off-by: Goutham <gouthamve@gmail.com>	2024-01-18 15:32:06 +05:30
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
Gregor Zeitlinger	f01718262a	Unit tests for native histograms (#12668) ... promql: Extend testing framework to support native histograms This includes both the internal testing framework as well as the rules unit test feature of promtool. This also adds a bunch of basic tests. Many of the code level tests can now be converted to tests within the framework, and more tests can be added easily. --------- Signed-off-by: Harold Dost <h.dost@criteo.com> Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Signed-off-by: Stephen Lang <stephen.lang@grafana.com> Co-authored-by: Harold Dost <h.dost@criteo.com> Co-authored-by: Stephen Lang <stephen.lang@grafana.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>	2023-08-25 23:35:42 +02:00
Goutham Veeramachaneni	ad4f514e66	Add OTLP Ingestion endpoint (#12571) ... * Add OTLP Ingestion endpoint We copy files from the otel-collector-contrib. See the README in `storage/remote/otlptranslator/README.md`. This supersedes: https://github.com/prometheus/prometheus/pull/11965 Signed-off-by: gouthamve <gouthamve@gmail.com> * Return a 200 OK It is what the OTEL Golang SDK expect :( https://github.com/open-telemetry/opentelemetry-go/issues/4363 Signed-off-by: Goutham <gouthamve@gmail.com> --------- Signed-off-by: gouthamve <gouthamve@gmail.com> Signed-off-by: Goutham <gouthamve@gmail.com>	2023-07-28 12:35:28 +02:00