Rename enhance to enrich

Author: tammy-baylis-swi

instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py

@@ -261,7 +261,7 @@ async def user_profile(user_id):
 
 from opentelemetry import context, trace
 from opentelemetry.instrumentation._labeler import (
-    enhance_metric_attributes,
+    enrich_metric_attributes,
     get_labeler,
 )
 from opentelemetry.instrumentation._semconv import (
@@ -857,7 +857,7 @@ async def __call__(
                     attributes, _StabilityMode.DEFAULT
                 )
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs_old = enhance_metric_attributes(
+                duration_attrs_old = enrich_metric_attributes(
                     duration_attrs_old
                 )
                 if target:
@@ -866,7 +866,7 @@ async def __call__(
                     attributes, _StabilityMode.HTTP
                 )
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs_new = enhance_metric_attributes(
+                duration_attrs_new = enrich_metric_attributes(
                     duration_attrs_new
                 )
                 if self.duration_histogram_old:

instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware/otel_middleware.py

@@ -22,7 +22,7 @@
 from django.http import HttpRequest, HttpResponse
 
 from opentelemetry.context import detach
-from opentelemetry.instrumentation._labeler import enhance_metric_attributes
+from opentelemetry.instrumentation._labeler import enrich_metric_attributes
 from opentelemetry.instrumentation._semconv import (
     _filter_semconv_active_request_count_attr,
     _filter_semconv_duration_attrs,
@@ -438,7 +438,7 @@ def process_response(self, request, response):
                 if target:
                     duration_attrs_old[SpanAttributes.HTTP_TARGET] = target
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs_old = enhance_metric_attributes(
+                duration_attrs_old = enrich_metric_attributes(
                     duration_attrs_old
                 )
                 self._duration_histogram_old.record(
@@ -449,7 +449,7 @@ def process_response(self, request, response):
                     duration_attrs, _StabilityMode.HTTP
                 )
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs_new = enhance_metric_attributes(
+                duration_attrs_new = enrich_metric_attributes(
                     duration_attrs_new
                 )
                 self._duration_histogram_new.record(

instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py

@@ -233,7 +233,7 @@ def on_get(self, req, resp, user_id):
 
 import opentelemetry.instrumentation.wsgi as otel_wsgi
 from opentelemetry import context, trace
-from opentelemetry.instrumentation._labeler import enhance_metric_attributes
+from opentelemetry.instrumentation._labeler import enrich_metric_attributes
 from opentelemetry.instrumentation._semconv import (
     HTTP_DURATION_HISTOGRAM_BUCKETS_NEW,
     _get_schema_url,
@@ -460,7 +460,7 @@ def _start_response(status, response_headers, *args, **kwargs):
                     attributes, _StabilityMode.DEFAULT
                 )
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs = enhance_metric_attributes(duration_attrs)
+                duration_attrs = enrich_metric_attributes(duration_attrs)
                 self.duration_histogram_old.record(
                     max(round(duration_s * 1000), 0), duration_attrs
                 )
@@ -469,7 +469,7 @@ def _start_response(status, response_headers, *args, **kwargs):
                     attributes, _StabilityMode.HTTP
                 )
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs = enhance_metric_attributes(duration_attrs)
+                duration_attrs = enrich_metric_attributes(duration_attrs)
                 self.duration_histogram_new.record(
                     max(duration_s, 0), duration_attrs
                 )

instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py

@@ -290,7 +290,7 @@ def response_hook(span: Span, status: str, response_headers: List):
 
 import opentelemetry.instrumentation.wsgi as otel_wsgi
 from opentelemetry import context, trace
-from opentelemetry.instrumentation._labeler import enhance_metric_attributes
+from opentelemetry.instrumentation._labeler import enrich_metric_attributes
 from opentelemetry.instrumentation._semconv import (
     HTTP_DURATION_HISTOGRAM_BUCKETS_NEW,
     _get_schema_url,
@@ -443,7 +443,7 @@ def _start_response(status, response_headers, *args, **kwargs):
                 duration_attrs_old[HTTP_TARGET] = str(request_route)
 
             # Enhance attributes with any custom labeler attributes
-            duration_attrs_old = enhance_metric_attributes(duration_attrs_old)
+            duration_attrs_old = enrich_metric_attributes(duration_attrs_old)
 
             duration_histogram_old.record(
                 max(round(duration_s * 1000), 0), duration_attrs_old
@@ -457,7 +457,7 @@ def _start_response(status, response_headers, *args, **kwargs):
                 duration_attrs_new[HTTP_ROUTE] = str(request_route)
 
             # Enhance attributes with any custom labeler attributes
-            duration_attrs_new = enhance_metric_attributes(duration_attrs_new)
+            duration_attrs_new = enrich_metric_attributes(duration_attrs_new)
 
             duration_histogram_new.record(
                 max(duration_s, 0), duration_attrs_new

instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py

@@ -272,7 +272,7 @@ def response_hook(span: Span, environ: WSGIEnvironment, status: str, response_he
 from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, TypeVar, cast
 
 from opentelemetry import context, trace
-from opentelemetry.instrumentation._labeler import enhance_metric_attributes
+from opentelemetry.instrumentation._labeler import enrich_metric_attributes
 from opentelemetry.instrumentation._semconv import (
     HTTP_DURATION_HISTOGRAM_BUCKETS_NEW,
     _filter_semconv_active_request_count_attr,
@@ -763,7 +763,7 @@ def __call__(
                     req_attrs, _StabilityMode.DEFAULT
                 )
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs_old = enhance_metric_attributes(
+                duration_attrs_old = enrich_metric_attributes(
                     duration_attrs_old
                 )
                 self.duration_histogram_old.record(
@@ -774,7 +774,7 @@ def __call__(
                     req_attrs, _StabilityMode.HTTP
                 )
                 # Enhance attributes with any custom labeler attributes
-                duration_attrs_new = enhance_metric_attributes(
+                duration_attrs_new = enrich_metric_attributes(
                     duration_attrs_new
                 )
                 self.duration_histogram_new.record(

opentelemetry-instrumentation/src/opentelemetry/instrumentation/_labeler/__init__.py

@@ -63,13 +63,13 @@ def user_profile(user_id):
 
 The labeler also works with auto-instrumentation.
 
-Custom attributes are merged by any instrumentors that use ``enhance_metric_attributes`` before their calls to report individual metrics recording, such as ``Histogram.record``. ``enchance_metrics_attributes`` does not overwrite base attributes that exist at the same keys.
+Custom attributes are merged by any instrumentors that use ``enrich_metric_attributes`` before their calls to report individual metrics recording, such as ``Histogram.record``. ``enchance_metrics_attributes`` does not overwrite base attributes that exist at the same keys.
 """
 
 from opentelemetry.instrumentation._labeler._internal import (
     Labeler,
     clear_labeler,
-    enhance_metric_attributes,
+    enrich_metric_attributes,
     get_labeler,
     get_labeler_attributes,
     set_labeler,
@@ -81,5 +81,5 @@ def user_profile(user_id):
     "set_labeler",
     "clear_labeler",
     "get_labeler_attributes",
-    "enhance_metric_attributes",
+    "enrich_metric_attributes",
 ]

opentelemetry-instrumentation/src/opentelemetry/instrumentation/_labeler/_internal/__init__.py

@@ -184,9 +184,9 @@ def get_labeler_attributes() -> Dict[str, Union[str, int, float, bool]]:
     return labeler.get_attributes()
 
 
-def enhance_metric_attributes(
+def enrich_metric_attributes(
     base_attributes: Dict[str, Any],
-    include_custom: bool = True,
+    enrich_enabled: bool = True,
 ) -> Dict[str, Any]:
     """
     Combines base_attributes with custom attributes from the current labeler,
@@ -197,13 +197,13 @@ def enhance_metric_attributes(
 
     Args:
         base_attributes: The base attributes for the metric
-        include_custom: Whether to include custom labeler attributes
+        enrich_enabled: Whether to include custom labeler attributes
 
     Returns:
         Dictionary combining base and custom attributes. If no custom attributes,
         returns a copy of the original base attributes.
     """
-    if not include_custom:
+    if not enrich_enabled:
         return base_attributes.copy()
 
     labeler = _labeler_context.get()
@@ -214,7 +214,7 @@ def enhance_metric_attributes(
     if not custom_attributes:
         return base_attributes.copy()
 
-    enhanced_attributes = base_attributes.copy()
+    enriched_attributes = base_attributes.copy()
 
     added_count = 0
     for key, value in custom_attributes.items():
@@ -229,7 +229,7 @@ def enhance_metric_attributes(
         ):
             value = value[: labeler._max_attr_value_length]
 
-        enhanced_attributes[key] = value
+        enriched_attributes[key] = value
         added_count += 1
 
-    return enhanced_attributes
+    return enriched_attributes