Dhruv Vora 0032bd6499 Fix default merging of resource attributes from environment variable (#1785) ... * updated controller to merge default resource with environment resource * updated TracerProvider to merge default resource with environment resource * Added Changelog entry * Added resource.Environment(), modified resource.Default() for environment vairable and WithResource() configuration for TracerProvider and Controller * Update CHANGELOG.md Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> * Moved environment detector to defaultResource initialization, added test cases * Changes to default resource initialization * made changes to the test cases * added merging of resource with environment resource Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>		2021-04-21 14:53:12 -04:00
..
config_test.go	Rename otel/label -> otel/attribute (#1541)	2021-02-18 12:59:37 -05:00
config.go	Fix default merging of resource attributes from environment variable (#1785)	2021-04-21 14:53:12 -04:00
controller_test.go	Fix default merging of resource attributes from environment variable (#1785)	2021-04-21 14:53:12 -04:00
controller.go	exporter: swap pusher for exporter (#1656)	2021-03-08 10:00:56 -08:00
pull_test.go	Rename otel/label -> otel/attribute (#1541)	2021-02-18 12:59:37 -05:00
push_test.go	exporter: swap pusher for exporter (#1656)	2021-03-08 10:00:56 -08:00