Merge remote-tracking branch 'upstream/master' into oterror

api/global/internal/benchmark_test.go

@@ -63,9 +63,9 @@ func (*benchFixture) AggregatorFor(descriptor *metric.Descriptor) export.Aggrega
 		if strings.HasSuffix(descriptor.Name(), "minmaxsumcount") {
 			return minmaxsumcount.New(descriptor)
 		} else if strings.HasSuffix(descriptor.Name(), "ddsketch") {
-			return ddsketch.New(ddsketch.NewDefaultConfig(), descriptor)
+			return ddsketch.New(descriptor, ddsketch.NewDefaultConfig())
 		} else if strings.HasSuffix(descriptor.Name(), "array") {
-			return ddsketch.New(ddsketch.NewDefaultConfig(), descriptor)
+			return ddsketch.New(descriptor, ddsketch.NewDefaultConfig())
 		}
 	}
 	return nil

example/grpc/client/main.go

@@ -23,7 +23,7 @@ import (
 	"go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/example/grpc/api"
 	"go.opentelemetry.io/otel/example/grpc/config"
-	"go.opentelemetry.io/otel/plugin/grpctrace"
+	"go.opentelemetry.io/otel/instrumentation/grpctrace"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"

example/grpc/server/main.go

@@ -25,7 +25,7 @@ import (
 	"go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/example/grpc/api"
 	"go.opentelemetry.io/otel/example/grpc/config"
-	"go.opentelemetry.io/otel/plugin/grpctrace"
+	"go.opentelemetry.io/otel/instrumentation/grpctrace"
 
 	"google.golang.org/grpc"
 )

example/http/client/client.go

@@ -29,7 +29,7 @@ import (
 	"go.opentelemetry.io/otel/api/correlation"
 	"go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/exporters/trace/stdout"
-	"go.opentelemetry.io/otel/plugin/httptrace"
+	"go.opentelemetry.io/otel/instrumentation/httptrace"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 

example/http/server/server.go

@@ -23,7 +23,7 @@ import (
 	"go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/api/trace"
 	"go.opentelemetry.io/otel/exporters/trace/stdout"
-	"go.opentelemetry.io/otel/plugin/httptrace"
+	"go.opentelemetry.io/otel/instrumentation/httptrace"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 

exporters/metric/stdout/stdout_test.go

@@ -240,7 +240,7 @@ func TestStdoutValueRecorderFormat(t *testing.T) {
 func TestStdoutNoData(t *testing.T) {
 	desc := metric.NewDescriptor("test.name", metric.ValueRecorderKind, metric.Float64NumberKind)
 	for name, tc := range map[string]export.Aggregator{
-		"ddsketch":       ddsketch.New(ddsketch.NewDefaultConfig(), &desc),
+		"ddsketch":       ddsketch.New(&desc, ddsketch.NewDefaultConfig()),
 		"minmaxsumcount": minmaxsumcount.New(&desc),
 	} {
 		tc := tc

instrumentation/httptrace/clienttrace.go

@@ -67,7 +67,7 @@ func NewClientTrace(ctx context.Context) *httptrace.ClientTrace {
 		activeHooks: make(map[string]context.Context),
 	}
 
-	ct.tr = global.Tracer("go.opentelemetry.io/otel/plugin/httptrace")
+	ct.tr = global.Tracer("go.opentelemetry.io/otel/instrumentation/httptrace")
 
 	return &httptrace.ClientTrace{
 		GetConn:              ct.getConn,

instrumentation/httptrace/clienttrace_test.go

@@ -25,7 +25,7 @@ import (
 
 	"go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/api/kv"
-	"go.opentelemetry.io/otel/plugin/httptrace"
+	"go.opentelemetry.io/otel/instrumentation/httptrace"
 	export "go.opentelemetry.io/otel/sdk/export/trace"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )

instrumentation/othttp/filters/filters.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"
 
-	"go.opentelemetry.io/otel/plugin/othttp"
+	"go.opentelemetry.io/otel/instrumentation/othttp"
 )
 
 // Any takes a list of Filters and returns a Filter that

instrumentation/othttp/filters/filters_test.go

@@ -19,7 +19,7 @@ import (
 	"net/url"
 	"testing"
 
-	"go.opentelemetry.io/otel/plugin/othttp"
+	"go.opentelemetry.io/otel/instrumentation/othttp"
 )
 
 type scenario struct {

instrumentation/othttp/filters/header_go14.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"
 
-	"go.opentelemetry.io/otel/plugin/othttp"
+	"go.opentelemetry.io/otel/instrumentation/othttp"
 )
 
 // Header returns a Filter that returns true if the request

instrumentation/othttp/filters/header_nongo14.go

@@ -21,7 +21,7 @@ import (
 	"net/textproto"
 	"strings"
 
-	"go.opentelemetry.io/otel/plugin/othttp"
+	"go.opentelemetry.io/otel/instrumentation/othttp"
 )
 
 // Header returns a Filter that returns true if the request

instrumentation/othttp/handler.go

@@ -57,7 +57,7 @@ func NewHandler(handler http.Handler, operation string, opts ...Option) http.Han
 	}
 
 	defaultOpts := []Option{
-		WithTracer(global.Tracer("go.opentelemetry.io/plugin/othttp")),
+		WithTracer(global.Tracer("go.opentelemetry.io/otel/instrumentation/othttp")),
 		WithPropagators(global.Propagators()),
 		WithSpanOptions(trace.WithSpanKind(trace.SpanKindServer)),
 		WithSpanNameFormatter(defaultHandlerFormatter),

instrumentation/othttp/handler_example_test.go

@@ -27,7 +27,7 @@ import (
 	"go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/api/trace"
 	"go.opentelemetry.io/otel/exporters/trace/stdout"
-	"go.opentelemetry.io/otel/plugin/othttp"
+	"go.opentelemetry.io/otel/instrumentation/othttp"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 

instrumentation/othttp/transport.go

@@ -49,7 +49,7 @@ func NewTransport(base http.RoundTripper, opts ...Option) *Transport {
 	}
 
 	defaultOpts := []Option{
-		WithTracer(global.Tracer("go.opentelemetry.io/plugin/othttp")),
+		WithTracer(global.Tracer("go.opentelemetry.io/otel/instrumentation/othttp")),
 		WithPropagators(global.Propagators()),
 		WithSpanOptions(trace.WithSpanKind(trace.SpanKindClient)),
 		WithSpanNameFormatter(defaultTransportFormatter),

sdk/metric/aggregator/ddsketch/ddsketch.go

@@ -43,7 +43,7 @@ var _ aggregator.MinMaxSumCount = &Aggregator{}
 var _ aggregator.Distribution = &Aggregator{}
 
 // New returns a new DDSketch aggregator.
-func New(cfg *Config, desc *metric.Descriptor) *Aggregator {
+func New(desc *metric.Descriptor, cfg *Config) *Aggregator {
 	return &Aggregator{
 		cfg:        cfg,
 		kind:       desc.NumberKind(),

sdk/metric/aggregator/ddsketch/ddsketch_test.go

@@ -34,7 +34,7 @@ func (ut *updateTest) run(t *testing.T, profile test.Profile) {
 	ctx := context.Background()
 
 	descriptor := test.NewAggregatorTest(metric.ValueRecorderKind, profile.NumberKind)
-	agg := New(NewDefaultConfig(), descriptor)
+	agg := New(descriptor, NewDefaultConfig())
 
 	all := test.NewNumbers(profile.NumberKind)
 	for i := 0; i < count; i++ {
@@ -94,8 +94,8 @@ func (mt *mergeTest) run(t *testing.T, profile test.Profile) {
 	ctx := context.Background()
 	descriptor := test.NewAggregatorTest(metric.ValueRecorderKind, profile.NumberKind)
 
-	agg1 := New(NewDefaultConfig(), descriptor)
+	agg1 := New(descriptor, NewDefaultConfig())
-	agg2 := New(NewDefaultConfig(), descriptor)
+	agg2 := New(descriptor, NewDefaultConfig())
 
 	all := test.NewNumbers(profile.NumberKind)
 	for i := 0; i < count; i++ {

sdk/metric/benchmark_test.go

@@ -67,9 +67,9 @@ func (*benchFixture) AggregatorFor(descriptor *metric.Descriptor) export.Aggrega
 		if strings.HasSuffix(descriptor.Name(), "minmaxsumcount") {
 			return minmaxsumcount.New(descriptor)
 		} else if strings.HasSuffix(descriptor.Name(), "ddsketch") {
-			return ddsketch.New(ddsketch.NewDefaultConfig(), descriptor)
+			return ddsketch.New(descriptor, ddsketch.NewDefaultConfig())
 		} else if strings.HasSuffix(descriptor.Name(), "array") {
-			return ddsketch.New(ddsketch.NewDefaultConfig(), descriptor)
+			return ddsketch.New(descriptor, ddsketch.NewDefaultConfig())
 		}
 	}
 	return nil

sdk/metric/integrator/simple/simple.go

@@ -46,7 +46,7 @@ type (
 	}
 
 	batch struct {
-		// RWMutex implements locking for the `CheckpoingSet` interface.
+		// RWMutex implements locking for the `CheckpointSet` interface.
 		sync.RWMutex
 		values map[batchKey]batchValue
 	}

sdk/metric/selector/simple/simple.go

@@ -91,7 +91,7 @@ func (selectorInexpensive) AggregatorFor(descriptor *metric.Descriptor) export.A
 func (s selectorSketch) AggregatorFor(descriptor *metric.Descriptor) export.Aggregator {
 	switch descriptor.MetricKind() {
 	case metric.ValueObserverKind, metric.ValueRecorderKind:
-		return ddsketch.New(s.config, descriptor)
+		return ddsketch.New(descriptor, s.config)
 	default:
 		return sum.New()
 	}