Merge branch 'main' into rename-DataPointFlags

CHANGELOG.md

@@ -37,6 +37,9 @@
 - Deprecate `pmetric.MetricAggregationTemporality` enum type in favor of `pmetric.AggregationTemporality` (#6249)
 - Deprecate `confmap.Conf.UnmarshalExact` in favor of `confmap.Conf.Unmarshal(.., WithErrorUnused)` (#6231)
 - Deprecate `pmetric.MetricDataPointFlags` favor of `pmetric.DataPointFlags` (#6259)
+- Deprecate `ptrace.SpanStatus` favor of `ptrace.Status` (#6258)
+- Deprecate `pmetric.[New]?Buckets` in favor of `pmetric.[New]?ExponentialHistogramDataPointBuckets` (#6261)
+- Deprecate `plog.SeverityNumberUndefined` in favor of `plog.SeverityNumberUnspecified` (#6269)
 
 ### 💡 Enhancements 💡
 

cmd/otelcorecol/go.mod

@@ -73,7 +73,7 @@ require (
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
-	google.golang.org/grpc v1.49.0 // indirect
+	google.golang.org/grpc v1.50.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

cmd/otelcorecol/go.sum

@@ -750,8 +750,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
-google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

confmap/resolver.go

@@ -25,13 +25,21 @@ import (
 	"go.uber.org/multierr"
 )
 
-// follows drive-letter specification:
-// https://tools.ietf.org/id/draft-kerwin-file-scheme-07.html#syntax
-var driverLetterRegexp = regexp.MustCompile("^[A-z]:")
+var (
+	// follows drive-letter specification:
+	// https://tools.ietf.org/id/draft-kerwin-file-scheme-07.html#syntax
+	driverLetterRegexp = regexp.MustCompile("^[A-z]:")
+
+	// Scheme name consist of a sequence of characters beginning with a letter and followed by any
+	// combination of letters, digits, plus ("+"), period ("."), or hyphen ("-").
+	locationRegexp = regexp.MustCompile(`^(?P<Scheme>[A-Za-z][A-Za-z0-9+.-]+):(?P<OpaqueValue>.*)$`)
+
+	errTooManyRecursiveExpansions = errors.New("too many recursive expansions")
+)
 
 // Resolver resolves a configuration as a Conf.
 type Resolver struct {
-	uris       []string
+	uris       []location
 	providers  map[string]Provider
 	converters []Converter
 
@@ -85,8 +93,21 @@ func NewResolver(set ResolverSettings) (*Resolver, error) {
 	}
 
 	// Safe copy, ensures the slices and maps cannot be changed from the caller.
-	urisCopy := make([]string, len(set.URIs))
-	copy(urisCopy, set.URIs)
+	uris := make([]location, len(set.URIs))
+	for i, uri := range set.URIs {
+		// For backwards compatibility:
+		// - empty url scheme means "file".
+		// - "^[A-z]:" also means "file"
+		if driverLetterRegexp.MatchString(uri) || !strings.Contains(uri, ":") {
+			uris[i] = location{scheme: "file", opaqueValue: uri}
+			continue
+		}
+		lURI, err := newLocation(uri)
+		if err != nil {
+			return nil, err
+		}
+		uris[i] = lURI
+	}
 	providersCopy := make(map[string]Provider, len(set.Providers))
 	for k, v := range set.Providers {
 		providersCopy[k] = v
@@ -95,7 +116,7 @@ func NewResolver(set ResolverSettings) (*Resolver, error) {
 	copy(convertersCopy, set.Converters)
 
 	return &Resolver{
-		uris:       urisCopy,
+		uris:       uris,
 		providers:  providersCopy,
 		converters: convertersCopy,
 		watcher:    make(chan error, 1),
@@ -114,13 +135,7 @@ func (mr *Resolver) Resolve(ctx context.Context) (*Conf, error) {
 	// Retrieves individual configurations from all URIs in the given order, and merge them in retMap.
 	retMap := New()
 	for _, uri := range mr.uris {
-		// For backwards compatibility:
-		// - empty url scheme means "file".
-		// - "^[A-z]:" also means "file"
-		if driverLetterRegexp.MatchString(uri) {
-			uri = "file:" + uri
-		}
-		ret, err := mr.retrieveValue(ctx, location{uri: uri, defaultScheme: "file"})
+		ret, err := mr.retrieveValue(ctx, uri)
 		if err != nil {
 			return nil, fmt.Errorf("cannot retrieve the configuration: %w", err)
 		}
@@ -206,23 +221,21 @@ func (mr *Resolver) expandValueRecursively(ctx context.Context, value interface{
 		}
 		value = val
 	}
-	return nil, errors.New("too many recursive expansions")
+	return nil, errTooManyRecursiveExpansions
 }
 
-// Scheme name consist of a sequence of characters beginning with a letter and followed by any
-// combination of letters, digits, plus ("+"), period ("."), or hyphen ("-").
-var expandRegexp = regexp.MustCompile(`^\$\{[A-Za-z][A-Za-z0-9+.-]+:.*}$`)
-
 func (mr *Resolver) expandValue(ctx context.Context, value interface{}) (interface{}, bool, error) {
 	switch v := value.(type) {
 	case string:
 		// If it doesn't have the format "${scheme:opaque}" no need to expand.
-		if !expandRegexp.MatchString(v) {
+		if !strings.HasPrefix(v, "${") || !strings.HasSuffix(v, "}") || !strings.Contains(v, ":") {
 			return value, false, nil
 		}
-		uri := v[2 : len(v)-1]
-		// At this point it is guaranteed to have a valid "scheme" based on the expandRegexp, so no default.
-		ret, err := mr.retrieveValue(ctx, location{uri: uri})
+		lURI, err := newLocation(v[2 : len(v)-1])
+		if err != nil {
+			return nil, false, err
+		}
+		ret, err := mr.retrieveValue(ctx, lURI)
 		if err != nil {
 			return nil, false, err
 		}
@@ -258,21 +271,26 @@ func (mr *Resolver) expandValue(ctx context.Context, value interface{}) (interfa
 }
 
 type location struct {
-	uri           string
-	defaultScheme string
+	scheme      string
+	opaqueValue string
+}
+
+func (c location) asString() string {
+	return c.scheme + ":" + c.opaqueValue
 }
 
-func (mr *Resolver) retrieveValue(ctx context.Context, l location) (*Retrieved, error) {
-	uri := l.uri
-	scheme := l.defaultScheme
-	if idx := strings.Index(uri, ":"); idx != -1 {
-		scheme = uri[:idx]
-	} else {
-		uri = scheme + ":" + uri
+func newLocation(uri string) (location, error) {
+	submatches := locationRegexp.FindStringSubmatch(uri)
+	if len(submatches) != 3 {
+		return location{}, fmt.Errorf("invalid uri: %q", uri)
 	}
-	p, ok := mr.providers[scheme]
+	return location{scheme: submatches[1], opaqueValue: submatches[2]}, nil
+}
+
+func (mr *Resolver) retrieveValue(ctx context.Context, uri location) (*Retrieved, error) {
+	p, ok := mr.providers[uri.scheme]
 	if !ok {
-		return nil, fmt.Errorf("scheme %q is not supported for uri %q", scheme, uri)
+		return nil, fmt.Errorf("scheme %q is not supported for uri %q", uri.scheme, uri.asString())
 	}
-	return p.Retrieve(ctx, uri, mr.onChange)
+	return p.Retrieve(ctx, uri.asString(), mr.onChange)
 }

confmap/resolver_test.go

@@ -95,6 +95,11 @@ func (m *mockConverter) Convert(context.Context, *Conf) error {
 	return errors.New("converter_err")
 }
 
+func TestNewResolverInvalidScheme(t *testing.T) {
+	_, err := NewResolver(ResolverSettings{URIs: []string{"s_3:has invalid char"}, Providers: makeMapProvidersMap(&mockProvider{scheme: "s_3"})})
+	assert.EqualError(t, err, `invalid uri: "s_3:has invalid char"`)
+}
+
 func TestResolverErrors(t *testing.T) {
 	tests := []struct {
 		name              string
@@ -108,7 +113,7 @@ func TestResolverErrors(t *testing.T) {
 	}{
 		{
 			name:             "unsupported location scheme",
-			locations:        []string{"mock:", "not_supported:"},
+			locations:        []string{"mock:", "notsupported:"},
 			providers:        []Provider{&mockProvider{}},
 			expectResolveErr: true,
 		},
@@ -414,7 +419,7 @@ func TestResolverInfiniteExpand(t *testing.T) {
 	resolver.enableExpand = true
 
 	_, err = resolver.Resolve(context.Background())
-	assert.Error(t, err)
+	assert.ErrorIs(t, err, errTooManyRecursiveExpansions)
 }
 
 func TestResolverExpandSliceValueError(t *testing.T) {
@@ -431,7 +436,7 @@ func TestResolverExpandSliceValueError(t *testing.T) {
 	resolver.enableExpand = true
 
 	_, err = resolver.Resolve(context.Background())
-	assert.Error(t, err)
+	assert.EqualError(t, err, "unsupported type=*errors.errorString for retrieved config")
 }
 
 func TestResolverExpandMapValueError(t *testing.T) {
@@ -448,7 +453,25 @@ func TestResolverExpandMapValueError(t *testing.T) {
 	resolver.enableExpand = true
 
 	_, err = resolver.Resolve(context.Background())
-	assert.Error(t, err)
+	assert.EqualError(t, err, "unsupported type=*errors.errorString for retrieved config")
+}
+
+func TestResolverExpandInvalidScheme(t *testing.T) {
+	const receiverValue = "${g_c_s:VALUE}"
+	provider := newFakeProvider("input", func(context.Context, string, WatcherFunc) (*Retrieved, error) {
+		return NewRetrieved(map[string]interface{}{"test": receiverValue})
+	})
+
+	testProvider := newFakeProvider("g_c_s", func(context.Context, string, WatcherFunc) (*Retrieved, error) {
+		return NewRetrieved(receiverValue)
+	})
+
+	resolver, err := NewResolver(ResolverSettings{URIs: []string{"input:"}, Providers: makeMapProvidersMap(provider, testProvider), Converters: nil})
+	require.NoError(t, err)
+	resolver.enableExpand = true
+
+	_, err = resolver.Resolve(context.Background())
+	assert.EqualError(t, err, `invalid uri: "g_c_s:VALUE"`)
 }
 
 func makeMapProvidersMap(providers ...Provider) map[string]Provider {

go.mod

@@ -39,7 +39,7 @@ require (
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
 	golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664
 	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
-	google.golang.org/grpc v1.49.0
+	google.golang.org/grpc v1.50.0
 	google.golang.org/protobuf v1.28.1
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -754,8 +754,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
-google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=