From b2ddfab78aab4079433f7f5921c831c0d90045e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Mar 2025 15:34:54 -0700 Subject: [PATCH 1/3] chore(deps): update module github.com/sagikazarmark/locafero to v0.9.0 (#6528) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/sagikazarmark/locafero](https://redirect.github.com/sagikazarmark/locafero) | `v0.8.0` -> `v0.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fsagikazarmark%2flocafero/v0.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fsagikazarmark%2flocafero/v0.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fsagikazarmark%2flocafero/v0.8.0/v0.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fsagikazarmark%2flocafero/v0.8.0/v0.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
sagikazarmark/locafero (github.com/sagikazarmark/locafero) ### [`v0.9.0`](https://redirect.github.com/sagikazarmark/locafero/compare/v0.8.0...v0.9.0) [Compare Source](https://redirect.github.com/sagikazarmark/locafero/compare/v0.8.0...v0.9.0)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- internal/tools/go.mod | 2 +- internal/tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index d441300ab9d..bf68d875374 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -165,7 +165,7 @@ require ( github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/ryancurrah/gomodguard v1.4.1 // indirect github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect - github.com/sagikazarmark/locafero v0.8.0 // indirect + github.com/sagikazarmark/locafero v0.9.0 // indirect github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index c747b5d4d1a..8003452eaa1 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -388,8 +388,8 @@ github.com/ryancurrah/gomodguard v1.4.1 h1:eWC8eUMNZ/wM/PWuZBv7JxxqT5fiIKSIyTvjb github.com/ryancurrah/gomodguard v1.4.1/go.mod h1:qnMJwV1hX9m+YJseXEBhd2s90+1Xn6x9dLz11ualI1I= github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= -github.com/sagikazarmark/locafero v0.8.0 h1:mXaMVw7IqxNBxfv3LdWt9MDmcWDQ1fagDH918lOdVaQ= -github.com/sagikazarmark/locafero v0.8.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk= +github.com/sagikazarmark/locafero v0.9.0 h1:GbgQGNtTrEmddYDSAH9QLRyfAHY12md+8YFTqyMTC9k= +github.com/sagikazarmark/locafero v0.9.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk= github.com/sanposhiho/wastedassign/v2 v2.1.0 h1:crurBF7fJKIORrV85u9UUpePDYGWnwvv3+A96WvwXT0= github.com/sanposhiho/wastedassign/v2 v2.1.0/go.mod h1:+oSmSC+9bQ+VUAxA66nBb0Z7N8CK7mscKTDYC6aIek4= github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 h1:PKK9DyHxif4LZo+uQSgXNqs0jj5+xZwwfKHgph2lxBw= From ca37eaeecc3c6c6aec51a42c1a24e660dbbd863c Mon Sep 17 00:00:00 2001 From: yumos Date: Thu, 27 Mar 2025 20:26:20 +0800 Subject: [PATCH 2/3] Replace all uses of the internaltest package in sdk/log --- sdk/log/provider_test.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sdk/log/provider_test.go b/sdk/log/provider_test.go index 22c0e187b21..d3e8faf66e6 100644 --- a/sdk/log/provider_test.go +++ b/sdk/log/provider_test.go @@ -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 From d2867b94ff5229af12028e81d3cb9402279657d9 Mon Sep 17 00:00:00 2001 From: yumos Date: Thu, 27 Mar 2025 20:42:19 +0800 Subject: [PATCH 3/3] Replace all uses of the internaltest package in sdk/resource --- sdk/resource/env_test.go | 66 +++++++---------------------------- sdk/resource/resource_test.go | 8 +---- 2 files changed, 13 insertions(+), 61 deletions(-) diff --git a/sdk/resource/env_test.go b/sdk/resource/env_test.go index cb514d76554..d8082992154 100644 --- a/sdk/resource/env_test.go +++ b/sdk/resource/env_test.go @@ -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) diff --git a/sdk/resource/resource_test.go b/sdk/resource/resource_test.go index 18538d43bb4..4872a71c026 100644 --- a/sdk/resource/resource_test.go +++ b/sdk/resource/resource_test.go @@ -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...)