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.

Sign up for GitHub

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

Jump to bottom

Wire Exemplars into the metrics.data package #3353

Merged

anuraaga merged 14 commits into open-telemetry:main from jsuereth:wip-add-exemplar-to-dm

Jul 10, 2021

Contributor

jsuereth commented Jun 27, 2021

Based on #3352

Adds Exemplars to the data package
Adds exemplars to OTLP export (if they exist)
Adds exemplars to Prometheus export (if they exist)
Add some tests and helper methods

jsuereth force-pushed the wip-add-exemplar-to-dm branch 4 times, most recently from 04aedb0 to 799317e Compare

July 1, 2021 17:01

jsuereth marked this pull request as ready for review

July 1, 2021 17:01

jsuereth requested review from anuraaga, arminru, bogdandrutu, carlosalberto and jkwatson as code owners

July 1, 2021 17:01

jsuereth requested a review from a user

July 1, 2021 17:01

jsuereth requested review from Oberon00, pavolloffay, thisthat and tylerbenson as code owners

July 1, 2021 17:01

jkwatson reviewed

View reviewed changes

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoubleExemplar.java Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoublePointData.java Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/Exemplar.java Outdated Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/Exemplar.java Outdated Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/LongExemplar.java Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/LongPointData.java Show resolved Hide resolved

jkwatson reviewed

View reviewed changes

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/SampledPointData.java Outdated Show resolved Hide resolved

Contributor

jkwatson commented Jul 1, 2021

Looks good to me! I don't know if the mapping to prometheus is good, bad or ugly, but it all looks pretty decent to me.

brian-brazil reviewed

View reviewed changes

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

brian-brazil reviewed

View reviewed changes

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

anuraaga reviewed

View reviewed changes

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/MetricAdapter.java Show resolved Hide resolved

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java Outdated Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/LongExemplar.java Outdated Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/PointData.java Outdated Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/PointData.java Outdated Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/Exemplar.java Outdated Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoublePointData.java Outdated Show resolved Hide resolved

brian-brazil reviewed

View reviewed changes

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Outdated Show resolved Hide resolved

jonatan-ivanov reviewed

View reviewed changes

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/MetricAdapter.java Show resolved Hide resolved

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/MetricAdapter.java Show resolved Hide resolved

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/MetricAdapter.java Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoubleExemplar.java Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoublePointData.java Show resolved Hide resolved

anuraaga reviewed

View reviewed changes

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Show resolved Hide resolved

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java Show resolved Hide resolved

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java Outdated Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoubleExemplar.java Show resolved Hide resolved

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/PointData.java Outdated Show resolved Hide resolved

jsuereth and others added 14 commits

July 9, 2021 17:42


          Add Exemplars into metrics.data pacakge

3c7aa29

- Add Exemplars to match OTLP spec
- Add assertj helpers for exemplar extraction on points.


          Wire exemplar export to OTLP exporter

b6adbe4


          Wire exemplar export to Prometheus exporter

9f8dc62


          Add javadoc for AbstractSampledPointDataAssert

2d3306b


          Fixes from review.

637e731


          Fixes from review.

7eb668d


          Fixes from review.

20826d8


          Fixes from spotless.

ee4f84a


          Fixes froom review.

b5da967


          Add clarification to javadoc from review.

e2f493e


          ONe last javadoc cleanup.

86d34c8


          Fixes to javadoc build.

41c505b


          Update method name from review.

e21ea5e


          Fixes from review.

a1a0fb0

jsuereth force-pushed the wip-add-exemplar-to-dm branch from c06b69c to a1a0fb0 Compare

July 9, 2021 21:43

jkwatson approved these changes

View reviewed changes

Contributor

jkwatson left a comment

Thanks!

anuraaga approved these changes

View reviewed changes

Contributor

anuraaga left a comment

Thanks!

anuraaga merged commit ae4bb36 into open-telemetry:main

jsuereth mentioned this pull request

Update Metrics to latest specification. #3518

Closed

32 tasks

This was referenced Dec 19, 2021

Temurin JDK #4011

Merged

use Eclipse Temurin JDK docker image #4012

Merged

jonatan-ivanov mentioned this pull request

REQUEST: New membership for jonatan-ivanov open-telemetry/community#1548

Closed

6 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

brian-brazil brian-brazil left review comments

jonatan-ivanov jonatan-ivanov left review comments

jkwatson jkwatson approved these changes

anuraaga anuraaga approved these changes

arminru Awaiting requested review from arminru

bogdandrutu Awaiting requested review from bogdandrutu

carlosalberto Awaiting requested review from carlosalberto

Oberon00 Awaiting requested review from Oberon00

pavolloffay Awaiting requested review from pavolloffay

thisthat Awaiting requested review from thisthat

tylerbenson Awaiting requested review from tylerbenson

Labels

None yet