Skip to content

Commit 266fa89

Browse files
authored
Merge branch 'main' into optimize_histogram_reservoir
2 parents 6f4850a + 5f5f4af commit 266fa89

File tree

5 files changed

+22
-6
lines changed

5 files changed

+22
-6
lines changed

exporters/prometheus/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/kylelemons/godebug v1.1.0 // indirect
3030
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3131
github.com/pmezard/go-difflib v1.0.0 // indirect
32-
github.com/prometheus/common v0.66.1 // indirect
32+
github.com/prometheus/common v0.67.1 // indirect
3333
github.com/prometheus/procfs v0.17.0 // indirect
3434
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
3535
go.yaml.in/yaml/v2 v2.4.3 // indirect

exporters/prometheus/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h
2727
github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
2828
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
2929
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
30-
github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
31-
github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
30+
github.com/prometheus/common v0.67.1 h1:OTSON1P4DNxzTg4hmKCc37o4ZAZDv0cfXLkOt0oEowI=
31+
github.com/prometheus/common v0.67.1/go.mod h1:RpmT9v35q2Y+lsieQsdOh5sXZ6ajUGC8NjZAmr8vb0Q=
3232
github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=
3333
github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
3434
github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=

internal/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ require (
168168
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
169169
github.com/prometheus/client_golang v1.23.2 // indirect
170170
github.com/prometheus/client_model v0.6.2 // indirect
171-
github.com/prometheus/common v0.66.1 // indirect
171+
github.com/prometheus/common v0.67.1 // indirect
172172
github.com/prometheus/procfs v0.17.0 // indirect
173173
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
174174
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect

internal/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@ github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h
388388
github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
389389
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
390390
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
391-
github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
392-
github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
391+
github.com/prometheus/common v0.67.1 h1:OTSON1P4DNxzTg4hmKCc37o4ZAZDv0cfXLkOt0oEowI=
392+
github.com/prometheus/common v0.67.1/go.mod h1:RpmT9v35q2Y+lsieQsdOh5sXZ6ajUGC8NjZAmr8vb0Q=
393393
github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
394394
github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
395395
github.com/quasilyte/go-ruleguard v0.4.5 h1:AGY0tiOT5hJX9BTdx/xBdoCubQUAE2grkqY2lSwvZcA=

sdk/metric/doc.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,22 @@
6363
// issues for databases that cannot handle high cardinality.
6464
// - A too low of a limit causes loss of attribute detail as more data falls into overflow.
6565
//
66+
// # Ordering and Collection Guarantees
67+
//
68+
// For performance reasons, the SDK does not guarantee that the order in which
69+
// synchronous measurements are made to the SDK is reflected in the collected
70+
// metric data. This means that even when a single goroutine makes sequential
71+
// synchronous measurements, it is possible for a later measurement to be
72+
// included in the collected metric data when an earlier measurement is not.
73+
// This applies to measurements made to different instruments, or to different
74+
// attribute sets on the same instrument. Sequential measurements made to the
75+
// same instrument and with the same attributes are guaranteed to preserve
76+
// ordering with respect to collection.
77+
//
78+
// Additionally, the SDK does not guarantee that exemplars are always included
79+
// in the same batch of metric data as the measurement they are associated
80+
// with.
81+
//
6682
// See [go.opentelemetry.io/otel/metric] for more information about
6783
// the metric API.
6884
//

0 commit comments

Comments
 (0)