go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-11-29 23:07:45 +02:00
Code Issues Releases Activity

Rename otel/label -> otel/attribute (#1541)

Browse Source 
* Rename otel/label -> otel/attr

Leave the imported name alone, to avoid a large diff and conflicts

* Better import comment

* Update CHANGELOG.md

Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>

* otel/attr -> otel/attribute

* Missed the changelog entry

* Get rid of import renaming

* Merge remaining conflicts

Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
This commit is contained in:
Punya Biswal
2021-02-18 12:59:37 -05:00
committed by GitHub
parent 1b5b662136
commit ecf65d7968
123 changed files with 1715 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sdk/resource/env_test.go
View File

@@ -22,8 +22,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/otel/attribute"
ottest "go.opentelemetry.io/otel/internal/internaltest"
"go.opentelemetry.io/otel/label"
)
func TestDetectOnePair(t *testing.T) {
@@ -36,7 +36,7 @@ func TestDetectOnePair(t *testing.T) {
detector := &FromEnv{}
res, err := detector.Detect(context.Background())
require.NoError(t, err)
assert.Equal(t, NewWithAttributes(label.String("key", "value")), res)
assert.Equal(t, NewWithAttributes(attribute.String("key", "value")), res)
}
func TestDetectMultiPairs(t *testing.T) {
@@ -51,10 +51,10 @@ func TestDetectMultiPairs(t *testing.T) {
res, err := detector.Detect(context.Background())
require.NoError(t, err)
assert.Equal(t, res, NewWithAttributes(
label.String("key", "value"),
label.String("k", "v"),
label.String("a", "x"),
label.String("a", "z"),
attribute.String("key", "value"),
attribute.String("k", "v"),
attribute.String("a", "x"),
attribute.String("a", "z"),
))
}
@@ -83,6 +83,6 @@ func TestMissingKeyError(t *testing.T) {
assert.Error(t, err)
assert.Equal(t, err, fmt.Errorf("%w: %v", errMissingValue, "[key]"))
assert.Equal(t, res, NewWithAttributes(
label.String("key", "value"),
attribute.String("key", "value"),
))
}