Skip to content
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.

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

Rename otel/label -> otel/attribute #1541

Merged
merged 11 commits into from
Feb 18, 2021
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
punya marked this conversation as resolved.
Show resolved Hide resolved

## [0.17.0] - 2020-02-12

### Changed
Expand Down
4 changes: 2 additions & 2 deletions label/benchmark_test.go → attr/benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
4 changes: 2 additions & 2 deletions label/doc.go → attr/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
//
// 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"
2 changes: 1 addition & 1 deletion label/encoder.go → attr/encoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion label/iterator.go → attr/iterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions label/iterator_test.go → attr/iterator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion label/key.go → attr/key.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions label/key_test.go → attr/key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion label/kv.go → attr/kv.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions label/kv_test.go → attr/kv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion label/set.go → attr/set.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions label/set_test.go → attr/set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion label/type_string.go → attr/type_string.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion label/value.go → attr/value.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions label/value_test.go → attr/value_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion baggage/baggage.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion baggage/baggage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion bridge/opencensus/bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion bridge/opencensus/bridge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion bridge/opentracing/bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion bridge/opentracing/internal/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion bridge/opentracing/mix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/jaeger/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/namedtracer/foo/foo.go
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/label"
label "go.opentelemetry.io/otel/attr"
"go.opentelemetry.io/otel/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion example/namedtracer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion example/otel-collector/main.go
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"
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"
Expand Down
2 changes: 1 addition & 1 deletion example/prom-collector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/prometheus/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/prometheus/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/prometheus/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/prometheus/prometheus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/internal/otlptest/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/internal/otlptest/otlptest.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/internal/transform/attribute.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/internal/transform/attribute_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading