Skip to content

Replace env var functionality from internaltest in sdk/resource and sdk/log #6557

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Mar 28, 2025
Merged

Replace env var functionality from internaltest in sdk/resource and sdk/log #6557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2ddfab
chore(deps): update module github.com/sagikazarmark/locafero to v0.9.…
renovate[bot] Mar 26, 2025
a6151d1
Merge remote-tracking branch 'upstream/main'
yumosx Mar 27, 2025
08991b0
Merge remote-tracking branch 'upstream/main'
yumosx Mar 27, 2025
ca37eae
Replace all uses of the internaltest package in sdk/log
yumosx Mar 27, 2025
d2867b9
Replace all uses of the internaltest package in sdk/resource
yumosx Mar 27, 2025
f017e18
Merge branch 'main' into yumosx-log
pellared Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions sdk/log/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"go.opentelemetry.io/otel/internal/global"
"go.opentelemetry.io/otel/log"
"go.opentelemetry.io/otel/log/noop"
ottest "go.opentelemetry.io/otel/sdk/internal/internaltest"
"go.opentelemetry.io/otel/sdk/resource"
)

Expand Down Expand Up @@ -184,11 +183,7 @@ func mergeResource(t *testing.T, r1, r2 *resource.Resource) *resource.Resource {
}

func TestWithResource(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
envVarResourceAttributes: "key=value,rk5=7",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()
t.Setenv(envVarResourceAttributes, "key=value,rk5=7")

cases := []struct {
name string
Expand Down
66 changes: 12 additions & 54 deletions sdk/resource/env_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,11 @@ import (
"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/attribute"
ottest "go.opentelemetry.io/otel/sdk/internal/internaltest"
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
)

func TestDetectOnePair(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
resourceAttrKey: "key=value",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()
t.Setenv(resourceAttrKey, "key=value")

detector := &fromEnv{}
res, err := detector.Detect(context.Background())
Expand All @@ -30,11 +25,7 @@ func TestDetectOnePair(t *testing.T) {
}

func TestDetectURIEncodingOnePair(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
resourceAttrKey: "key=x+y+z?q=123",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()
t.Setenv(resourceAttrKey, "key=x+y+z?q=123")

detector := &fromEnv{}
res, err := detector.Detect(context.Background())
Expand All @@ -43,12 +34,8 @@ func TestDetectURIEncodingOnePair(t *testing.T) {
}

func TestDetectMultiPairs(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
"x": "1",
resourceAttrKey: "key=value, k = v , a= x, a=z, b=c%2Fd",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()
t.Setenv("x", "1")
t.Setenv(resourceAttrKey, "key=value, k = v , a= x, a=z, b=c%2Fd")

detector := &fromEnv{}
res, err := detector.Detect(context.Background())
Expand All @@ -63,13 +50,8 @@ func TestDetectMultiPairs(t *testing.T) {
}

func TestDetectURIEncodingMultiPairs(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
"x": "1",
resourceAttrKey: "key=x+y+z,namespace=localhost/test&verify",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()

t.Setenv("x", "1")
t.Setenv(resourceAttrKey, "key=x+y+z,namespace=localhost/test&verify")
detector := &fromEnv{}
res, err := detector.Detect(context.Background())
require.NoError(t, err)
Expand All @@ -80,24 +62,15 @@ func TestDetectURIEncodingMultiPairs(t *testing.T) {
}

func TestEmpty(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
resourceAttrKey: " ",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()

t.Setenv(resourceAttrKey, " ")
detector := &fromEnv{}
res, err := detector.Detect(context.Background())
require.NoError(t, err)
assert.Equal(t, Empty(), res)
}

func TestNoResourceAttributesSet(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
svcNameKey: "bar",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()
t.Setenv(svcNameKey, "bar")
detector := &fromEnv{}
res, err := detector.Detect(context.Background())
require.NoError(t, err)
Expand All @@ -107,12 +80,7 @@ func TestNoResourceAttributesSet(t *testing.T) {
}

func TestMissingKeyError(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
resourceAttrKey: "key=value,key",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()

t.Setenv(resourceAttrKey, "key=value,key")
detector := &fromEnv{}
res, err := detector.Detect(context.Background())
assert.Error(t, err)
Expand All @@ -123,12 +91,7 @@ func TestMissingKeyError(t *testing.T) {
}

func TestInvalidPercentDecoding(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
resourceAttrKey: "key=%invalid",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()

t.Setenv(resourceAttrKey, "key=%invalid")
detector := &fromEnv{}
res, err := detector.Detect(context.Background())
assert.NoError(t, err)
Expand All @@ -138,13 +101,8 @@ func TestInvalidPercentDecoding(t *testing.T) {
}

func TestDetectServiceNameFromEnv(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
resourceAttrKey: "key=value,service.name=foo",
svcNameKey: "bar",
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()

t.Setenv(resourceAttrKey, "key=value,service.name=foo")
t.Setenv(svcNameKey, "bar")
detector := &fromEnv{}
res, err := detector.Detect(context.Background())
require.NoError(t, err)
Expand Down
8 changes: 1 addition & 7 deletions sdk/resource/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/sdk"
ottest "go.opentelemetry.io/otel/sdk/internal/internaltest"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
)
Expand Down Expand Up @@ -426,12 +425,7 @@ func TestNew(t *testing.T) {
}
for _, tt := range tc {
t.Run(tt.name, func(t *testing.T) {
store, err := ottest.SetEnvVariables(map[string]string{
envVar: tt.envars,
})
require.NoError(t, err)
defer func() { require.NoError(t, store.Restore()) }()

t.Setenv(envVar, tt.envars)
ctx := context.Background()
res, err := resource.New(ctx, tt.options...)

Expand Down
Loading