go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-08-10 22:31:50 +02:00
Code Issues Releases Activity

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

Browse Source 
Fix #6537
Fix #6539 

Replace all uses of the environment variable functionality from the
`sdk/internal/internaltest` package in `sdk/resource` and `sdk/log`.
This commit is contained in:
ian
2025-03-28 20:58:33 +08:00
committed by GitHub
parent bdc123df40
commit 9d555cd4a6
3 changed files with 14 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sdk/log/provider_test.go
View File

@@ -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"
)
@@ -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

66
sdk/resource/env_test.go
View File

@@ -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())
@@ -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())
@@ -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())
@@ -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)
@@ -80,12 +62,7 @@ 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)
@@ -93,11 +70,7 @@ func TestEmpty(t *testing.T) {
}
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)
@@ -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)
@@ -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)
@@ -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)

8
sdk/resource/resource_test.go
View File

@@ -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"
)
@@ -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...)