1
0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2026-06-03 18:35:08 +02:00

Revert "Move global metric back to otel/metric/global for minor release (#3986)" (#4039)

* Revert "Move global metric back to `otel/metric/global` for minor release (#3986)"

This reverts commit 8dba38e02f.

* Add changes to changelog

* Fix versions and go mod tidy

* Run go-mod-tidy
This commit is contained in:
Tyler Yahn
2023-05-02 11:15:39 -07:00
committed by GitHub
parent 5814858e4e
commit 17903bcdb6
37 changed files with 210 additions and 206 deletions
@@ -17,8 +17,8 @@ package otlpmetrichttp_test
import (
"context"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
"go.opentelemetry.io/otel/metric/global"
"go.opentelemetry.io/otel/sdk/metric"
)
@@ -35,7 +35,7 @@ func Example() {
panic(err)
}
}()
global.SetMeterProvider(meterProvider)
otel.SetMeterProvider(meterProvider)
// From here, the meterProvider can be used by instrumentation to collect
// telemetry.
@@ -9,7 +9,6 @@ require (
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.38.1
go.opentelemetry.io/otel/metric v0.38.1
go.opentelemetry.io/otel/sdk/metric v0.38.1
go.opentelemetry.io/proto/otlp v0.19.0
google.golang.org/protobuf v1.30.0
@@ -24,6 +23,7 @@ require (
github.com/google/go-cmp v0.5.9 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/otel/metric v0.38.1 // indirect
go.opentelemetry.io/otel/sdk v1.15.1 // indirect
go.opentelemetry.io/otel/trace v1.15.1 // indirect
golang.org/x/net v0.8.0 // indirect