Skip to content

Move the otel/api/global package to otel/global #1262

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

Merged
MrAlias merged 5 commits into from
Oct 17, 2020
Merged

Move the otel/api/global package to otel/global #1262

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e4270f
Move otel/api/global to otel/global
MrAlias Oct 16, 2020
76b4a95
Update global package references
MrAlias Oct 16, 2020
cd83098
Add changes to CHANGELOG
MrAlias Oct 16, 2020
8cb46b0
Merge remote-tracking branch 'upstream/master' into mv-global
MrAlias Oct 17, 2020
1586927
Merge remote-tracking branch 'upstream/master' into mv-global
MrAlias Oct 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Rename `MergeItererator` to `MergeIterator` in the `go.opentelemetry.io/otel/label` package. (#1244)
- The function signature of the Span `AddEvent` method in `go.opentelemetry.io/otel` is updated to no longer take an unused context and instead take a required name and a variable number of `EventOption`s. (#1254)
- The function signature of the Span `RecordError` method in `go.opentelemetry.io/otel` is updated to no longer take an unused context and instead take a required error value and a variable number of `EventOption`s. (#1254)
- Move the `go.opentelemetry.io/otel/api/global` package to `go.opentelemetry.io/otel/global`. (#1262)

### Removed

Expand Down
2 changes: 1 addition & 1 deletion bridge/opentracing/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
otlog "github.com/opentracing/opentracing-go/log"

"go.opentelemetry.io/otel"
otelglobal "go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/codes"
otelglobal "go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/internal/baggage"
"go.opentelemetry.io/otel/internal/trace/noop"
otelparent "go.opentelemetry.io/otel/internal/trace/parent"
Expand Down
2 changes: 1 addition & 1 deletion bridge/opentracing/mix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
ot "github.com/opentracing/opentracing-go"

"go.opentelemetry.io/otel"
otelglobal "go.opentelemetry.io/otel/api/global"
otelglobal "go.opentelemetry.io/otel/global"
otelbaggage "go.opentelemetry.io/otel/internal/baggage"
"go.opentelemetry.io/otel/label"

Expand Down
4 changes: 2 additions & 2 deletions doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ operation being performed as part of a traced workflow. It its simplest form:
A Tracer is unique to the instrumentation and is used to create Spans.
Instrumentation should be designed to accept a TracerProvider from which it
can create its own unique Tracer. Alternatively, the registered global
TracerProvider from the go.opentelemetry.io/otel/api/global package can be
used as a default.
TracerProvider from the go.opentelemetry.io/otel/global package can be used as
a default.

const (
name = "instrumentation/package/name"
Expand Down
2 changes: 1 addition & 1 deletion example/basic/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"log"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/exporters/stdout"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
"go.opentelemetry.io/otel/propagators"
"go.opentelemetry.io/otel/sdk/metric/controller/push"
Expand Down
2 changes: 1 addition & 1 deletion example/jaeger/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"log"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"

"go.opentelemetry.io/otel/exporters/trace/jaeger"
Expand Down
2 changes: 1 addition & 1 deletion example/namedtracer/foo/foo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
)

Expand Down
2 changes: 1 addition & 1 deletion example/namedtracer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"log"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/example/namedtracer/foo"
"go.opentelemetry.io/otel/exporters/stdout"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)
Expand Down
2 changes: 1 addition & 1 deletion example/otel-collector/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"google.golang.org/grpc"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/exporters/otlp"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
"go.opentelemetry.io/otel/propagators"
"go.opentelemetry.io/otel/sdk/metric/controller/push"
Expand Down
2 changes: 1 addition & 1 deletion example/prometheus/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"sync"
"time"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/exporters/metric/prometheus"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
)

Expand Down
2 changes: 1 addition & 1 deletion example/zipkin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"os"
"time"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"

"go.opentelemetry.io/otel/exporters/trace/zipkin"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/prometheus/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/metric"
"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"google.golang.org/grpc/credentials"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/exporters/otlp"
"go.opentelemetry.io/otel/global"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion exporters/stdout/example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"log"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/exporters/stdout"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
)

Expand Down
2 changes: 1 addition & 1 deletion exporters/stdout/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package stdout

import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/sdk/export/metric"
exporttrace "go.opentelemetry.io/otel/sdk/export/trace"
"go.opentelemetry.io/otel/sdk/metric/controller/push"
Expand Down
2 changes: 1 addition & 1 deletion exporters/trace/jaeger/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strconv"
"strings"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
)

Expand Down
2 changes: 1 addition & 1 deletion exporters/trace/jaeger/jaeger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"google.golang.org/api/support/bundler"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/codes"
gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/trace"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
Expand Down
2 changes: 1 addition & 1 deletion exporters/trace/jaeger/jaeger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"google.golang.org/api/support/bundler"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/codes"
gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger"
"go.opentelemetry.io/otel/global"
ottest "go.opentelemetry.io/otel/internal/testing"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/trace"
Expand Down
2 changes: 1 addition & 1 deletion exporters/trace/zipkin/zipkin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"net/url"
"sync"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
export "go.opentelemetry.io/otel/sdk/export/trace"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)
Expand Down
2 changes: 1 addition & 1 deletion exporters/trace/zipkin/zipkin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/global"
export "go.opentelemetry.io/otel/sdk/export/trace"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)
Expand Down
2 changes: 1 addition & 1 deletion api/global/doc.go → global/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
// limitations under the License.

// Package global provides global providers, propagators and more.
package global // import "go.opentelemetry.io/otel/api/global"
package global // import "go.opentelemetry.io/otel/global"
0 api/global/handler.go → global/handler.go
View file
Open in desktop
File renamed without changes.
0 api/global/handler_test.go → global/handler_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions api/global/internal/benchmark_test.go → global/internal/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"testing"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/global/internal"
"go.opentelemetry.io/otel/label"
)

Expand Down
2 changes: 1 addition & 1 deletion api/global/internal/internal_test.go → global/internal/internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"os"
"testing"

"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/global/internal"
ottest "go.opentelemetry.io/otel/internal/testing"
)

Expand Down
0 api/global/internal/meter.go → global/internal/meter.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions api/global/internal/meter_test.go → global/internal/meter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/api/metric"
metrictest "go.opentelemetry.io/otel/api/metric/metrictest"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/global/internal"
"go.opentelemetry.io/otel/label"
)

Expand Down
0 api/global/internal/propagator.go → global/internal/propagator.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion api/global/internal/propagator_test.go → global/internal/propagator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"testing"

"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/global/internal"
"go.opentelemetry.io/otel/oteltest"
)

Expand Down
0 api/global/internal/registry_test.go → global/internal/registry_test.go
View file
Open in desktop
File renamed without changes.
0 api/global/internal/state.go → global/internal/state.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion api/global/internal/state_test.go → global/internal/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package internal_test
import (
"testing"

"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/global/internal"
)

func TestResetsOfGlobalsPanic(t *testing.T) {
Expand Down
0 api/global/internal/trace.go → global/internal/trace.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions api/global/internal/trace_test.go → global/internal/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"github.com/stretchr/testify/assert"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/global/internal"
"go.opentelemetry.io/otel/oteltest"
)

Expand Down
2 changes: 1 addition & 1 deletion api/global/metric.go → global/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package global

import (
"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global/internal"
)

// Meter creates an implementation of the Meter interface from the global
Expand Down
2 changes: 1 addition & 1 deletion api/global/metric_test.go → global/metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package global_test
import (
"testing"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global"
)

type testMeterProvider struct{}
Expand Down
2 changes: 1 addition & 1 deletion api/global/propagation.go → global/propagation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package global

import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/global/internal"
)

// TextMapPropagator returns the global TextMapPropagator. If none has been
Expand Down
2 changes: 1 addition & 1 deletion api/global/trace.go → global/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package global

import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/global/internal"
)

// Tracer creates a named tracer that implements Tracer interface.
Expand Down
2 changes: 1 addition & 1 deletion api/global/trace_test.go → global/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/internal/trace/noop"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/metric/async.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"sync"

"go.opentelemetry.io/otel/api/global"
api "go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
)

Expand Down
2 changes: 1 addition & 1 deletion propagators/trace_context_example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package propagators_test

import (
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/propagators"
)

Expand Down
2 changes: 1 addition & 1 deletion sdk/metric/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math/rand"
"testing"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/metric"
sdk "go.opentelemetry.io/otel/sdk/metric"
Expand Down
2 changes: 1 addition & 1 deletion sdk/metric/controller/push/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"sync"
"time"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/api/metric/registry"
"go.opentelemetry.io/otel/global"
export "go.opentelemetry.io/otel/sdk/export/metric"
sdk "go.opentelemetry.io/otel/sdk/metric"
controllerTime "go.opentelemetry.io/otel/sdk/metric/controller/time"
Expand Down
2 changes: 1 addition & 1 deletion sdk/metric/controller/push/push_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/metric"
"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
Expand Down
2 changes: 1 addition & 1 deletion sdk/metric/correct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/metric"
"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
Expand Down
2 changes: 1 addition & 1 deletion sdk/metric/sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"sync"
"sync/atomic"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
api "go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/global"
internal "go.opentelemetry.io/otel/internal/metric"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/metric"
Expand Down
2 changes: 1 addition & 1 deletion sdk/trace/batch_span_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync/atomic"
"time"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/global"
export "go.opentelemetry.io/otel/sdk/export/trace"
)

Expand Down
Loading