Skip to content

Commit 69ec301

Browse files
MrAliasMrAlias
authored
Merge branch 'main' into rm-type
2 parents 921a235 + 92ccad7 commit 69ec301

37 files changed

+289
-339
lines changed

‎bridge/opentracing/test/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
golang.org/x/net v0.30.0 // indirect
2929
golang.org/x/sys v0.26.0 // indirect
3030
golang.org/x/text v0.19.0 // indirect
31-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
31+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
3232
google.golang.org/protobuf v1.35.1 // indirect
3333
gopkg.in/yaml.v3 v3.0.1 // indirect
3434
)

‎bridge/opentracing/test/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
2626
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2727
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
2828
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
29-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
30-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
29+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
30+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
3131
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
3232
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
3333
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=

‎exporters/otlp/otlplog/otlploggrpc/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
go.opentelemetry.io/otel/sdk/log v0.7.0
1313
go.opentelemetry.io/otel/trace v1.31.0
1414
go.opentelemetry.io/proto/otlp v1.3.1
15-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53
15+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
1616
google.golang.org/grpc v1.67.1
1717
google.golang.org/protobuf v1.35.1
1818
)
@@ -30,7 +30,7 @@ require (
3030
golang.org/x/net v0.30.0 // indirect
3131
golang.org/x/sys v0.26.0 // indirect
3232
golang.org/x/text v0.19.0 // indirect
33-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
33+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
3434
gopkg.in/yaml.v3 v3.0.1 // indirect
3535
)
3636

‎exporters/otlp/otlplog/otlploggrpc/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
3232
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3333
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
3434
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
35-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
36-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
37-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
38-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
35+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
36+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
37+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
38+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
3939
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
4040
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
4141
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=

‎exporters/otlp/otlplog/otlploghttp/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ require (
2828
golang.org/x/net v0.30.0 // indirect
2929
golang.org/x/sys v0.26.0 // indirect
3030
golang.org/x/text v0.19.0 // indirect
31-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
32-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
31+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
32+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
3333
google.golang.org/grpc v1.67.1 // indirect
3434
gopkg.in/yaml.v3 v3.0.1 // indirect
3535
)

‎exporters/otlp/otlplog/otlploghttp/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
3232
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3333
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
3434
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
35-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
36-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
37-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
38-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
35+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
36+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
37+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
38+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
3939
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
4040
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
4141
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=

‎exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
go.opentelemetry.io/otel/sdk v1.31.0
1313
go.opentelemetry.io/otel/sdk/metric v1.31.0
1414
go.opentelemetry.io/proto/otlp v1.3.1
15-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53
15+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
1616
google.golang.org/grpc v1.67.1
1717
google.golang.org/protobuf v1.35.1
1818
)
@@ -31,7 +31,7 @@ require (
3131
golang.org/x/net v0.30.0 // indirect
3232
golang.org/x/sys v0.26.0 // indirect
3333
golang.org/x/text v0.19.0 // indirect
34-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
34+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
3535
gopkg.in/yaml.v3 v3.0.1 // indirect
3636
)
3737

‎exporters/otlp/otlpmetric/otlpmetricgrpc/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
3232
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3333
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
3434
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
35-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
36-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
37-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
38-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
35+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
36+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
37+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
38+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
3939
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
4040
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
4141
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=

‎exporters/otlp/otlpmetric/otlpmetrichttp/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ require (
3030
golang.org/x/net v0.30.0 // indirect
3131
golang.org/x/sys v0.26.0 // indirect
3232
golang.org/x/text v0.19.0 // indirect
33-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
34-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
33+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
34+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
3535
gopkg.in/yaml.v3 v3.0.1 // indirect
3636
)
3737

‎exporters/otlp/otlpmetric/otlpmetrichttp/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
3232
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3333
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
3434
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
35-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
36-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
37-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
38-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
35+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
36+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
37+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
38+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
3939
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
4040
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
4141
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=

‎exporters/otlp/otlptrace/otlptracegrpc/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
go.opentelemetry.io/otel/trace v1.31.0
1212
go.opentelemetry.io/proto/otlp v1.3.1
1313
go.uber.org/goleak v1.3.0
14-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53
14+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
1515
google.golang.org/grpc v1.67.1
1616
google.golang.org/protobuf v1.35.1
1717
)
@@ -28,7 +28,7 @@ require (
2828
golang.org/x/net v0.30.0 // indirect
2929
golang.org/x/sys v0.26.0 // indirect
3030
golang.org/x/text v0.19.0 // indirect
31-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
31+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
3232
gopkg.in/yaml.v3 v3.0.1 // indirect
3333
)
3434

‎exporters/otlp/otlptrace/otlptracegrpc/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
3434
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3535
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
3636
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
37-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
38-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
39-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
40-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
37+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
38+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
39+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
40+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
4141
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
4242
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
4343
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=

‎exporters/otlp/otlptrace/otlptracehttp/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ require (
2626
golang.org/x/net v0.30.0 // indirect
2727
golang.org/x/sys v0.26.0 // indirect
2828
golang.org/x/text v0.19.0 // indirect
29-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
30-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
29+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
30+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
3131
gopkg.in/yaml.v3 v3.0.1 // indirect
3232
)
3333

‎exporters/otlp/otlptrace/otlptracehttp/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
3232
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3333
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
3434
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
35-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
36-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
37-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
38-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
35+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
36+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
37+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
38+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
3939
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
4040
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
4141
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=

‎sdk/metric/config.go

+5-17
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package metric // import "go.opentelemetry.io/otel/sdk/metric"
55

66
import (
77
"context"
8-
"fmt"
8+
"errors"
99
"os"
1010
"strings"
1111
"sync"
@@ -44,25 +44,13 @@ func (c config) readerSignals() (forceFlush, shutdown func(context.Context) erro
4444
// value.
4545
func unify(funcs []func(context.Context) error) func(context.Context) error {
4646
return func(ctx context.Context) error {
47-
var errs []error
47+
var err error
4848
for _, f := range funcs {
49-
if err := f(ctx); err != nil {
50-
errs = append(errs, err)
49+
if e := f(ctx); e != nil {
50+
err = errors.Join(err, e)
5151
}
5252
}
53-
return unifyErrors(errs)
54-
}
55-
}
56-
57-
// unifyErrors combines multiple errors into a single error.
58-
func unifyErrors(errs []error) error {
59-
switch len(errs) {
60-
case 0:
61-
return nil
62-
case 1:
63-
return errs[0]
64-
default:
65-
return fmt.Errorf("%v", errs)
53+
return err
6654
}
6755
}
6856

‎sdk/metric/config_test.go

+14-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package metric
55

66
import (
77
"context"
8-
"fmt"
8+
"errors"
99
"testing"
1010

1111
"github.com/google/go-cmp/cmp"
@@ -108,11 +108,19 @@ func TestConfigReaderSignalsForwardedErrors(t *testing.T) {
108108
}
109109

110110
func TestUnifyMultiError(t *testing.T) {
111-
f := func(context.Context) error { return assert.AnError }
112-
funcs := []func(context.Context) error{f, f, f}
113-
errs := []error{assert.AnError, assert.AnError, assert.AnError}
114-
target := fmt.Errorf("%v", errs)
115-
assert.Equal(t, unify(funcs)(context.Background()), target)
111+
var (
112+
e0 = errors.New("0")
113+
e1 = errors.New("1")
114+
e2 = errors.New("2")
115+
)
116+
err := unify([]func(context.Context) error{
117+
func(ctx context.Context) error { return e0 },
118+
func(ctx context.Context) error { return e1 },
119+
func(ctx context.Context) error { return e2 },
120+
})(context.Background())
121+
assert.ErrorIs(t, err, e0)
122+
assert.ErrorIs(t, err, e1)
123+
assert.ErrorIs(t, err, e2)
116124
}
117125

118126
func mergeResource(t *testing.T, r1, r2 *resource.Resource) *resource.Resource {

‎sdk/metric/exemplar.go

-10
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,14 @@ package metric // import "go.opentelemetry.io/otel/sdk/metric"
66
import (
77
"runtime"
88

9-
"go.opentelemetry.io/otel/attribute"
109
"go.opentelemetry.io/otel/sdk/metric/exemplar"
11-
"go.opentelemetry.io/otel/sdk/metric/internal/aggregate"
1210
)
1311

1412
// ExemplarReservoirProviderSelector selects the
1513
// [exemplar.ReservoirProvider] to use
1614
// based on the [Aggregation] of the metric.
1715
type ExemplarReservoirProviderSelector func(Aggregation) exemplar.ReservoirProvider
1816

19-
// reservoirFunc returns the appropriately configured exemplar reservoir
20-
// creation func based on the passed InstrumentKind and filter configuration.
21-
func reservoirFunc[N int64 | float64](provider exemplar.ReservoirProvider, filter exemplar.Filter) func(attribute.Set) aggregate.FilteredExemplarReservoir[N] {
22-
return func(attrs attribute.Set) aggregate.FilteredExemplarReservoir[N] {
23-
return aggregate.NewFilteredExemplarReservoir[N](filter, provider(attrs))
24-
}
25-
}
26-
2717
// DefaultExemplarReservoirProviderSelector returns the default
2818
// [exemplar.ReservoirProvider] for the
2919
// provided [Aggregation].

‎sdk/metric/instrument_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"go.opentelemetry.io/otel/attribute"
11+
"go.opentelemetry.io/otel/sdk/metric/exemplar"
1112
"go.opentelemetry.io/otel/sdk/metric/internal/aggregate"
1213
"go.opentelemetry.io/otel/sdk/metric/metricdata"
1314
)
@@ -22,7 +23,7 @@ func BenchmarkInstrument(b *testing.B) {
2223
}
2324

2425
b.Run("instrumentImpl/aggregate", func(b *testing.B) {
25-
build := aggregate.Builder[int64]{}
26+
build := aggregate.Builder[int64]{ExemplarFilter: exemplar.AlwaysOffFilter, ExemplarReservoirProvider: exemplar.FixedSizeReservoirProvider(0)}
2627
var meas []aggregate.Measure[int64]
2728

2829
build.Temporality = metricdata.CumulativeTemporality
@@ -52,7 +53,7 @@ func BenchmarkInstrument(b *testing.B) {
5253
})
5354

5455
b.Run("observable/observe", func(b *testing.B) {
55-
build := aggregate.Builder[int64]{}
56+
build := aggregate.Builder[int64]{ExemplarFilter: exemplar.AlwaysOffFilter, ExemplarReservoirProvider: exemplar.FixedSizeReservoirProvider(0)}
5657
var meas []aggregate.Measure[int64]
5758

5859
in, _ := build.PrecomputedLastValue()

0 commit comments

Comments
 (0)