Decode values from OTEL_RESOURCE_ATTRIBUTES

CHANGELOG.md

@@ -17,6 +17,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Fix misidentification of OpenTelemetry `SpanKind` in OpenTracing bridge (`go.opentelemetry.io/otel/bridge/opentracing`).  (#3096)
 
+### Changed
+
+- Decode urlencoded values from the `OTEL_RESOURCE_ATTRIBUTES` environment variable. (#2963)
+
 ## [1.9.0/0.0.3] - 2022-08-01
 
 ### Added

sdk/resource/env.go

@@ -17,9 +17,11 @@ package resource // import "go.opentelemetry.io/otel/sdk/resource"
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"os"
 	"strings"
 
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
 )
@@ -88,7 +90,14 @@ func constructOTResources(s string) (*Resource, error) {
 			invalid = append(invalid, p)
 			continue
 		}
-		k, v := strings.TrimSpace(field[0]), strings.TrimSpace(field[1])
+		k := strings.TrimSpace(field[0])
+		v, err := url.QueryUnescape(strings.TrimSpace(field[1]))
+		if err != nil {
+			// Retain original value if decoding fails, otherwise it will be
+			// an empty string.
+			v = field[1]
+			otel.Handle(err)
+		}
 		attrs = append(attrs, attribute.String(k, v))
 	}
 	var err error

sdk/resource/env_test.go

@@ -43,20 +43,21 @@ func TestDetectOnePair(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",
+		resourceAttrKey: "key=value, k = v , a= x, a=z, b=c%2Fd",
 	})
 	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, res, NewSchemaless(
+	assert.Equal(t, NewSchemaless(
 		attribute.String("key", "value"),
 		attribute.String("k", "v"),
 		attribute.String("a", "x"),
 		attribute.String("a", "z"),
-	))
+		attribute.String("b", "c/d"),
+	), res)
 }
 
 func TestEmpty(t *testing.T) {
@@ -102,6 +103,21 @@ 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()) }()
+
+	detector := &fromEnv{}
+	res, err := detector.Detect(context.Background())
+	assert.NoError(t, err)
+	assert.Equal(t, NewSchemaless(
+		attribute.String("key", "%invalid"),
+	), res)
+}
+
 func TestDetectServiceNameFromEnv(t *testing.T) {
 	store, err := ottest.SetEnvVariables(map[string]string{
 		resourceAttrKey: "key=value,service.name=foo",