Rename otel/label -> otel/attribute

CHANGELOG.md

@@ -12,6 +12,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Added `resource.Default()` for use with meter and tracer providers. (#1507)
 
+### Changed
+
+- Renamed the `otel/label` package to `otel/attr`.
+
 ## [0.17.0] - 2020-02-12
 
 ### Changed

label/benchmark_test.go → attr/benchmark_test.go

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label_test
+package attr_test
 
 import (
 	"testing"
 
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 )
 
 type test struct{}

label/doc.go → attr/doc.go

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package label provides key and value labels.
+// package attr provides key and value labels.
 //
 // This package is currently in a pre-GA phase. Backwards incompatible changes
 // may be introduced in subsequent minor version releases as we work to track
 // the evolving OpenTelemetry specification and user feedback.
-package label // import "go.opentelemetry.io/otel/label"
+package attr // import "go.opentelemetry.io/otel/attr"

label/encoder.go → attr/encoder.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label // import "go.opentelemetry.io/otel/label"
+package attr // import label "go.opentelemetry.io/otel/attr"
 
 import (
 	"bytes"

label/iterator.go → attr/iterator.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label // import "go.opentelemetry.io/otel/label"
+package attr // import label "go.opentelemetry.io/otel/attr"
 
 // Iterator allows iterating over the set of labels in order,
 // sorted by key.

label/iterator_test.go → attr/iterator_test.go

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label_test
+package attr_test
 
 import (
 	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 )
 
 func TestIterator(t *testing.T) {

label/key.go → attr/key.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label // import "go.opentelemetry.io/otel/label"
+package attr // import label "go.opentelemetry.io/otel/attr"
 
 // Key represents the key part in key-value pairs. It's a string. The
 // allowed character set in the key depends on the use of the key.

label/key_test.go → attr/key_test.go

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label_test
+package attr_test
 
 import (
 	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 )
 
 func TestDefined(t *testing.T) {

label/kv.go → attr/kv.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label // import "go.opentelemetry.io/otel/label"
+package attr // import label "go.opentelemetry.io/otel/attr"
 
 import (
 	"encoding/json"

label/kv_test.go → attr/kv_test.go

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label_test
+package attr_test
 
 import (
 	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
 
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 )
 
 func TestKeyValueConstructors(t *testing.T) {

label/set.go → attr/set.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label // import "go.opentelemetry.io/otel/label"
+package attr // import label "go.opentelemetry.io/otel/attr"
 
 import (
 	"encoding/json"

label/set_test.go → attr/set_test.go

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label_test
+package attr_test
 
 import (
 	"regexp"
 	"testing"
 
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 
 	"github.com/stretchr/testify/require"
 )

label/value.go → attr/value.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label // import "go.opentelemetry.io/otel/label"
+package attr // import label "go.opentelemetry.io/otel/attr"
 
 import (
 	"encoding/json"

label/value_test.go → attr/value_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package label_test
+package attr_test
 
 import (
 	"reflect"
@@ -21,7 +21,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 )
 
 func TestValue(t *testing.T) {

baggage/baggage.go

@@ -17,8 +17,8 @@ package baggage // import "go.opentelemetry.io/otel/baggage"
 import (
 	"context"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/internal/baggage"
-	"go.opentelemetry.io/otel/label"
 )
 
 // Set returns a copy of the set of baggage key-values in ctx.

baggage/baggage_test.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"testing"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/internal/baggage"
-	"go.opentelemetry.io/otel/label"
 )
 
 func TestBaggage(t *testing.T) {

bridge/opencensus/bridge.go

@@ -21,9 +21,9 @@ import (
 	octrace "go.opencensus.io/trace"
 
 	"go.opentelemetry.io/otel"
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/bridge/opencensus/utils"
 	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/trace"
 )
 

bridge/opencensus/bridge_test.go

@@ -20,9 +20,9 @@ import (
 
 	octrace "go.opencensus.io/trace"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/bridge/opencensus/utils"
 	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/oteltest"
 	"go.opentelemetry.io/otel/trace"
 )

bridge/opentracing/bridge.go

@@ -26,12 +26,12 @@ import (
 	otlog "github.com/opentracing/opentracing-go/log"
 
 	"go.opentelemetry.io/otel"
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/bridge/opentracing/migration"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/internal/baggage"
 	"go.opentelemetry.io/otel/internal/trace/noop"
 	otelparent "go.opentelemetry.io/otel/internal/trace/parent"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"
 )

bridge/opentracing/internal/mock.go

@@ -21,10 +21,10 @@ import (
 	"sync"
 	"time"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/internal/baggage"
 	otelparent "go.opentelemetry.io/otel/internal/trace/parent"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/trace"
 
 	"go.opentelemetry.io/otel/bridge/opentracing/migration"

bridge/opentracing/mix_test.go

@@ -22,8 +22,8 @@ import (
 	ot "github.com/opentracing/opentracing-go"
 
 	"go.opentelemetry.io/otel"
+	label "go.opentelemetry.io/otel/attr"
 	otelbaggage "go.opentelemetry.io/otel/internal/baggage"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/trace"
 
 	"go.opentelemetry.io/otel/bridge/opentracing/internal"

example/jaeger/main.go

@@ -21,7 +21,7 @@ import (
 	"log"
 
 	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 
 	"go.opentelemetry.io/otel/exporters/trace/jaeger"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"

example/namedtracer/foo/foo.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/trace"
 )
 

example/namedtracer/main.go

@@ -19,10 +19,10 @@ import (
 	"log"
 
 	"go.opentelemetry.io/otel"
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/example/namedtracer/foo"
 	"go.opentelemetry.io/otel/exporters/stdout"
-	"go.opentelemetry.io/otel/label"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/trace"
 )

example/otel-collector/main.go

@@ -26,9 +26,9 @@ import (
 	"google.golang.org/grpc"
 
 	"go.opentelemetry.io/otel"
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/exporters/otlp"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpgrpc"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/global"
 	"go.opentelemetry.io/otel/propagation"

example/prom-collector/main.go

@@ -23,10 +23,10 @@ import (
 
 	"google.golang.org/grpc"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/exporters/metric/prometheus"
 	"go.opentelemetry.io/otel/exporters/otlp"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpgrpc"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/global"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/histogram"

example/prometheus/main.go

@@ -22,8 +22,8 @@ import (
 	"sync"
 	"time"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/exporters/metric/prometheus"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/global"
 )

exporters/metric/prometheus/example_test.go

@@ -22,8 +22,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/exporters/metric/prometheus"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/metric"
 	controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
 	"go.opentelemetry.io/otel/sdk/resource"

exporters/metric/prometheus/prometheus.go

@@ -27,7 +27,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
 	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/label"
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/global"
 	"go.opentelemetry.io/otel/metric/number"

exporters/metric/prometheus/prometheus_test.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/exporters/metric/prometheus"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/metric"
 	controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
 	"go.opentelemetry.io/otel/sdk/resource"

exporters/otlp/internal/otlptest/data.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/number"
 	exportmetric "go.opentelemetry.io/otel/sdk/export/metric"

exporters/otlp/internal/otlptest/otlptest.go

@@ -23,9 +23,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	label "go.opentelemetry.io/otel/attr"
 	"go.opentelemetry.io/otel/exporters/otlp"
 	commonpb "go.opentelemetry.io/otel/exporters/otlp/internal/opentelemetry-proto-gen/common/v1"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/number"
 	exportmetric "go.opentelemetry.io/otel/sdk/export/metric"

exporters/otlp/internal/transform/attribute.go

@@ -17,8 +17,8 @@ package transform
 import (
 	"reflect"
 
+	label "go.opentelemetry.io/otel/attr"
 	commonpb "go.opentelemetry.io/otel/exporters/otlp/internal/opentelemetry-proto-gen/common/v1"
-	"go.opentelemetry.io/otel/label"
 
 	"go.opentelemetry.io/otel/sdk/resource"
 )

exporters/otlp/internal/transform/attribute_test.go

@@ -19,8 +19,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	label "go.opentelemetry.io/otel/attr"
 	commonpb "go.opentelemetry.io/otel/exporters/otlp/internal/opentelemetry-proto-gen/common/v1"
-	"go.opentelemetry.io/otel/label"
 )
 
 type attributeTest struct {