-
Notifications
You must be signed in to change notification settings - Fork 327
Add resource package #878
Add resource package #878
Changes from 9 commits
e71bc5a
4b3bba9
361940e
2e51332
06fb0e2
8bc50df
41841a5
0222b25
90b9980
3b6d965
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
// Copyright 2018, OpenCensus Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
// Package resource defines the resource type and provides helpers to derive them as well | ||
// as the generic population through environment variables. | ||
package resource | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"os" | ||
"regexp" | ||
"sort" | ||
"strconv" | ||
"strings" | ||
) | ||
|
||
const ( | ||
EnvVarType = "OC_RESOURCE_TYPE" | ||
EnvVarLabels = "OC_RESOURCE_LABELS" | ||
) | ||
|
||
// Resource describes an entity about which identifying information and metadata is exposed. | ||
semistrict marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// For example, a type "k8s.io/container" may hold labels describing the pod name and namespace. | ||
type Resource struct { | ||
Type string | ||
Labels map[string]string | ||
} | ||
|
||
// EncodeLabels encodes a labels map to a string as provided via the OC_RESOURCE_LABELS environment variable. | ||
func EncodeLabels(labels map[string]string) string { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you need this to be public (exported)? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's not used internally at all, so it's only here for public use. Seemed good to have and we already have a use case with the tool that runs discoveries and produces envvars. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can document that most users will depend on FromEnv in the godoc. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In which one? Seems odd to document that getter X will be used more frequently in the docstring of a encoder. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Documenting what most users might prefer in godoc is a style we often use at Google and elsewhere. We don't have to do it, I just want users to have an easier time finding an entry point. |
||
sortedKeys := make([]string, 0, len(labels)) | ||
for k := range labels { | ||
sortedKeys = append(sortedKeys, k) | ||
} | ||
sort.Strings(sortedKeys) | ||
|
||
s := "" | ||
for i, k := range sortedKeys { | ||
if i > 0 { | ||
s += "," | ||
} | ||
s += k + "=" + strconv.Quote(labels[k]) | ||
} | ||
return s | ||
} | ||
|
||
var labelRegex = regexp.MustCompile(`^\s*([[:ascii:]]{1,256}?)=("[[:ascii:]]{0,256}?")\s*,`) | ||
|
||
// DecodeLabels decodes a serialized label map as used in the OC_RESOURCE_LABELS variable. | ||
// A list of labels of the form `<key1>="<value1>",<key2>="<value2>",...` is accepted. | ||
// Domain names and paths are accepted as label keys. | ||
func DecodeLabels(s string) (map[string]string, error) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment about public. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since we have There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think there's an argument to make both EncodeLabels and DecodeLabels private and just document the expected format in the FromEnv godoc: How do we expect users to use EncodeLabels? Won't they usually just set environment variables in something like a k8s yaml file or shell script? If so, how does it help to have a Go function exported? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We already have a use case for |
||
m := map[string]string{} | ||
// Ensure a trailing comma, which allows us to keep the regex simpler | ||
s = strings.TrimRight(strings.TrimSpace(s), ",") + "," | ||
|
||
for len(s) > 0 { | ||
match := labelRegex.FindStringSubmatch(s) | ||
if len(match) == 0 { | ||
return nil, fmt.Errorf("invalid label formatting, remainder: %s", s) | ||
} | ||
v := match[2] | ||
if v == "" { | ||
v = match[3] | ||
} else { | ||
var err error | ||
if v, err = strconv.Unquote(v); err != nil { | ||
return nil, fmt.Errorf("invalid label formatting, remainder: %s, err: %s", s, err) | ||
} | ||
} | ||
m[match[1]] = v | ||
|
||
s = s[len(match[0]):] | ||
} | ||
return m, nil | ||
} | ||
|
||
// FromEnv is a detector that loads resource information from the OC_RESOURCE_TYPE | ||
// and OC_RESOURCE_labelS environment variables. | ||
func FromEnv(context.Context) (*Resource, error) { | ||
semistrict marked this conversation as resolved.
Show resolved
Hide resolved
|
||
res := &Resource{ | ||
Type: strings.TrimSpace(os.Getenv(EnvVarType)), | ||
} | ||
labels := strings.TrimSpace(os.Getenv(EnvVarLabels)) | ||
if labels == "" { | ||
return res, nil | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If EnvVarType is empty, wouldn't it make more sense to return a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The type is not mandatory per our specs so I don't think we necessarily have to handle it specially here. |
||
} | ||
var err error | ||
fabxc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if res.Labels, err = DecodeLabels(labels); err != nil { | ||
return nil, err | ||
} | ||
return res, nil | ||
} | ||
|
||
var _ Detector = FromEnv | ||
|
||
// merge resource information from b into a. In case of a collision, a takes precedence. | ||
func merge(a, b *Resource) *Resource { | ||
if a == nil { | ||
return b | ||
} | ||
if b == nil { | ||
return a | ||
} | ||
res := &Resource{ | ||
Type: a.Type, | ||
Labels: map[string]string{}, | ||
} | ||
if res.Type == "" { | ||
res.Type = b.Type | ||
} | ||
for k, v := range b.Labels { | ||
res.Labels[k] = v | ||
} | ||
// Labels from resource a overwrite labels from resource b. | ||
for k, v := range a.Labels { | ||
res.Labels[k] = v | ||
} | ||
return res | ||
} | ||
|
||
// Detector attempts to detect resource information. | ||
// If the detector cannot find resource information, the returned resource is nil but no | ||
// error is returned. | ||
// An error is only returned on unexpected failures. | ||
type Detector func(context.Context) (*Resource, error) | ||
|
||
// ChainedDetector returns a Detector that calls all input detectors in order and | ||
// merges each result with the previous one. In case a type of label key is already set, | ||
// the first set value is takes precedence. | ||
// It returns on the first error that a sub-detector encounters. | ||
fabxc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
func ChainedDetector(detectors ...Detector) Detector { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe FromDetectors? I will let @rakyll propose a good name for this. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What about MultiDetector a la io.MultiReader? |
||
return func(ctx context.Context) (*Resource, error) { | ||
fabxc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return detectAll(ctx, detectors...) | ||
} | ||
} | ||
|
||
// detectall calls all input detectors sequentially an merges each result with the previous one. | ||
// It returns on the first error that a sub-detector encounters. | ||
func detectAll(ctx context.Context, detectors ...Detector) (*Resource, error) { | ||
var res *Resource | ||
for _, d := range detectors { | ||
r, err := d(ctx) | ||
if err != nil { | ||
return nil, err | ||
} | ||
res = merge(res, r) | ||
} | ||
return res, nil | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,163 @@ | ||
// Copyright 2018, OpenCensus Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package resource | ||
|
||
import ( | ||
"context" | ||
"errors" | ||
"fmt" | ||
"reflect" | ||
"testing" | ||
) | ||
|
||
func TestMerge(t *testing.T) { | ||
cases := []struct { | ||
a, b, want *Resource | ||
}{ | ||
{ | ||
a: &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1", "b": "2"}, | ||
}, | ||
b: &Resource{ | ||
Type: "t2", | ||
Labels: map[string]string{"a": "1", "b": "3", "c": "4"}, | ||
}, | ||
want: &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1", "b": "2", "c": "4"}, | ||
}, | ||
}, | ||
{ | ||
a: nil, | ||
b: &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1"}, | ||
}, | ||
want: &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1"}, | ||
}, | ||
}, | ||
{ | ||
a: &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1"}, | ||
}, | ||
b: nil, | ||
want: &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1"}, | ||
}, | ||
}, | ||
} | ||
for i, c := range cases { | ||
t.Run(fmt.Sprintf("case-%d", i), func(t *testing.T) { | ||
res := merge(c.a, c.b) | ||
if !reflect.DeepEqual(res, c.want) { | ||
t.Fatalf("unwanted result: want %+v, got %+v", c.want, res) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
func TestDecodeLabels(t *testing.T) { | ||
cases := []struct { | ||
encoded string | ||
wantLabels map[string]string | ||
wantFail bool | ||
}{ | ||
{ | ||
encoded: `example.org/test-1="test $ \"" , Abc="Def"`, | ||
wantLabels: map[string]string{"example.org/test-1": "test $ \"", "Abc": "Def"}, | ||
}, { | ||
encoded: `single="key"`, | ||
wantLabels: map[string]string{"single": "key"}, | ||
}, | ||
{encoded: `invalid-char-ü="test"`, wantFail: true}, | ||
{encoded: `invalid-char="ü-test"`, wantFail: true}, | ||
{encoded: `missing="trailing-quote`, wantFail: true}, | ||
{encoded: `missing=leading-quote"`, wantFail: true}, | ||
{encoded: `extra="chars", a`, wantFail: true}, | ||
} | ||
for i, c := range cases { | ||
t.Run(fmt.Sprintf("case-%d", i), func(t *testing.T) { | ||
res, err := DecodeLabels(c.encoded) | ||
if err != nil && !c.wantFail { | ||
t.Fatalf("unwanted error: %s", err) | ||
} | ||
if c.wantFail && err == nil { | ||
t.Fatalf("wanted failure but got none, result: %v", res) | ||
} | ||
if !reflect.DeepEqual(res, c.wantLabels) { | ||
t.Fatalf("wanted result %v, got %v", c.wantLabels, res) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
func TestEncodeLabels(t *testing.T) { | ||
got := EncodeLabels(map[string]string{ | ||
"example.org/test-1": "test ¥ \"", | ||
"un": "quøted", | ||
"Abc": "Def", | ||
}) | ||
if want := `Abc="Def",example.org/test-1="test ¥ \"",un="quøted"`; got != want { | ||
t.Fatalf("got %q, want %q", got, want) | ||
} | ||
} | ||
fabxc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
func TestChainedDetector(t *testing.T) { | ||
got, err := ChainedDetector( | ||
func(context.Context) (*Resource, error) { | ||
return &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1", "b": "2"}, | ||
}, nil | ||
}, | ||
func(context.Context) (*Resource, error) { | ||
return &Resource{ | ||
Type: "t2", | ||
Labels: map[string]string{"a": "11", "c": "3"}, | ||
}, nil | ||
}, | ||
)(context.Background()) | ||
if err != nil { | ||
t.Fatalf("unexpected error: %s", err) | ||
} | ||
want := &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1", "b": "2", "c": "3"}, | ||
} | ||
if !reflect.DeepEqual(got, want) { | ||
t.Fatalf("unexpected resource: want %v, got %v", want, got) | ||
} | ||
|
||
wantErr := errors.New("err1") | ||
got, err = ChainedDetector( | ||
func(context.Context) (*Resource, error) { | ||
return &Resource{ | ||
Type: "t1", | ||
Labels: map[string]string{"a": "1", "b": "2"}, | ||
}, nil | ||
}, | ||
func(context.Context) (*Resource, error) { | ||
return nil, wantErr | ||
}, | ||
)(context.Background()) | ||
if err != wantErr { | ||
t.Fatalf("unexpected error: want %v, got %v", wantErr, err) | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Explain what a resource type is rather than saying resource package contains the type.