mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2024-12-16 10:19:23 +02:00
f7df68b68b
* Add support for Resources in the SDK Add `Config` types for the push `Controller` and the `SDK`. Included with this are helper functions to configure the `ErrorHandler` and `Resource`. Add a `Resource` to the Meter `Descriptor`. The choice to add the `Resource` here (instead of say a `Record` or the `Instrument` itself) was motivated by the definition of the `Descriptor` as the way to uniquely describe a metric instrument. Update the push `Controller` and default `SDK` to pass down their configured `Resource` from instantiation to the metric instruments. * Update New SDK constructor documentation * Change NewDescriptor constructor to take opts Add DescriptorConfig and DescriptorOption to configure the metric Descriptor with the description, unit, keys, and resource. Update all function calls to NewDescriptor to use new function signature. * Apply suggestions from code review Co-Authored-By: Rahul Patel <rghetia@yahoo.com> * Update and add copyright notices * Update push controller creator func Pass the configured ErrorHandler for the controller to the SDK. * Update Resource integration with the SDK Add back the Resource field to the Descriptor that was moved in the last merge with master. Add a resource.Provider interface. Have the default SDK implement the new resource.Provider interface and integrate the new interface into the newSync/newAsync workflows. Now, if the SDK has a Resource defined it will be passed to all Descriptors created for the instruments it creates. * Remove nil check for metric SDK config * Fix and add test for API Options Add an `Equal` method to the Resource so it can be compared with github.com/google/go-cmp/cmp. Add additional test of the API Option unit tests to ensure WithResource correctly sets a new resource. * Move the resource.Provider interface to the API package Move the interface to where it is used. Fix spelling. * Remove errant line * Remove nil checks for the push controller config * Fix check SDK implements Resourcer * Apply suggestions from code review Co-Authored-By: Rahul Patel <rghetia@yahoo.com> Co-authored-by: Rahul Patel <rghetia@yahoo.com>
48 lines
1009 B
Go
48 lines
1009 B
Go
package metric
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"go.opentelemetry.io/otel/api/core"
|
|
"go.opentelemetry.io/otel/sdk/resource"
|
|
)
|
|
|
|
func TestWithErrorHandler(t *testing.T) {
|
|
errH, reg := func() (ErrorHandler, *error) {
|
|
e := fmt.Errorf("default invalid")
|
|
reg := &e
|
|
return func(err error) {
|
|
*reg = err
|
|
}, reg
|
|
}()
|
|
|
|
c := &Config{}
|
|
WithErrorHandler(errH).Apply(c)
|
|
err1 := fmt.Errorf("error 1")
|
|
c.ErrorHandler(err1)
|
|
assert.EqualError(t, *reg, err1.Error())
|
|
|
|
// Ensure overwriting works.
|
|
c = &Config{ErrorHandler: DefaultErrorHandler}
|
|
WithErrorHandler(errH).Apply(c)
|
|
err2 := fmt.Errorf("error 2")
|
|
c.ErrorHandler(err2)
|
|
assert.EqualError(t, *reg, err2.Error())
|
|
}
|
|
|
|
func TestWithResource(t *testing.T) {
|
|
r := resource.New(core.Key("A").String("a"))
|
|
|
|
c := &Config{}
|
|
WithResource(*r).Apply(c)
|
|
assert.Equal(t, *r, c.Resource)
|
|
|
|
// Ensure overwriting works.
|
|
c = &Config{Resource: resource.Resource{}}
|
|
WithResource(*r).Apply(c)
|
|
assert.Equal(t, *r, c.Resource)
|
|
}
|