Skip to content

Commit 13cd2ac

Browse files
clsungjmacd
clsung
authored and
jmacd
committed
move /global to /api/global (#356)
implement #337
1 parent 9a2484c commit 13cd2ac

File tree

18 files changed

+17
-17
lines changed

18 files changed

+17
-17
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434
"context"
3535
"log"
3636

37+
"go.opentelemetry.io/otel/api/global"
3738
apitrace "go.opentelemetry.io/otel/api/trace"
3839
"go.opentelemetry.io/otel/exporter/trace/stdout"
39-
"go.opentelemetry.io/otel/global"
4040
sdktrace "go.opentelemetry.io/otel/sdk/trace"
4141
)
4242

‎global/global.go renamed to ‎api/global/global.go

File renamed without changes.

‎global/global_test.go renamed to ‎api/global/global_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package global_test
1717
import (
1818
"testing"
1919

20+
"go.opentelemetry.io/otel/api/global"
2021
"go.opentelemetry.io/otel/api/metric"
2122
"go.opentelemetry.io/otel/api/trace"
22-
"go.opentelemetry.io/otel/global"
2323
)
2424

2525
type (

‎bridge/opentracing/mix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
ot "github.com/opentracing/opentracing-go"
2323

2424
otelcore "go.opentelemetry.io/otel/api/core"
25+
"go.opentelemetry.io/otel/api/global"
2526
oteltrace "go.opentelemetry.io/otel/api/trace"
26-
"go.opentelemetry.io/otel/global"
2727

2828
"go.opentelemetry.io/otel/bridge/opentracing/internal"
2929
)

‎example/basic/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"time"
2121

2222
"go.opentelemetry.io/otel/api/distributedcontext"
23+
"go.opentelemetry.io/otel/api/global"
2324
"go.opentelemetry.io/otel/api/key"
2425
"go.opentelemetry.io/otel/api/metric"
2526
"go.opentelemetry.io/otel/api/trace"
2627
metricstdout "go.opentelemetry.io/otel/exporter/metric/stdout"
2728
tracestdout "go.opentelemetry.io/otel/exporter/trace/stdout"
28-
"go.opentelemetry.io/otel/global"
2929
metricsdk "go.opentelemetry.io/otel/sdk/metric"
3030
"go.opentelemetry.io/otel/sdk/metric/batcher/defaultkeys"
3131
"go.opentelemetry.io/otel/sdk/metric/controller/push"

‎example/http-stackdriver/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"google.golang.org/grpc/codes"
2828

2929
"go.opentelemetry.io/otel/api/distributedcontext"
30+
"go.opentelemetry.io/otel/api/global"
3031
"go.opentelemetry.io/otel/api/key"
3132
"go.opentelemetry.io/otel/api/trace"
3233
"go.opentelemetry.io/otel/exporter/trace/stackdriver"
33-
"go.opentelemetry.io/otel/global"
3434
"go.opentelemetry.io/otel/plugin/httptrace"
3535
sdktrace "go.opentelemetry.io/otel/sdk/trace"
3636
)

‎example/http-stackdriver/server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"os"
2222

2323
"go.opentelemetry.io/otel/api/distributedcontext"
24+
"go.opentelemetry.io/otel/api/global"
2425
"go.opentelemetry.io/otel/api/trace"
2526
"go.opentelemetry.io/otel/exporter/trace/stackdriver"
26-
"go.opentelemetry.io/otel/global"
2727
"go.opentelemetry.io/otel/plugin/httptrace"
2828
sdktrace "go.opentelemetry.io/otel/sdk/trace"
2929
)

‎example/http/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"google.golang.org/grpc/codes"
2727

2828
"go.opentelemetry.io/otel/api/distributedcontext"
29+
"go.opentelemetry.io/otel/api/global"
2930
"go.opentelemetry.io/otel/api/key"
3031
"go.opentelemetry.io/otel/api/trace"
3132
"go.opentelemetry.io/otel/exporter/trace/stdout"
32-
"go.opentelemetry.io/otel/global"
3333
"go.opentelemetry.io/otel/plugin/httptrace"
3434
sdktrace "go.opentelemetry.io/otel/sdk/trace"
3535
)

‎example/http/server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"net/http"
2121

2222
"go.opentelemetry.io/otel/api/distributedcontext"
23+
"go.opentelemetry.io/otel/api/global"
2324
"go.opentelemetry.io/otel/api/trace"
2425
"go.opentelemetry.io/otel/exporter/trace/stdout"
25-
"go.opentelemetry.io/otel/global"
2626
"go.opentelemetry.io/otel/plugin/httptrace"
2727
sdktrace "go.opentelemetry.io/otel/sdk/trace"
2828
)

‎example/jaeger/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"log"
2222

2323
"go.opentelemetry.io/otel/api/core"
24+
"go.opentelemetry.io/otel/api/global"
2425
"go.opentelemetry.io/otel/api/key"
2526

2627
"go.opentelemetry.io/otel/exporter/trace/jaeger"
27-
"go.opentelemetry.io/otel/global"
2828
sdktrace "go.opentelemetry.io/otel/sdk/trace"
2929
)
3030

‎example/namedtracer/foo/foo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package foo
1717
import (
1818
"context"
1919

20+
"go.opentelemetry.io/otel/api/global"
2021
"go.opentelemetry.io/otel/api/key"
2122
"go.opentelemetry.io/otel/api/trace"
22-
"go.opentelemetry.io/otel/global"
2323
)
2424

2525
var (

‎example/namedtracer/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"log"
2020

2121
"go.opentelemetry.io/otel/api/distributedcontext"
22+
"go.opentelemetry.io/otel/api/global"
2223
"go.opentelemetry.io/otel/api/key"
2324
"go.opentelemetry.io/otel/api/trace"
2425
"go.opentelemetry.io/otel/example/namedtracer/foo"
2526
"go.opentelemetry.io/otel/exporter/trace/stdout"
26-
"go.opentelemetry.io/otel/global"
2727
sdktrace "go.opentelemetry.io/otel/sdk/trace"
2828
)
2929

‎exporter/trace/jaeger/jaeger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24+
"go.opentelemetry.io/otel/api/global"
2425
"go.opentelemetry.io/otel/api/key"
25-
"go.opentelemetry.io/otel/global"
2626

2727
apitrace "go.opentelemetry.io/otel/api/trace"
2828

‎exporter/trace/stackdriver/stackdriver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
tracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
3131
"google.golang.org/grpc"
3232

33+
"go.opentelemetry.io/otel/api/global"
3334
"go.opentelemetry.io/otel/exporter/trace/stackdriver"
34-
"go.opentelemetry.io/otel/global"
3535
sdktrace "go.opentelemetry.io/otel/sdk/trace"
3636
)
3737

‎plugin/httptrace/clienttrace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"google.golang.org/grpc/codes"
2626

2727
"go.opentelemetry.io/otel/api/core"
28+
"go.opentelemetry.io/otel/api/global"
2829
"go.opentelemetry.io/otel/api/key"
2930
"go.opentelemetry.io/otel/api/trace"
30-
"go.opentelemetry.io/otel/global"
3131
)
3232

3333
var (

‎plugin/httptrace/clienttrace_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/google/go-cmp/cmp"
2424

2525
"go.opentelemetry.io/otel/api/core"
26+
"go.opentelemetry.io/otel/api/global"
2627
"go.opentelemetry.io/otel/api/key"
27-
"go.opentelemetry.io/otel/global"
2828
"go.opentelemetry.io/otel/plugin/httptrace"
2929
export "go.opentelemetry.io/otel/sdk/export/trace"
3030
sdktrace "go.opentelemetry.io/otel/sdk/trace"

‎plugin/othttp/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"net/http"
2020

2121
"go.opentelemetry.io/otel/api/core"
22+
"go.opentelemetry.io/otel/api/global"
2223
"go.opentelemetry.io/otel/api/propagation"
2324
"go.opentelemetry.io/otel/api/trace"
24-
"go.opentelemetry.io/otel/global"
2525
prop "go.opentelemetry.io/otel/propagation"
2626
)
2727

‎plugin/othttp/handler_example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"strings"
2424

2525
"go.opentelemetry.io/otel/api/core"
26+
"go.opentelemetry.io/otel/api/global"
2627
"go.opentelemetry.io/otel/api/trace"
2728
"go.opentelemetry.io/otel/exporter/trace/stdout"
28-
"go.opentelemetry.io/otel/global"
2929
"go.opentelemetry.io/otel/plugin/othttp"
3030
sdktrace "go.opentelemetry.io/otel/sdk/trace"
3131
)

0 commit comments

Comments
 (0)