Skip to content

Merge Upstream Main into Main#1

Merged
ronnathaniel merged 10 commits intoepsagon:mainfrom
open-telemetry:main
Jul 13, 2022
Merged

Merge Upstream Main into Main#1
ronnathaniel merged 10 commits intoepsagon:mainfrom
open-telemetry:main

Conversation

@ronnathaniel
Copy link
Copy Markdown

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A

Does This PR Require a Contrib Repo Change?

Answer the following question based on these examples of changes that would require a Contrib Repo Change:

  • The OTel specification has changed which prompted this PR to update the method interfaces of opentelemetry-api/ or opentelemetry-sdk/

  • The method interfaces of test/util have changed

  • Scripts in scripts/ that were copied over to the Contrib repo have changed

  • Configuration files that were copied over to the Contrib repo have changed (when consistency between repositories is applicable) such as in

    • pyproject.toml
    • isort.cfg
    • .flake8
  • When a new .github/CODEOWNER is added

  • Major changes to project information, such as in:

    • README.md
    • CONTRIBUTING.md
  • Yes. - Link to PR:

  • No.

Checklist:

  • Followed the style guidelines of this project
  • Changelogs have been updated
  • Unit tests have been added
  • Documentation has been updated

Oberon00 and others added 10 commits June 29, 2022 11:50
* Propagate API module missing from docs.

* Add CHANGELOG.

* Sphinx complains about more missing classes.

* More fixes, understood why Sphinx didn't find some link targets.

* Update CHANGELOG.
* Allow git to check out files with long names in Windows

Fixes #2789

* Update contrib SHA
* Verify previous point is returned for cumulative instruments

Fixes #2755

* Reject non-cumulative temporalities for Prometheus metric reader

* Add test case for InMemoryMetricReader

* Fix prometheus import paths

* Remove parameters for Prometheus init

* Add sleep for windows tests

* Add temporality overriding dictionary
* Fix unit and name regexes

Fixes #2793

* Add changelog entry
* Release 1.12.0rc2-0.32b0

* Update CHANGELOG.md

Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>

Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
* Fix warning message for OTLP gRPC exporter mixin

Fixes #2780

* Refactor export parameter type

* Add changelog entry

* Use fixed warning messages for traces and metrics

* Use subclass-specific error messages

* Fix test cases

* Fix lint
@ronnathaniel ronnathaniel merged commit 258ce75 into epsagon:main Jul 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants