resolve merge conflicts

Author: srikanthccv

.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: e71a5157c184266002186cf853dfb8e2f2d6b924
+  CONTRIB_REPO_SHA: 008cd2370dcd3e87cca8c0ddbb0b820681fd7346
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v2 which
   # does not set an environment variable (simply just runs tox), which is different when

CHANGELOG.md

@@ -5,8 +5,45 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.10.0-0.29b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.11.1-0.30b1...HEAD)
+
+- Update to semantic conventions v1.11.0
+  ([#2669](https://github.com/open-telemetry/opentelemetry-python/pull/2669))
+- Update opentelemetry-proto to v0.17.0
+  ([#2668](https://github.com/open-telemetry/opentelemetry-python/pull/2668))
+- Add CallbackOptions to observable instrument callback params
+  ([#2664](https://github.com/open-telemetry/opentelemetry-python/pull/2664))
+- Add timeouts to metric SDK
+  ([#2653](https://github.com/open-telemetry/opentelemetry-python/pull/2653))
+- Add variadic arguments to metric exporter/reader interfaces
+  ([#2654](https://github.com/open-telemetry/opentelemetry-python/pull/2654))
+- Move Metrics API behind internal package
+  ([#2651](https://github.com/open-telemetry/opentelemetry-python/pull/2651))
+- `opentelemetry-exporter-otlp-proto-http` Add support for OTLP/HTTP log exporter
+  ([#2462](https://github.com/open-telemetry/opentelemetry-python/pull/2462))
 
+## [1.11.1-0.30b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.11.1-0.30b1) - 2022-04-21
+
+- Add parameter to MetricReader constructor to select aggregation per instrument kind
+  ([#2638](https://github.com/open-telemetry/opentelemetry-python/pull/2638))
+- Add parameter to MetricReader constructor to select temporality per instrument kind
+  ([#2637](https://github.com/open-telemetry/opentelemetry-python/pull/2637))
+- Fix unhandled callback exceptions on async instruments
+  ([#2614](https://github.com/open-telemetry/opentelemetry-python/pull/2614))
+- Rename `DefaultCounter`, `DefaultHistogram`, `DefaultObservableCounter`,
+  `DefaultObservableGauge`, `DefaultObservableUpDownCounter`, `DefaultUpDownCounter`
+  instruments to `NoOpCounter`, `NoOpHistogram`, `NoOpObservableCounter`,
+  `NoOpObservableGauge`, `NoOpObservableUpDownCounter`, `NoOpUpDownCounter`
+  ([#2616](https://github.com/open-telemetry/opentelemetry-python/pull/2616))
+- Deprecate InstrumentationLibraryInfo and Add InstrumentationScope
+  ([#2583](https://github.com/open-telemetry/opentelemetry-python/pull/2583))
+
+## [1.11.0-0.30b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.11.0-0.30b0) - 2022-04-18
+
+- Rename API Measurement for async instruments to Observation
+  ([#2617](https://github.com/open-telemetry/opentelemetry-python/pull/2617))
+- Add support for zero or more callbacks
+  ([#2602](https://github.com/open-telemetry/opentelemetry-python/pull/2602))
 - Fix parsing of trace flags when extracting traceparent
   ([#2577](https://github.com/open-telemetry/opentelemetry-python/pull/2577))
 - Add default aggregation
@@ -30,8 +67,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2547](https://github.com/open-telemetry/opentelemetry-python/pull/2547))
 - Update otlp-proto-grpc and otlp-proto-http exporters to have more lax requirements for `backoff` lib
   ([#2575](https://github.com/open-telemetry/opentelemetry-python/pull/2575))
-- `opentelemetry-exporter-otlp-proto-http` Add support for OTLP/HTTP log exporter
-  ([#2462](https://github.com/open-telemetry/opentelemetry-python/pull/2462))
+- Add min/max to histogram point
+  ([#2581](https://github.com/open-telemetry/opentelemetry-python/pull/2581))
+- Update opentelemetry-proto to v0.16.0
+  ([#2619](https://github.com/open-telemetry/opentelemetry-python/pull/2619))
 
 ## [1.10.0-0.29b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.10.0-0.29b0) - 2022-03-10
 

README.md

@@ -137,7 +137,6 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 
 - [Aaron Abbott](https://github.com/aabmass), Google
 - [Alex Boten](https://github.com/codeboten), Lightstep
-- [Srikanth Chekuri](https://github.com/lonewolf3739)
 - [Owais Lone](https://github.com/owais), Splunk
 - [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
 
@@ -147,6 +146,7 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
 
 - [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
+- [Srikanth Chekuri](https://github.com/srikanthccv)
 
 *For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

dev-requirements.txt

@@ -17,3 +17,4 @@ protobuf~=3.18.1
 # See https://github.com/pallets/markupsafe/issues/282
 # breaking change introduced in markupsafe causes jinja, flask to break
 markupsafe==2.0.1
+bleach==4.1.0 # This dependency was updated to a breaking version.

docs/api/metrics.instrument.rst

@@ -8,13 +8,8 @@ opentelemetry._metrics package
 
    Once metrics become stable, this package will be be renamed to ``opentelemetry.metrics``.
 
-Submodules
-----------
-
 .. toctree::
 
-   metrics.instrument
-   metrics.measurement
 
 Module contents
 ---------------

docs/api/metrics.measurement.rst

@@ -97,9 +97,6 @@
 # https://github.com/sphinx-doc/sphinx/pull/3744
 nitpick_ignore = [
     ("py:class", "ValueT"),
-    ("py:class", "MetricT"),
-    ("py:class", "InstrumentT"),
-    ("py:obj", "opentelemetry._metrics.instrument.InstrumentT"),
     # Even if wrapt is added to intersphinx_mapping, sphinx keeps failing
     # with "class reference target not found: ObjectProxy".
     ("py:class", "ObjectProxy"),
@@ -142,12 +139,14 @@
     "examples/error_handler/error_handler_1",
 ]
 
+_exclude_members = ["_abc_impl"]
+
 autodoc_default_options = {
     "members": True,
     "undoc-members": True,
     "show-inheritance": True,
     "member-order": "bysource",
-    "exclude-members": "_ProxyObservableUpDownCounter,_ProxyHistogram,_ProxyObservableGauge,_ProxyInstrument,_ProxyAsynchronousInstrument,_ProxyCounter,_ProxyUpDownCounter,_ProxyObservableCounter,_ProxyObservableGauge,_abc_impl",
+    "exclude-members": ",".join(_exclude_members),
 }
 
 # -- Options for HTML output -------------------------------------------------

docs/api/metrics.rst

@@ -1,7 +1,11 @@
 from typing import Iterable
 
-from opentelemetry._metrics import get_meter_provider, set_meter_provider
-from opentelemetry._metrics.measurement import Measurement
+from opentelemetry._metrics import (
+    Observation,
+    get_meter_provider,
+    set_meter_provider,
+)
+from opentelemetry._metrics._internal.instrument import CallbackOptions
 from opentelemetry.exporter.otlp.proto.grpc._metric_exporter import (
     OTLPMetricExporter,
 )
@@ -14,16 +18,18 @@
 set_meter_provider(provider)
 
 
-def observable_counter_func() -> Iterable[Measurement]:
-    yield Measurement(1, {})
+def observable_counter_func(options: CallbackOptions) -> Iterable[Observation]:
+    yield Observation(1, {})
 
 
-def observable_up_down_counter_func() -> Iterable[Measurement]:
-    yield Measurement(-10, {})
+def observable_up_down_counter_func(
+    options: CallbackOptions,
+) -> Iterable[Observation]:
+    yield Observation(-10, {})
 
 
-def observable_gauge_func() -> Iterable[Measurement]:
-    yield Measurement(9, {})
+def observable_gauge_func(options: CallbackOptions) -> Iterable[Observation]:
+    yield Observation(9, {})
 
 
 meter = get_meter_provider().get_meter("getting-started", "0.1.2")
@@ -34,7 +40,8 @@ def observable_gauge_func() -> Iterable[Measurement]:
 
 # Async Counter
 observable_counter = meter.create_observable_counter(
-    "observable_counter", observable_counter_func
+    "observable_counter",
+    [observable_counter_func],
 )
 
 # UpDownCounter
@@ -44,12 +51,12 @@ def observable_gauge_func() -> Iterable[Measurement]:
 
 # Async UpDownCounter
 observable_updown_counter = meter.create_observable_up_down_counter(
-    "observable_updown_counter", observable_up_down_counter_func
+    "observable_updown_counter", [observable_up_down_counter_func]
 )
 
 # Histogram
 histogram = meter.create_histogram("histogram")
 histogram.record(99.9)
 
 # Async Gauge
-gauge = meter.create_observable_gauge("gauge", observable_gauge_func)
+gauge = meter.create_observable_gauge("gauge", [observable_gauge_func])

docs/conf.py

@@ -17,8 +17,12 @@
 
 from typing import Iterable
 
-from opentelemetry._metrics import get_meter_provider, set_meter_provider
-from opentelemetry._metrics.measurement import Measurement
+from opentelemetry._metrics import (
+    CallbackOptions,
+    Observation,
+    get_meter_provider,
+    set_meter_provider,
+)
 from opentelemetry.sdk._metrics import MeterProvider
 from opentelemetry.sdk._metrics.export import (
     ConsoleMetricExporter,
@@ -31,16 +35,18 @@
 set_meter_provider(provider)
 
 
-def observable_counter_func() -> Iterable[Measurement]:
-    yield Measurement(1, {})
+def observable_counter_func(options: CallbackOptions) -> Iterable[Observation]:
+    yield Observation(1, {})
 
 
-def observable_up_down_counter_func() -> Iterable[Measurement]:
-    yield Measurement(-10, {})
+def observable_up_down_counter_func(
+    options: CallbackOptions,
+) -> Iterable[Observation]:
+    yield Observation(-10, {})
 
 
-def observable_gauge_func() -> Iterable[Measurement]:
-    yield Measurement(9, {})
+def observable_gauge_func(options: CallbackOptions) -> Iterable[Observation]:
+    yield Observation(9, {})
 
 
 meter = get_meter_provider().get_meter("getting-started", "0.1.2")
@@ -51,7 +57,7 @@ def observable_gauge_func() -> Iterable[Measurement]:
 
 # Async Counter
 observable_counter = meter.create_observable_counter(
-    "observable_counter", observable_counter_func
+    "observable_counter", [observable_counter_func]
 )
 
 # UpDownCounter
@@ -61,12 +67,12 @@ def observable_gauge_func() -> Iterable[Measurement]:
 
 # Async UpDownCounter
 observable_updown_counter = meter.create_observable_up_down_counter(
-    "observable_updown_counter", observable_up_down_counter_func
+    "observable_updown_counter", [observable_up_down_counter_func]
 )
 
 # Histogram
 histogram = meter.create_histogram("histogram")
 histogram.record(99.9)
 
 # Async Gauge
-gauge = meter.create_observable_gauge("gauge", observable_gauge_func)
+gauge = meter.create_observable_gauge("gauge", [observable_gauge_func])