5 Commits

Author	SHA1	Message	Date
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
Louis DeLosSantos	bd0bba43b5	exporter: swap pusher for exporter (#1656) ... to provide consistent naming across the code base, deprecate pusher in favor of exporter naming convention. Signed-off-by: ldelossa <ldelossa@redhat.com> Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>	2021-03-08 10:00:56 -08:00
Punya Biswal	ecf65d7968	Rename otel/label -> otel/attribute (#1541) ... * Rename otel/label -> otel/attr Leave the imported name alone, to avoid a large diff and conflicts * Better import comment * Update CHANGELOG.md Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com> * otel/attr -> otel/attribute * Missed the changelog entry * Get rid of import renaming * Merge remaining conflicts Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com> Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>	2021-02-18 12:59:37 -05:00
ET	8fae0a644a	Create resource.Default() with required attributes/default values (#1507) ... * Create resource.Default() with required attributes/default values Add metric controller and tracer provider tests for resources * Updated CHANGELOG * PR comments + some small CHANGELOG PR addition, rewording + change default resource servicename to `unknown_service:go` (this matches the Java codebase which uses `unknown_service:java`)	2021-02-15 12:28:37 -08:00
Joshua MacDonald	dfece3d2b9	Combine the Push and Pull metric controllers (#1378) ... * Push->basic * Repackage * Rename away from push * Make exporter optional; export from a separate goroutine * Move pull_test into controller_test * Precommit pass * New OTLP/Prom example * Precommit * Fix the example * Shorten the example * Test starting controller w/o exporter * Test export timeout * Remove ancient example & lint * go.mod revert & tidy * Comments * Tidy a diff * Tidy a diff * Move export kind selector in the new example * Split this test into its original parts * Reduce diff size * Changelog * Remove extra Add/Done pair * Remove unused stopCh param; document the Stop behavior * Typo * Use ctx * Missed v0.15 * Apply PR feedback * Precommit pass * 0.14 -> 0.15 in new file * Remove diff chunk markers * Fix OTLP example * Upstream * dashpole comments * aneurysm9 feedback * Tidy go.sum	2021-01-13 17:07:44 -05:00