Merge pull request #1 from open-telemetry/master

merging from opentelemetry/master
dmarar · Nov 27, 2020 · c8580b2 · c8580b2
2 parents da7597c + 8cc9260
commit c8580b2
Show file tree

Hide file tree

Showing 42 changed files with 685 additions and 325 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -19,6 +19,25 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 
 - [ ] 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](https://github.com/open-telemetry/opentelemetry-specification) has changed which prompted this PR to update the method interfaces of `opentelemetry-api/` or `opentelemetry-sdk/`
+- The method interfaces of `opentelemetry-instrumentation/` have changed
+- 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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: master
+  CONTRIB_REPO_SHA: bcec49cf2eccf8da66c9e63b9836ea8a20516efc
 
 jobs:
   build:

diff --git a/docs/examples/error_hander/error_handler_0/setup.cfg b/docs/examples/error_hander/error_handler_0/setup.cfg
@@ -36,7 +36,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 0.16.dev0
+    opentelemetry-sdk == 0.17.dev0
 
 [options.packages.find]
 where = src

diff --git a/docs/examples/error_hander/error_handler_0/src/error_handler_0/version.py b/docs/examples/error_hander/error_handler_0/src/error_handler_0/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.16.dev0"
+__version__ = "0.17.dev0"
diff --git a/docs/examples/error_hander/error_handler_1/setup.cfg b/docs/examples/error_hander/error_handler_1/setup.cfg
@@ -36,7 +36,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 0.16.dev0
+    opentelemetry-sdk == 0.17.dev0
 
 [options.packages.find]
 where = src

diff --git a/docs/examples/error_hander/error_handler_1/src/error_handler_1/version.py b/docs/examples/error_hander/error_handler_1/src/error_handler_1/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.16.dev0"
+__version__ = "0.17.dev0"
diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg
@@ -40,8 +40,8 @@ package_dir=
 packages=find_namespace:
 install_requires =
     thrift >= 0.10.0
-    opentelemetry-api == 0.16.dev0
-    opentelemetry-sdk == 0.16.dev0
+    opentelemetry-api == 0.17.dev0
+    opentelemetry-sdk == 0.17.dev0
 
 [options.packages.find]
 where = src

diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.16.dev0"
+__version__ = "0.17.dev0"
diff --git a/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md b/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## Version 0.16b0
+
+Released 2020-11-25
+
 - Update protobuf versions
   ([#1356](https://github.com/open-telemetry/opentelemetry-python/pull/1356))
 

diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg
@@ -41,8 +41,8 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     opencensus-proto >= 0.1.0, < 1.0.0
-    opentelemetry-api == 0.16.dev0
-    opentelemetry-sdk == 0.16.dev0
+    opentelemetry-api == 0.17.dev0
+    opentelemetry-sdk == 0.17.dev0
     protobuf >= 3.13.0
 
 [options.packages.find]

diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.16.dev0"
+__version__ = "0.17.dev0"
diff --git a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+- Add meter reference to observers
+  ([#1425](https://github.com/open-telemetry/opentelemetry-python/pull/1425))
+
+## Version 0.16b0
+
+Released 2020-11-25
+
+- Add instrumentation library name and version to OTLP exported metrics
+  ([#1418](https://github.com/open-telemetry/opentelemetry-python/pull/1418))
 - Change temporality for Counter and UpDownCounter
   ([#1384](https://github.com/open-telemetry/opentelemetry-python/pull/1384))
 - Add Gzip compression for exporter

diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg
@@ -41,9 +41,9 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     googleapis-common-protos ~= 1.52.0
-    opentelemetry-api == 0.16.dev0
-    opentelemetry-sdk == 0.16.dev0
-    opentelemetry-proto == 0.16.dev0
+    opentelemetry-api == 0.17.dev0
+    opentelemetry-sdk == 0.17.dev0
+    opentelemetry-proto == 0.17.dev0
     backoff ~= 1.10.0
 
 [options.extras_require]

diff --git a/.../opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py b/.../opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py
@@ -304,9 +304,11 @@ def _translate_data(
                 )
                 argument = type_class[value_type]["gauge"]["argument"]
 
-            sdk_resource_instrumentation_library_metrics[
+            instrumentation_library_metrics = sdk_resource_instrumentation_library_metrics[
                 export_record.resource
-            ].metrics.append(
+            ]
+
+            instrumentation_library_metrics.metrics.append(
                 OTLPMetric(
                     **{
                         "name": export_record.instrument.name,
@@ -317,6 +319,19 @@ def _translate_data(
                 )
             )
 
+            instrumentation_library_metrics.instrumentation_library.name = (
+                export_record.instrument.meter.instrumentation_info.name
+            )
+
+            version = (
+                export_record.instrument.meter.instrumentation_info.version
+            )
+
+            if version:
+                (
+                    instrumentation_library_metrics.instrumentation_library.version
+                ) = version
+
         return ExportMetricsServiceRequest(
             resource_metrics=_get_resource_data(
                 sdk_resource_instrumentation_library_metrics,

diff --git a/...er/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py b/...er/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py
@@ -14,7 +14,6 @@
 """OTLP Span Exporter"""
 
 import logging
-import os
 from typing import Optional, Sequence
 
 from grpc import ChannelCredentials

diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.16.dev0"
+__version__ = "0.17.dev0"