Merge pull request #23785 from newrelic/daily-release/04-20-26-evening

Daily release/04 20 26 evening

Author: cbehera-newrelic

src/content/docs/apm/agents/manage-apm-agents/opentelemetry-api-support.mdx

@@ -330,7 +330,11 @@ OpenTelemetry API support is disabled by default. Enable it through your agent's
     ```
 
     <Callout variant="important">
-    When OpenTelemetry support is enabled, the agent will automatically detect if `opentelemetry-api` is installed and switch to using OpenTelemetry instrumentation for supported libraries.
+      When OpenTelemetry support is enabled, the agent will automatically detect if `opentelemetry-api` is installed and switch to using OpenTelemetry instrumentation for any supported libraries, even if New Relic has an instrumentation hook for that library.
+    </Callout>
+
+    <Callout variant="important">
+      This behavior will change in a future release. In the future, only libraries and tracers that are not already supported by New Relic will utilize OpenTelemetry's instrumentation, once functionality to include and/or exclude specific OpenTelemetry libraries is available.
     </Callout>
 
     ### How it works
@@ -344,7 +348,7 @@ OpenTelemetry API support is disabled by default. Enable it through your agent's
     For the current list of available Python instrumentations, see the [official OpenTelemetry Python instrumentation list](https://opentelemetry.io/ecosystem/registry/?language=python&component=instrumentation).
 
     <Callout variant="caution">
-    Some instrumentations (such as AWS and gRPC libraries) will continue to use New Relic's instrumentation. AI libraries with native instrumentation are explicitly disabled for now and will be supported in a future release.
+      AWS and gRPC instrumentation libraries will continue to use New Relic's instrumentation. ML/AI libraries with native instrumentation are explicitly disabled for now and will be supported in a future release.
     </Callout>
 
     ### Manual instrumentation

src/content/docs/apm/agents/python-agent/configuration/python-agent-configuration.mdx

@@ -6216,6 +6216,124 @@ The following settings are available for configuration of machine learning data
   </Collapser>
 </CollapserGroup>
 
+## Hybrid agent settings [#otel-settings]
+
+<Callout variant="important">
+  Requires [Python agent version 11.5.0 or higher](/docs/agents/python-agent/installation-configuration/upgrade-python-agent).
+</Callout>
+For moreinformation on hybrid agent functionalities, refer to [this page](/docs/apm/agents/manage-apm-agents/opentelemetry-api-support). 
+
+The following settings are available for configuration of the hybrid agent:
+
+<CollapserGroup>
+  <Collapser
+    id="opentelemetry.enabled"
+    title="opentelemetry.enabled"
+  >
+    <table>
+      <tbody>
+        <tr>
+          <th>
+            Type
+          </th>
+
+          <td>
+            Boolean
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            Default
+          </th>
+
+          <td>
+            False
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            [Set in](#options)
+          </th>
+
+          <td>
+            Config file, environment variable
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            [Environ variable](#environment-variables)
+          </th>
+
+          <td>
+            `NEW_RELIC_OPENTELEMETRY_ENABLED`
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    If enabled, any OpenTelemetry API and most [OpenTelemetry instrumented frameworks](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation#readme) that are installed will be used.
+
+    <Callout variant="important">
+      While most libraries in [OpenTelemetry's instrumented frameworks](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation#readme) are supported, AWS and gRPC instrumentation libraries will continue to use New Relic's instrumentation. ML/AI libraries with native instrumentation are explicitly disabled for now and will be supported in a future release.
+    </Callout>
+
+  </Collapser>
+
+  <Collapser
+    id="opentelemetry.traces.enabled"
+    title="opentelemetry.traces.enabled"
+  >
+    <table>
+      <tbody>
+        <tr>
+          <th>
+            Type
+          </th>
+
+          <td>
+            Boolean
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            Default
+          </th>
+
+          <td>
+            True
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            [Set in](#options)
+          </th>
+
+          <td>
+            Config file, environment variable
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            [Environ variable](#environment-variables)
+          </th>
+
+          <td>
+            `NEW_RELIC_OPENTELEMETRY_TRACES_ENABLED`
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    If enabled, any OpenTelemetry span and trace APIs will be used, regardless of whether an existing New Relic instrumentation library exists.  This behavior will change in a future release when include and exclude settings are added.
+  </Collapser>
+</CollapserGroup>
+
 ## Other configuration settings [#other-settings]
 
 Here are assorted other settings available via the agent configuration file.

src/content/docs/data-apis/ingest-apis/metric-api/metric-api-limits-restricted-attributes.mdx

@@ -48,16 +48,6 @@ The following default limits apply for all Metric data:
       </td>
     </tr>
 
-    <tr>
-      <td>
-        Max data points per minute (DPM)
-      </td>
-
-      <td>
-        3-15 million DPM [(learn more)](#additional-considerations)
-      </td>
-    </tr>
-
     <tr>
       <td>
         Max unique time series (cardinality) per account per day
@@ -245,26 +235,13 @@ The following default limits apply only to data collected via the Prometheus Rem
 
 ### Additional account conditions [#additional-considerations]
 
-Metric API limits apply at the individual account level. The default limits for DPM and cardinality range from 3M for organizations on our [Free edition](https://newrelic.com/pricing), up to 10.2M for some paying organizations. To understand your organization's limits, see the [Limits UI](/docs/data-apis/manage-data/view-system-limits). DPM and cardinality can be increased to 15M on request for paying organizations. Max payloads per minute can be adjusted above 100k on a case-by-case basis. To request changes to your metric rate limits, contact your New Relic account representative, or visit our [Support portal](http://support.newrelic.com/).
+Metric API limits apply at the individual account level. The default cardinality limit ranges from 3M for organizations on our [Free edition](https://newrelic.com/pricing), up to 10.2M for some paying organizations. To understand your organization's limits, see the [Limits UI](/docs/data-apis/manage-data/view-system-limits). Cardinality can be increased to 15M on request for paying organizations. Max payloads per minute can be adjusted above 100k on a case-by-case basis. To request changes to your metric rate limits, contact your New Relic account representative, or visit our [Support portal](http://support.newrelic.com/).
 
 ## Rate limit incidents [#rate-limit-incidents]
 
 This section describes how the Metric API behaves when you exceed the rate limits, and how to respond if limits are exceeded.
 
 <CollapserGroup>
-  <Collapser
-    id="incident-dpm-exceeded"
-    title="Max data points per minute (DPM)"
-  >
-    Data points per minute refers to the per minute rate at which individual metric values are sent to the Metric API.
-
-    When the maximum DPM limit is exceeded for an account, the New Relic Metric API returns a `429` response for the remainder of the minute. The response will include a `Retry-After` header indicating how long to wait in seconds before resubmitting or sending new data.
-
-    To resolve this issue, either reduce the number of data points you are sending, or request a rate limit change. Subsequent subscription changes do not impact modified rate limits. If an account change impacts your rate limit, you must notify us to adjust your rate limit.
-
-    To request rate limit changes, contact your New Relic account representative, or visit our [Support portal](http://support.newrelic.com).
-  </Collapser>
-
   <Collapser
     id="incident-unique-timeseries"
     title="Max unique time series per account per day"

src/content/docs/data-apis/ingest-apis/metric-api/troubleshoot-nrintegrationerror-events.mdx

@@ -75,20 +75,6 @@ The `category` indicates the type of error and the `message` provides more detai
       </td>
     </tr>
 
-    <tr>
-      <td>
-        `RateLimit`
-      </td>
-
-      <td>
-        `DatapointsPerMinute`
-      </td>
-
-      <td>
-        You are sending too many datapoints per minute. If you get this error, you can either send data less frequently, or request changes to your metric rate limits by contacting your New Relic account representative, or visiting our [Support portal](https://support.newrelic.com/).
-      </td>
-    </tr>
-
     <tr>
       <td>
         `RateLimit`

src/content/docs/infrastructure/prometheus-integrations/install-configure-remote-write/remote-write-errors-error-messages.mdx

@@ -38,7 +38,7 @@ If you receive an integration error message from New Relic or error messages in
   </Collapser>
 
   <Collapser title="429: rate limit error">
-    This means you have hit a [rate limit](/docs/data-apis/ingest-apis/metric-api/metric-api-limits-restricted-attributes/#rate-limit-incidents) on the amount of data being sent at one time (for example cardinality or data points per minute). You can troubleshoot by reducing the amount of Prometheus or general metric data you are sending, or by requesting a rate-limit increase.
+    This means you have hit a [rate limit](/docs/data-apis/ingest-apis/metric-api/metric-api-limits-restricted-attributes/#rate-limit-incidents) on the amount of data being sent at one time (for example cardinality). You can troubleshoot by reducing the amount of Prometheus or general metric data you are sending, or by requesting a rate-limit increase.
   </Collapser>
 </CollapserGroup>
 

src/content/docs/new-relic-solutions/observability-maturity/operational-efficiency/data-governance-optimize-ingest-guide.mdx

@@ -1264,22 +1264,16 @@ spec:
         cpu: 1000m
 ```
 
-### POMI: estimating DPM and cardinality
+### POMI: estimating cardinality
 
-Although cardinality is not associated directly with billable per GB ingest, New Relic does maintain certain rate limits on cardinality and data points per minute. Being able to visualize cardinality and DPM from a Prometheus cluster can be very important.
+Although cardinality is not associated directly with billable per GB ingest, New Relic does maintain certain rate limits on cardinality. Being able to visualize cardinality from a Prometheus cluster can be very important.
 
 <Callout variant="tip">
-New Relic accounts have a 1M DPM and 1M cardinality limit, but you can request up to 15M DPM and 15M cardinality. To request changes, contact your New Relic account representative. For more information, see [Metric API limits](/docs/data-apis/ingest-apis/metric-api/metric-api-limits-restricted-attributes).
+New Relic accounts have a 1M cardinality limit, but you can request up to 15M cardinality. To request changes, contact your New Relic account representative. For more information, see [Metric API limits](/docs/data-apis/ingest-apis/metric-api/metric-api-limits-restricted-attributes).
 </Callout>
 
-If you're already running Prometheus Server, you can run DPM and cardinality estimates there prior to enabling POMI or `remote_write`.
+If you're already running Prometheus Server, you can run cardinality estimates there prior to enabling POMI or `remote_write`.
 
-**Data points per minute (DPM):**
-
-```promql
-rate(prometheus_tsdb_head_samples_appended_total[10m]) * 60
-```
-    
 **Top 20 metrics (highest cardinality):**
 
 ```promql