Merge branch 'main' into ns-3201-dropped-attributes-count-in-exporters

open-telemetry · Oct 26, 2023 · b026f10 · b026f10
2 parents 456fd2e + d054dff
commit b026f10
Show file tree

Hide file tree

Showing 7 changed files with 708 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fix `SumAggregation`
+  ([#3390](https://github.com/open-telemetry/opentelemetry-python/pull/3390))
 - Fix handling of empty metric collection cycles
   ([#3335](https://github.com/open-telemetry/opentelemetry-python/pull/3335))
 - Fix error when no LoggerProvider configured for LoggingHandler
@@ -26,7 +28,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Basic protection against the unintended cardinality explosion 
   ([#3486](https://github.com/open-telemetry/opentelemetry-python/pull/3486))
 
-
 ## Version 1.20.0/0.41b0 (2023-09-04)
 
 - Modify Prometheus exporter to translate non-monotonic Sums into Gauges

diff --git a/docs/examples/fork-process-model/flask-gunicorn/requirements.txt b/docs/examples/fork-process-model/flask-gunicorn/requirements.txt
@@ -6,12 +6,12 @@ gunicorn==20.0.4
 itsdangerous==1.1.0
 Jinja2==2.11.3
 MarkupSafe==1.1.1
-opentelemetry-api==0.18b0
-opentelemetry-exporter-otlp==0.18b0
+opentelemetry-api==1.20.0
+opentelemetry-exporter-otlp==1.20.0
 opentelemetry-instrumentation==0.41b0
-opentelemetry-instrumentation-flask==0.18b1
-opentelemetry-instrumentation-wsgi==0.18b1
-opentelemetry-sdk==0.18b0
+opentelemetry-instrumentation-flask==0.41b0
+opentelemetry-instrumentation-wsgi==0.41b0
+opentelemetry-sdk==1.20.0
 protobuf==3.18.3
 six==1.15.0
 thrift==0.13.0

diff --git a/docs/examples/fork-process-model/flask-uwsgi/requirements.txt b/docs/examples/fork-process-model/flask-uwsgi/requirements.txt
@@ -6,12 +6,12 @@ gunicorn==20.0.4
 itsdangerous==1.1.0
 Jinja2==2.11.3
 MarkupSafe==1.1.1
-opentelemetry-api==0.18b0
-opentelemetry-exporter-otlp==0.18b0
+opentelemetry-api==1.20.0
+opentelemetry-exporter-otlp==1.20.0
 opentelemetry-instrumentation==0.41b0
-opentelemetry-instrumentation-flask==0.18b1
-opentelemetry-instrumentation-wsgi==0.18b1
-opentelemetry-sdk==0.18b0
+opentelemetry-instrumentation-flask==0.41b0
+opentelemetry-instrumentation-wsgi==0.41b0
+opentelemetry-sdk==1.20.0
 protobuf==3.18.3
 six==1.15.0
 thrift==0.13.0

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/_view_instrument_match.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/_view_instrument_match.py
@@ -77,8 +77,8 @@ def conflicts(self, other: "_ViewInstrumentMatch") -> bool:
                 result
                 and self._aggregation._instrument_is_monotonic
                 == other._aggregation._instrument_is_monotonic
-                and self._aggregation._instrument_temporality
-                == other._aggregation._instrument_temporality
+                and self._aggregation._instrument_aggregation_temporality
+                == other._aggregation._instrument_aggregation_temporality
             )
 
         return result
@@ -133,15 +133,15 @@ def consume_measurement(self, measurement: Measurement) -> None:
 
     def collect(
         self,
-        aggregation_temporality: AggregationTemporality,
+        collection_aggregation_temporality: AggregationTemporality,
         collection_start_nanos: int,
     ) -> Optional[Sequence[DataPointT]]:
 
         data_points: List[DataPointT] = []
         with self._lock:
             for aggregation in self._attributes_aggregation.values():
                 data_point = aggregation.collect(
-                    aggregation_temporality, collection_start_nanos
+                    collection_aggregation_temporality, collection_start_nanos
                 )
                 if data_point is not None:
                     data_points.append(data_point)