Use url.PathUnescape rather than url.QueryUnescape when parsing OTLP headers and resource attributes env vars (#4698) (#4699)

sdk/resource/env.go

@@ -89,7 +89,7 @@ func constructOTResources(s string) (*Resource, error) {
 			continue
 		}
 		key := strings.TrimSpace(k)
-		val, err := url.QueryUnescape(strings.TrimSpace(v))
+		val, err := url.PathUnescape(strings.TrimSpace(v))
 		if err != nil {
 			// Retain original value if decoding fails, otherwise it will be
 			// an empty string.

sdk/resource/env_test.go

@@ -40,6 +40,19 @@ func TestDetectOnePair(t *testing.T) {
 	assert.Equal(t, NewSchemaless(attribute.String("key", "value")), res)
 }
 
+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()) }()
+
+	detector := &fromEnv{}
+	res, err := detector.Detect(context.Background())
+	require.NoError(t, err)
+	assert.Equal(t, NewSchemaless(attribute.String("key", "x+y+z?q=123")), res)
+}
+
 func TestDetectMultiPairs(t *testing.T) {
 	store, err := ottest.SetEnvVariables(map[string]string{
 		"x":             "1",
@@ -60,6 +73,23 @@ func TestDetectMultiPairs(t *testing.T) {
 	), res)
 }
 
+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()) }()
+
+	detector := &fromEnv{}
+	res, err := detector.Detect(context.Background())
+	require.NoError(t, err)
+	assert.Equal(t, NewSchemaless(
+		attribute.String("key", "x+y+z"),
+		attribute.String("namespace", "localhost/test&verify"),
+	), res)
+}
+
 func TestEmpty(t *testing.T) {
 	store, err := ottest.SetEnvVariables(map[string]string{
 		resourceAttrKey: "   ",