diff --git a/.github/depcheck.yml b/.github/depcheck.yml
index cc72fb1f6fc7..b3eeb7c9946b 100644
--- a/.github/depcheck.yml
+++ b/.github/depcheck.yml
@@ -23,7 +23,7 @@ github_repos:
   - github.com/google/dnsmasq_exporter v0.2.0
   - github.com/ncabatoff/process-exporter v0.7.5
   - github.com/prometheus/mysqld_exporter v0.13.0
-  - github.com/prometheus-community/postgres_exporter v0.10.0
+  - github.com/prometheus-community/postgres_exporter v0.15.0
   - github.com/prometheus-community/windows_exporter v0.16.0
   - github.com/percona/mongodb_exporter v0.20.7
   - project: github.com/prometheus/prometheus
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index ceea4dbcbefd..cc32f0a2474f 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d
+        uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55
         with:
           image-ref: 'grafana/agent:main'
           format: 'template'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84f1f7a53862..cdb515335bd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,21 @@ Main (unreleased)
   4317 to 55678 to align with upstream. (@rfratto)
 
 - The default sync interval for `mimir.rules.kubernetes` has changed from `30s`
-  to `5m` to reduce load on Mimir. (@56quarters)  
+  to `5m` to reduce load on Mimir. (@56quarters)
+
+- `prometheus.exporter.postgres` has been updated to the latest upstream
+  version which changes the set of exported metrics. The following metrics were
+  removed: `pg_stat_database_session_time`, `pg_stat_database_sessions`,
+  `pg_stat_database_sessions_abandoned`, `pg_stat_database_sessions_fatal`,
+  `pg_stat_database_sessions_killed`, `pg_stat_database_idle_in_transaction_time`,
+  `pg_stat_database_checksum_failures`, `pg_stat_database_checksum_last_failure`,
+  `pg_stat_database_active_time`. The following metrics were
+  renamed: `pg_stat_bgwriter_buffers_alloc`, `pg_stat_bgwriter_buffers_backend`,
+  `pg_stat_bgwriter_buffers_backend_fsync`, `pg_stat_bgwriter_buffers_checkpoint`,
+  `pg_stat_bgwriter_buffers_clean`, `pg_stat_bgwriter_checkpoint_sync_time`,
+  `pg_stat_bgwriter_checkpoint_write_time`, `pg_stat_bgwriter_checkpoints_req`,
+  `pg_stat_bgwriter_checkpoints_timed`, `pg_stat_bgwriter_maxwritten_clean`,
+  `pg_stat_bgwriter_stats_reset` - the new names include the `_total` suffix. (@thampiotr)
 
 ### Enhancements
 
@@ -45,23 +59,46 @@ Main (unreleased)
 - In `prometheus.exporter.kafka`, the interpolation table used to compute estimated lag metrics is now pruned
   on `metadata_refresh_interval` instead of `prune_interval_seconds`. (@wildum)
 
-### Features
+- Add ability to convert static mode positions file to `loki.source.file` compatible via `legacy_positions_file` argument. (@mattdurham)
+
+- Added support for `otelcol` configuration conversion in `grafana-agent convert` and `grafana-agent run` commands. (@rfratto, @erikbaranowski, @tpaschalis, @hainenber)
+
+- Added support for `static` configuration conversion of the `traces` subsystem. (@erikbaranowski, @wildum)
+
+- Add automatic conversion for `legacy_positions_file` in component `loki.source.file`. (@mattdurham)
 
-- Added a new CLI flag `--stability.level` which defines the minimum stability
-  level required for the features that the agent is allowed to use. Default is `experimental`. (@thampiotr)
+- Propagate request metadata for `faro.receiver` to downstream components. (@hainenber)
+
+### Features
 
 - A new `loki.rules.kubernetes` component that discovers `PrometheusRule` Kubernetes resources and loads them into a Loki Ruler instance. (@EStork09)
 
+- Add `beyla.ebpf` component to automatically instrument services with eBPF. (@marctc)
+
 ### Bugfixes
 
 - Fix an issue where JSON string array elements were not parsed correctly in `loki.source.cloudflare`. (@thampiotr)
 
+
+- Fix SSRF vulnerability in `faro.receiver` by disabling source map download. (@hainenber)
+
+- Fix an issue where the azure exporter was not correctly gathering subscription scoped metrics when only one region was configured (@kgeckhart)
+
 - Update gcp_exporter to a newer version with a patch for incorrect delta histograms (@kgeckhart)
 
 - Fix an issue where the default values of some component's arguments change
   whenever that argument is explicitly configured. This issue only affected a
   small subset of arguments across 15 components. (@erikbaranowski, @rfratto)
 
+- Fix panic when fanning out to invalid receivers. (@hainenber)
+
+- Fix a bug where a panic could occur when reloading custom components. (@wildum)
+
+- The `import.git` config block did not work with branches or tags this now fixes that behavior. (@mattdurham)
+
+- Fixed an issue where creating a `prometheus.exporter.postgres` component with
+  multiple `data_source_names` would result in an error. (@thampiotr)
+
 ### Other changes
 
 - Clustering for Grafana Agent in Flow mode has graduated from beta to stable.
@@ -84,9 +121,9 @@ v0.40.3 (2024-03-14)
 - Upgrade to Go 1.22.1 (@thampiotr)
 
 - Upgrade from OpenTelemetry Collector v0.87.0 to v0.96.0:
-  * [ottl]: Fix bug where named parameters needed a space after the equal sign (`=`) 
+  * [ottl]: Fix bug where named parameters needed a space after the equal sign (`=`)
 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/28511
-  * [exporters] Additional enqueue_failed metrics 
+  * [exporters] Additional enqueue_failed metrics
 https://github.com/open-telemetry/opentelemetry-collector/issues/8673
   * [otelcol.receiver.kafka]: Fix issue where counting number of logs emitted could cause panic
   * [otelcol.processor.k8sattributes]: The time format of k8s.pod.start_time attribute value migrated to RFC3339:
@@ -99,9 +136,9 @@ https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/26115
 https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27451
   * [otelcol.connector.spanmetrics] A new `max_per_data_point` argument for exemplar generation.
   * https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29242
-  * [ottl] Add IsBool Converter 
+  * [ottl] Add IsBool Converter
 https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27897
-  * [otelcol.processor.tail_sampling] Optimize memory performance of tailsamplingprocessor 
+  * [otelcol.processor.tail_sampling] Optimize memory performance of tailsamplingprocessor
 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/27889
   * [otelcol.connector.servicegraph] Add a `metrics_flush_interval` argument.
 https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27679
@@ -121,7 +158,7 @@ https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/30162
 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/30274
   * [ottl] Add Hour converter
 https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29468
-  * [otelcol.connector.spanmetrics] A new `resource_metrics_key_attributes` argument to fix broken spanmetrics counters 
+  * [otelcol.connector.spanmetrics] A new `resource_metrics_key_attributes` argument to fix broken spanmetrics counters
   after a span producing service restart, when resource attributes contain dynamic/ephemeral values (e.g. process id).
 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/29711
   * [ottl] Issue with the hash value of a match group in the replace_pattern editors
diff --git a/CODEOWNERS b/CODEOWNERS
index 4f1541f12dbd..b48a1816109b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -18,4 +18,5 @@
 /docs/sources/ @clayton-cornell
 
 # Components:
-/component/pyroscope/ @grafana/grafana-agent-profiling-maintainers
+/internal/component/pyroscope/ @grafana/grafana-agent-profiling-maintainers
+/internal/component/beyla/     @marctc
\ No newline at end of file
diff --git a/cmd/grafana-agent/Dockerfile b/cmd/grafana-agent/Dockerfile
index 09b38ea7d6e9..d855e2f54d8e 100644
--- a/cmd/grafana-agent/Dockerfile
+++ b/cmd/grafana-agent/Dockerfile
@@ -41,7 +41,7 @@ LABEL org.opencontainers.image.source="https://github.com/grafana/agent"
 # Install dependencies needed at runtime.
 RUN <<EOF
   apt-get update
-  apt-get install -qy libsystemd-dev tzdata ca-certificates
+  apt-get install -qy libsystemd-dev tzdata ca-certificates libcap2-bin
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 EOF
 
@@ -53,6 +53,7 @@ RUN groupadd --gid $UID $USERNAME
 RUN useradd -m -u $UID -g $UID $USERNAME
 RUN chown -R $USERNAME:$USERNAME /etc/agent
 RUN chown -R $USERNAME:$USERNAME /bin/grafana-agent
+RUN setcap 'cap_net_bind_service=+ep' /bin/grafana-agent
 
 ENTRYPOINT ["/bin/grafana-agent"]
 ENV AGENT_DEPLOY_MODE=docker
diff --git a/docs/sources/flow/reference/cli/convert.md b/docs/sources/flow/reference/cli/convert.md
index 793acfb2031a..73761440eec4 100644
--- a/docs/sources/flow/reference/cli/convert.md
+++ b/docs/sources/flow/reference/cli/convert.md
@@ -48,12 +48,13 @@ The following flags are supported:
 
 * `--report`, `-r`: The filepath and filename where the report is written.
 
-* `--source-format`, `-f`: Required. The format of the source file. Supported formats: [prometheus], [promtail], [static].
+* `--source-format`, `-f`: Required. The format of the source file. Supported formats: [otelcol], [prometheus], [promtail], [static].
 
 * `--bypass-errors`, `-b`: Enable bypassing errors when converting.
 
 * `--extra-args`, `e`: Extra arguments from the original format used by the converter.
 
+[otelcol]: #opentelemetry-collector
 [prometheus]: #prometheus
 [promtail]: #promtail
 [static]: #static
@@ -72,6 +73,17 @@ Errors are defined as non-critical issues identified during the conversion
 where an output can still be generated. These can be bypassed using the
 `--bypass-errors` flag.
 
+### OpenTelemetry Collector
+
+You can use the `--source-format=otelcol` to convert the source configuration from an [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/configuration/) to a {{< param "PRODUCT_NAME" >}} configuration.
+
+Many OpenTelemetry Collector components are supported.
+Review the `otelcol.*` component information in the [Component Reference][] for more information about `otelcol` components that you can convert.
+If a source configuration has unsupported features, you will receive [errors] when you convert it to a flow configuration.
+The converter raises warnings for configuration options that may require your attention.
+
+Refer to [Migrate from OpenTelemetry Collector to {{< param "PRODUCT_NAME" >}}][migrate-otelcol] for a detailed migration guide.
+
 ### Prometheus
 
 Using the `--source-format=prometheus` will convert the source configuration from
@@ -86,7 +98,7 @@ This includes Prometheus features such as
 and many supported *_sd_configs. Unsupported features in a source configuration result
 in [errors].
 
-Refer to [Migrate from Prometheus to {{< param "PRODUCT_NAME" >}}]({{< relref "../../tasks/migrate/from-prometheus/" >}}) for a detailed migration guide.
+Refer to [Migrate from Prometheus to {{< param "PRODUCT_NAME" >}}][migrate-prometheus] for a detailed migration guide.
 
 ### Promtail
 
@@ -100,21 +112,28 @@ are supported and can be converted to {{< param "PRODUCT_NAME" >}} configuration
 If you have unsupported features in a source configuration, you will receive [errors] when you convert to a flow configuration. The converter will
 also raise warnings for configuration options that may require your attention.
 
-Refer to [Migrate from Promtail to {{< param "PRODUCT_NAME" >}}]({{< relref "../../tasks/migrate/from-promtail/" >}}) for a detailed migration guide.
+Refer to [Migrate from Promtail to {{< param "PRODUCT_NAME" >}}][migrate-promtail] for a detailed migration guide.
 
 ### Static
 
 Using the `--source-format=static` will convert the source configuration from a
-[Grafana Agent Static]({{< relref "../../../static" >}}) configuration to a {{< param "PRODUCT_NAME" >}} configuration.
+[Grafana Agent Static][] configuration to a {{< param "PRODUCT_NAME" >}} configuration.
 
 Include `--extra-args` for passing additional command line flags from the original format.
 For example, `--extra-args="-enable-features=integrations-next"` will convert a Grafana Agent Static
-[integrations-next]({{< relref "../../../static/configuration/integrations/integrations-next/" >}})
-configuration to a {{< param "PRODUCT_NAME" >}} configuration. You can also
+[integrations-next][] configuration to a {{< param "PRODUCT_NAME" >}} configuration. You can also
 expand environment variables with `--extra-args="-config.expand-env"`. You can combine multiple command line
 flags with a space between each flag, for example `--extra-args="-enable-features=integrations-next -config.expand-env"`.
 
 If you have unsupported features in a Static mode source configuration, you will receive [errors][] when you convert to a Flow mode configuration. The converter will
 also raise warnings for configuration options that may require your attention.
 
-Refer to [Migrate from Grafana Agent Static to {{< param "PRODUCT_NAME" >}}]({{< relref "../../tasks/migrate/from-static/" >}}) for a detailed migration guide.
+Refer to [Migrate from Grafana Agent Static to {{< param "PRODUCT_NAME" >}}][migrate-static] for a detailed migration guide.
+
+[Component Reference]: ../../components/
+[migrate-otelcol]: ../../../tasks/migrate/from-otelcol/
+[migrate-prometheus]: ../../../tasks/migrate/from-prometheus/
+[migrate-promtail]: ../../../tasks/migrate/from-promtail/
+[migrate-static]: ../../../tasks/migrate/from-static/
+[Grafana Agent Static]: ../../../../static/
+[integrations-next]: ../../../../static/configuration/integrations/integrations-next/
\ No newline at end of file
diff --git a/docs/sources/flow/reference/cli/run.md b/docs/sources/flow/reference/cli/run.md
index c81c13f7374d..71c17837eb46 100644
--- a/docs/sources/flow/reference/cli/run.md
+++ b/docs/sources/flow/reference/cli/run.md
@@ -61,7 +61,7 @@ The following flags are supported:
 * `--cluster.advertise-interfaces`: List of interfaces used to infer an address to advertise. Set to `all` to use all available network interfaces on the system. (default `"eth0,en0"`).
 * `--cluster.max-join-peers`: Number of peers to join from the discovered set (default `5`).
 * `--cluster.name`: Name to prevent nodes without this identifier from joining the cluster (default `""`).
-* `--config.format`: The format of the source file. Supported formats: `flow`, `prometheus`, `promtail`, `static` (default `"flow"`).
+* `--config.format`: The format of the source file. Supported formats: `flow`, `otelcol`, `prometheus`, `promtail`, `static` (default `"flow"`).
 * `--config.bypass-conversion-errors`: Enable bypassing errors when converting (default `false`).
 * `--config.extra-args`: Extra arguments from the original format used by the converter.
 
diff --git a/docs/sources/flow/reference/compatibility/_index.md b/docs/sources/flow/reference/compatibility/_index.md
index 61775bcf26b5..30825a901f4b 100644
--- a/docs/sources/flow/reference/compatibility/_index.md
+++ b/docs/sources/flow/reference/compatibility/_index.md
@@ -44,6 +44,10 @@ The following components, grouped by namespace, _export_ Targets.
 
 <!-- START GENERATED SECTION: EXPORTERS OF Targets -->
 
+{{< collapse title="beyla" >}}
+- [beyla.ebpf](../components/beyla.ebpf)
+{{< /collapse >}}
+
 {{< collapse title="discovery" >}}
 - [discovery.azure](../components/discovery.azure)
 - [discovery.consul](../components/discovery.consul)
@@ -315,6 +319,10 @@ The following components, grouped by namespace, _consume_ OpenTelemetry `otelcol
 
 <!-- START GENERATED SECTION: CONSUMERS OF OpenTelemetry `otelcol.Consumer` -->
 
+{{< collapse title="beyla" >}}
+- [beyla.ebpf](../components/beyla.ebpf)
+{{< /collapse >}}
+
 {{< collapse title="faro" >}}
 - [faro.receiver](../components/faro.receiver)
 {{< /collapse >}}
diff --git a/docs/sources/flow/reference/components/beyla.ebpf.md b/docs/sources/flow/reference/components/beyla.ebpf.md
new file mode 100644
index 000000000000..ad35b9ccba45
--- /dev/null
+++ b/docs/sources/flow/reference/components/beyla.ebpf.md
@@ -0,0 +1,276 @@
+---
+canonical: https://grafana.com/docs/agent/latest/flow/reference/components/beyla.ebpf/
+description: Learn about beyla.ebpf
+title: beyla.ebpf
+labels:
+  stage: beta
+---
+
+# beyla.ebpf
+
+{{< docs/shared lookup="flow/stability/beta.md" source="agent" version="<AGENT_VERSION>" >}}
+
+The `beyla.ebpf` component is used as a wrapper for [Grafana Beyla][] which uses [eBPF][] to automatically inspect application executables and the OS networking layer, and capture trace spans related to web transactions and Rate Errors Duration (RED) metrics for Linux HTTP/S and gRPC services.
+You can configure the component to collect telemetry data from a specific port or executable path, and other criteria from Kubernetes metadata.
+The component exposes metrics that can be collected by a Prometheus scrape component, and traces that can be forwarded to an OTEL exporter component.
+
+{{< admonition type="note" >}}
+To run this component, {{< param "PRODUCT_NAME" >}} requires administrative (`sudo`) privileges, or at least it needs to be granted the `CAP_SYS_ADMIN` and `CAP_SYS_PTRACE` capability. In Kubernetes environments, app armour must be disabled for the Deployment or DaemonSet running {{< param "PRODUCT_NAME" >}}.
+{{< /admonition >}}
+
+[Grafana Beyla]: https://github.com/grafana/beyla
+[eBPF]: https://ebpf.io/
+
+## Usage
+
+```river
+beyla.ebpf "<LABEL>" {
+
+}
+```
+
+## Arguments
+
+`beyla.ebpf` supports the following arguments:
+
+Name | Type | Description                                               | Default | Required
+---- | ---- |-----------------------------------------------------------| ------- | --------
+`open_port` | `string` | The port of the running service for Beyla automatically instrumented with eBPF. | | no
+`excutable_name` | `string` | The name of the executable to match for Beyla automatically instrumented with eBPF. | | no
+
+
+`open_port` accepts a comma-separated list of ports (for example, `80,443`), and port ranges (for example, `8000-8999`).
+If the executable matches only one of the ports in the list, it is considered to match the selection criteria.
+
+`excutable_name` accepts a regular expression to be matched against the full executable command line, including the directory where the executable resides on the file system.
+
+## Blocks
+
+The following blocks are supported inside the definition of `beyla.ebpf`:
+
+Hierarchy | Block | Description | Required
+--------- | ----- | ----------- | --------
+routes | [routes][] | Configures the routes to match HTTP paths into user-provided HTTP routes. | no
+attributes | [attributes][] | Configures the Beyla attributes for the component. | no
+attributes > kubernetes | [kubernetes][] | Configures decorating of the metrics and traces with Kubernetes metadata of the instrumented Pods. | no
+discovery | [discovery][] | Configures the discovery for instrumentable processes matching a given criteria. | no
+discovery > services | [services][] | Configures the discovery for the component. | no
+output | [output][] | Configures where to send received telemetry data. | yes
+
+The `>` symbol indicates deeper levels of nesting. For example,
+`attributes > kubernetes` refers to a `kubernetes` block defined inside an
+`attributes` block.
+
+[routes]: #routes-block
+[attributes]: #attributes-block
+[kubernetes]: #kubernetes-block
+[discovery]: #discovery-block
+[services]: #services-block
+[output]: #output-block
+
+### attributes block
+
+This block allows you to configure how some attributes for metrics and traces are decorated.
+
+It contains the following blocks:
+[kubernetes]: #kubernetes-block
+
+#### kubernetes block
+
+Name | Type | Description                                               | Default | Required
+---- | ---- |-----------------------------------------------------------| ------- | --------
+`enable` | `string` | Enable the Kubernetes metadata decoration. | `false` | no
+
+If set to `true`, Beyla will decorate the metrics and traces with Kubernetes metadata. The following labels will be added:
+
+- `k8s.namespace.name`
+- `k8s.deployment.name`
+- `k8s.statefulset.name`
+- `k8s.replicaset.name`
+- `k8s.daemonset.name`
+- `k8s.node.name`
+- `k8s.pod.name`
+- `k8s.pod.uid`
+- `k8s.pod.start_time`
+
+If set to `false`, the Kubernetes metadata decorator will be disabled.
+
+If set to `autodetect`, Beyla will try to automatically detect if it is running inside Kubernetes, and enable the metadata decoration if that is the case.
+
+
+### routes block
+
+This block is used to configure the routes to match HTTP paths into user-provided HTTP routes.
+
+Name | Type | Description                                               | Default | Required
+---- | ---- |-----------------------------------------------------------| ------- | --------
+`patterns` | `list(string)` | List of provided URL path patterns to set the `http.route` trace/metric property | | no
+`ignore_patterns` | `list(string)` | List of provided URL path patterns to ignore from `http.route` trace/metric property. | | no
+`ignore_mode` | `string` | The mode to use when ignoring patterns. | | no
+`unmatched` | `string` | Specifies what to do when a trace HTTP path does not match any of the `patterns` entries | | no
+
+`patterns` and `ignored_patterns` are a list of patterns which a URL path with specific tags which allow for grouping path segments (or ignored them).
+The matcher tags can be in the `:name` or `{name}` format.
+`ignore_mode` properties are:
+- `all` discards metrics and traces matching the `ignored_patterns`.
+- `traces` discards only the traces that match the `ignored_patterns`. No metric events are ignored.
+- `metrics` discards only the metrics that match the `ignored_patterns`. No trace events are ignored.
+`unmatched` properties are:
+- `unset` leaves the `http.route` property as unset.
+- `path` copies the `http.route` field property to the path value.
+  - Caution: This option could lead to a cardinality explosion on the ingester side.
+- `wildcard` sets the `http.route` field property to a generic asterisk-based `/**` value.
+- `heuristic` automatically derives the `http.route` field property from the path value based on the following rules:
+  - Any path components that have numbers or characters outside of the ASCII alphabet (or `-` and _), are replaced by an asterisk `*`.
+  - Any alphabetical components that don’t look like words are replaced by an asterisk `*`.
+
+
+### discovery block
+
+This block is used to configure the discovery for instrumentable processes matching a given criteria.
+
+It contains the following blocks:
+[services]: #services-block
+
+### services block
+
+In some scenarios, Beyla will instrument a wide variety of services, such as a Kubernetes DaemonSet that instruments all the services in a node.
+This block allows you to filter the services to instrument based on their metadata.
+
+Name | Type | Description                                               | Default | Required
+---- | ---- |-----------------------------------------------------------| ------- | --------
+`name ` | `string` | The name of the service to match. | | no
+`namespace` | `string` | The namespace of the service to match. | | no
+`open_ports` | `string` | The port of the running service for Beyla automatically instrumented with eBPF. | | no
+`path` | `string` | The path of the running service for Beyla automatically instrumented with eBPF. | | no
+
+`name` defines a name for the matching instrumented service. It is used to populate the `service.name` OTEL property and/or the `service_name` Prometheus property in the exported metrics/traces.
+`open_port` accepts a comma-separated list of ports (for example, `80,443`), and port ranges (for example, `8000-8999`). If the executable matches only one of the ports in the list, it is considered to match the selection criteria.
+`path` accepts a regular expression to be matched against the full executable command line, including the directory where the executable resides on the file system.
+
+
+### output block
+
+The `output` block configures a set of components to forward the resulting telemetry data to.
+
+The following arguments are supported:
+
+Name      | Type                     | Description                           | Default | Required
+----------|--------------------------|---------------------------------------|---------|---------
+`traces`  | `list(otelcol.Consumer)` | List of consumers to send traces to.  | `[]`    | no
+
+You must specify the `output` block, but all its arguments are optional.
+By default, telemetry data is dropped.
+Configure the `traces` argument to send traces data to other components.
+
+## Exported fields
+
+The following fields are exported and can be referenced by other components.
+
+Name      | Type                | Description
+----------|---------------------|----------------------------------------------------------
+`targets` | `list(map(string))` | The targets that can be used to collect metrics of instrumented services with eBPF.
+
+For example, the `targets` can either be passed to a `discovery.relabel` component to rewrite the targets' label sets or to a `prometheus.scrape` component that collects the exposed metrics.
+
+The exported targets use the configured [in-memory traffic][] address specified by the [run command][].
+
+[in-memory traffic]: ../../../concepts/component_controller#in-memory-traffic
+[run command]: ../../cli/run/
+
+## Component health
+
+`beyla.ebpf` is only reported as unhealthy if given an invalid
+configuration.
+
+## Debug information
+
+`beyla.ebpf` does not expose any component-specific debug
+information.
+
+## Example
+
+### Metrics
+
+This example uses a [`prometheus.scrape` component][scrape] to collect metrics from `beyla.ebpf` of
+the specified port:
+
+```river
+beyla.ebpf "default" {
+    open_port = <OPEN_PORT>
+}
+
+prometheus.scrape "beyla" {
+  targets = beyla.ebpf.default.targets
+  forward_to = [prometheus.remote_write.mimir.receiver]
+}
+
+prometheus.remote_write "demo" {
+  endpoint {
+    url = <PROMETHEUS_REMOTE_WRITE_URL>
+
+    basic_auth {
+      username = <USERNAME>
+      password = <PASSWORD>
+    }
+  }
+}
+```
+
+Replace the following:
+
+- _`<OPEN_PORT>`_: The port of the running service for Beyla automatically instrumented with eBPF.
+- _`<PROMETHEUS_REMOTE_WRITE_URL>`_: The URL of the Prometheus remote_write-compatible server to send metrics to.
+- _`<USERNAME>`_: The username to use for authentication to the remote_write API.
+- _`<PASSWORD>`_: The password to use for authentication to the remote_write API.
+
+[scrape]: ../prometheus.scrape/
+
+### Traces
+
+This example gets traces from `beyla.ebpf` and forwards them to `otlp`:
+
+```river
+beyla.ebpf "default" {
+    open_port = <OPEN_PORT>
+    output {
+        traces = [otelcol.processor.batch.default.input]
+    }
+}
+
+otelcol.processor.batch "default" {
+    output {
+        traces  = [otelcol.exporter.otlp.default.input]
+    }
+}
+
+otelcol.exporter.otlp "default" {
+    client {
+        endpoint = env("<OTLP_ENDPOINT>")
+    }
+}
+```
+
+Replace the following:
+
+- _`<OPEN_PORT>`_: The port of the running service for Beyla automatically instrumented with eBPF.
+- _`<OTLP_ENDPOINT>`_: The endpoint of the OpenTelemetry Collector to send traces to.
+
+<!-- START GENERATED COMPATIBLE COMPONENTS -->
+
+## Compatible components
+
+`beyla.ebpf` can accept arguments from the following components:
+
+- Components that export [OpenTelemetry `otelcol.Consumer`](../../compatibility/#opentelemetry-otelcolconsumer-exporters)
+
+`beyla.ebpf` has exports that can be consumed by the following components:
+
+- Components that consume [Targets](../../compatibility/#targets-consumers)
+
+{{< admonition type="note" >}}
+Connecting some components may not be sensible or components may require further configuration to make the connection work correctly.
+Refer to the linked documentation for more details.
+{{< /admonition >}}
+
+<!-- END GENERATED COMPATIBLE COMPONENTS -->
\ No newline at end of file
diff --git a/docs/sources/flow/reference/components/faro.receiver.md b/docs/sources/flow/reference/components/faro.receiver.md
index 36e37fa5fce3..7644f4035309 100644
--- a/docs/sources/flow/reference/components/faro.receiver.md
+++ b/docs/sources/flow/reference/components/faro.receiver.md
@@ -66,6 +66,7 @@ Name | Type | Description | Default | Required
 `cors_allowed_origins` | `list(string)` | Origins for which cross-origin requests are permitted. | `[]` | no
 `api_key` | `secret` | Optional API key to validate client requests with. | `""` | no
 `max_allowed_payload_size` | `string` | Maximum size (in bytes) for client requests. | `"5MiB"` | no
+`include_metadata` | `boolean` | Propagate incoming connection metadata to downstream consumers. | `false` | no
 
 By default, telemetry data is only accepted from applications on the same local
 network as the browser. To accept telemetry data from a wider set of clients,
diff --git a/docs/sources/flow/reference/components/loki.source.file.md b/docs/sources/flow/reference/components/loki.source.file.md
index 683b66cabfc4..8fe8354850bf 100644
--- a/docs/sources/flow/reference/components/loki.source.file.md
+++ b/docs/sources/flow/reference/components/loki.source.file.md
@@ -37,12 +37,13 @@ log entries to the list of receivers passed in `forward_to`.
 
 `loki.source.file` supports the following arguments:
 
-| Name            | Type                 | Description                                                                         | Default | Required |
-| --------------- | -------------------- | ----------------------------------------------------------------------------------- | ------- | -------- |
-| `targets`       | `list(map(string))`  | List of files to read from.                                                         |         | yes      |
-| `forward_to`    | `list(LogsReceiver)` | List of receivers to send log entries to.                                           |         | yes      |
-| `encoding`      | `string`             | The encoding to convert from when reading files.                                    | `""`    | no       |
-| `tail_from_end` | `bool`               | Whether a log file should be tailed from the end if a stored position is not found. | `false` | no       |
+| Name                    | Type                 | Description                                                                         | Default | Required |
+| ------------------------| -------------------- | ----------------------------------------------------------------------------------- | ------- | -------- |
+| `targets`               | `list(map(string))`  | List of files to read from.                                                         |         | yes      |
+| `forward_to`            | `list(LogsReceiver)` | List of receivers to send log entries to.                                           |         | yes      |
+| `encoding`              | `string`             | The encoding to convert from when reading files.                                    | `""`    | no       |
+| `tail_from_end`         | `bool`               | Whether a log file should be tailed from the end if a stored position is not found. | `false` | no       |
+| `legacy_positions_file` | `string`      | Allows conversion from legacy positions file.                                      | `""`    | no       |
 
 The `encoding` argument must be a valid [IANA encoding][] name. If not set, it
 defaults to UTF-8.
@@ -50,6 +51,15 @@ defaults to UTF-8.
 You can use the `tail_from_end` argument when you want to tail a large file without reading its entire content.
 When set to true, only new logs will be read, ignoring the existing ones.
 
+
+{{< admonition type="note" >}}
+The `legacy_positions_file` argument is used when you are transitioning from legacy. The legacy positions file will be rewritten into the new format.
+This operation will only occur if the new positions file does not exist and the `legacy_positions_file` is valid.
+Once converted successfully, the `legacy_positions_file` will be deleted.
+If you add any labels before `loki.source.file`, then the positions file will conversion will not work.
+The legacy positions file did not have a concept of labels in the positions file, so the conversion assumes no labels.
+{{< /admonition >}}
+
 ## Blocks
 
 The following blocks are supported inside the definition of `loki.source.file`:
diff --git a/docs/sources/flow/reference/components/prometheus.exporter.postgres.md b/docs/sources/flow/reference/components/prometheus.exporter.postgres.md
index d5f6cc78ea5e..5778217cfa95 100644
--- a/docs/sources/flow/reference/components/prometheus.exporter.postgres.md
+++ b/docs/sources/flow/reference/components/prometheus.exporter.postgres.md
@@ -32,11 +32,12 @@ prometheus.exporter.postgres "LABEL" {
 The following arguments are supported:
 
 | Name                         | Type           | Description                                                                   | Default | Required |
-| ---------------------------- | -------------- | ----------------------------------------------------------------------------- | ------- | -------- |
+|------------------------------|----------------|-------------------------------------------------------------------------------|---------|----------|
 | `data_source_names`          | `list(secret)` | Specifies the Postgres server(s) to connect to.                               |         | yes      |
 | `disable_settings_metrics`   | `bool`         | Disables collection of metrics from pg_settings.                              | `false` | no       |
 | `disable_default_metrics`    | `bool`         | When `true`, only exposes metrics supplied from `custom_queries_config_path`. | `false` | no       |
 | `custom_queries_config_path` | `string`       | Path to YAML file containing custom queries to expose as metrics.             | ""      | no       |
+| `enabled_collectors`         | `list(string)` | List of collectors to enable. See below for more detail.                      | []      | no       |
 
 The format for connection strings in `data_source_names` can be found in the [official postgresql documentation](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING).
 
@@ -44,6 +45,22 @@ See examples for the `custom_queries_config_path` file in the [postgres_exporter
 
 **NOTE**: There are a number of environment variables that are not recommended for use, as they will affect _all_ `prometheus.exporter.postgres` components. A full list can be found in the [postgres_exporter repository](https://github.com/prometheus-community/postgres_exporter#environment-variables).
 
+By default, the same set of metrics is enabled as in the upstream [postgres_exporter](https://github.com/prometheus-community/postgres_exporter/). If `custom_queries_config_path` is set, additional metrics defined in the given config file will be exposed.
+If `disable_default_metrics` is set to `true`, only the metrics defined in the `custom_queries_config_path` file will be exposed.
+
+A subset of metrics collectors can be controlled by setting the `enabled_collectors` argument. The following collectors are available for selection:
+`database`, `database_wraparound`, `locks`, `long_running_transactions`, `postmaster`, `process_idle`,
+`replication`, `replication_slot`, `stat_activity_autovacuum`, `stat_bgwriter`, `stat_database`,
+`stat_statements`, `stat_user_tables`, `stat_wal_receiver`, `statio_user_indexes`, `statio_user_tables`,
+`wal`, `xlog_location`.
+
+By default, the following collectors are enabled: `database`, `locks`, `replication`, `replication_slot`, `stat_bgwriter`, `stat_database`,
+`stat_user_tables`, `statio_user_tables`, `wal`.
+
+{{< admonition type="note" >}}
+Due to a limitation of the upstream exporter, when multiple `data_source_names` are used, the collectors that are controlled via the `enabled_collectors` argument will only be applied to the first data source in the list.
+{{< /admonition >}}
+
 ## Blocks
 
 The following blocks are supported:
diff --git a/docs/sources/flow/tasks/migrate/from-operator.md b/docs/sources/flow/tasks/migrate/from-operator.md
index c40f7d640533..1b19ac260a94 100644
--- a/docs/sources/flow/tasks/migrate/from-operator.md
+++ b/docs/sources/flow/tasks/migrate/from-operator.md
@@ -10,7 +10,7 @@ canonical: https://grafana.com/docs/agent/latest/flow/tasks/migrate/from-operato
 description: Migrate from Grafana Agent Operator to Grafana Agent Flow
 menuTitle: Migrate from Operator
 title: Migrate from Grafana Agent Operator to Grafana Agent Flow
-weight: 320
+weight: 300
 ---
 
 # Migrate from Grafana Agent Operator to {{% param "PRODUCT_NAME" %}}
diff --git a/docs/sources/flow/tasks/migrate/from-otelcol.md b/docs/sources/flow/tasks/migrate/from-otelcol.md
new file mode 100644
index 000000000000..60b9fa44e4a2
--- /dev/null
+++ b/docs/sources/flow/tasks/migrate/from-otelcol.md
@@ -0,0 +1,274 @@
+---
+canonical: https://grafana.com/docs/agent/latest/flow/tasks/migrate/from-otelcol/
+description: Learn how to migrate from OpenTelemetry Collector to Grafana Agent Flow
+menuTitle: Migrate from OpenTelemetry Collector
+title: Migrate from OpenTelemetry Collector to Grafana Agent Flow
+weight: 310
+---
+
+# Migrate from OpenTelemetry Collector to {{% param "PRODUCT_NAME" %}}
+
+The built-in {{< param "PRODUCT_ROOT_NAME" >}} convert command can migrate your [OpenTelemetry Collector][] configuration to a {{< param "PRODUCT_NAME" >}} configuration.
+
+This topic describes how to:
+
+* Convert an OpenTelemetry Collector configuration to a {{< param "PRODUCT_NAME" >}} configuration.
+* Run an OpenTelemetry Collector configuration natively using {{< param "PRODUCT_NAME" >}}.
+
+## Components used in this topic
+
+* [otelcol.receiver.otlp][]
+* [otelcol.processor.memory_limiter][]
+* [otelcol.exporter.otlp][]
+
+## Before you begin
+
+* You must have an existing OpenTelemetry Collector configuration.
+* You must have a set of OpenTelemetry Collector applications ready to push telemetry data to {{< param "PRODUCT_NAME" >}}.
+* You must be familiar with the concept of [Components][] in {{< param "PRODUCT_NAME" >}}.
+
+## Convert an OpenTelemetry Collector configuration
+
+To fully migrate your configuration from [OpenTelemetry Collector] to {{< param "PRODUCT_NAME" >}}, you must convert your OpenTelemetry Collector configuration into a {{< param "PRODUCT_NAME" >}} configuration.
+This conversion will enable you to take full advantage of the many additional features available in {{< param "PRODUCT_NAME" >}}.
+
+> In this task, you will use the [convert][] CLI command to output a {{< param "PRODUCT_NAME" >}}
+> configuration from a OpenTelemetry Collector configuration.
+
+1. Open a terminal window and run the following command.
+
+   {{< code >}}
+
+   ```static-binary
+   AGENT_MODE=flow grafana-agent convert --source-format=otelcol --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+   ```
+
+   ```flow-binary
+   grafana-agent-flow convert --source-format=otelcol --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+   ```
+
+   {{< /code >}}
+
+   Replace the following:
+
+   - _`<INPUT_CONFIG_PATH>`_: The full path to the OpenTelemetry Collector configuration.
+   - _`<OUTPUT_CONFIG_PATH>`_: The full path to output the {{< param "PRODUCT_NAME" >}} configuration.
+
+1. [Run][] {{< param "PRODUCT_NAME" >}} using the new {{< param "PRODUCT_NAME" >}} configuration from _`<OUTPUT_CONFIG_PATH>`_:
+
+### Debugging
+
+1. If the `convert` command can't convert an OpenTelemetry Collector configuration, diagnostic information is sent to `stderr`.\
+   You can bypass any non-critical issues and output the {{< param "PRODUCT_NAME" >}} configuration using a best-effort conversion by including the `--bypass-errors` flag.
+
+    {{< admonition type="caution" >}}
+    If you bypass the errors, the behavior of the converted configuration may not match the original OpenTelemetry Collector configuration.
+    Make sure you fully test the converted configuration before using it in a production environment.
+    {{< /admonition >}}
+
+   {{< code >}}
+
+   ```static-binary
+   AGENT_MODE=flow grafana-agent convert --source-format=otelcol --bypass-errors --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+   ```
+
+   ```flow-binary
+   grafana-agent-flow convert --source-format=otelcol --bypass-errors --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+   ```
+
+   {{< /code >}}
+
+   Replace the following:
+
+   - _`<INPUT_CONFIG_PATH>`_: The full path to the OpenTelemetry Collector configuration.
+   - _`<OUTPUT_CONFIG_PATH>`_: The full path to output the {{< param "PRODUCT_NAME" >}} configuration.
+
+1. You can also output a diagnostic report by including the `--report` flag.
+
+   {{< code >}}
+
+   ```static-binary
+   AGENT_MODE=flow grafana-agent convert --source-format=otelcol --report=<OUTPUT_REPORT_PATH> --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+   ```
+
+   ```flow-binary
+   grafana-agent-flow convert --source-format=otelcol --report=<OUTPUT_REPORT_PATH> --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+   ```
+
+   {{< /code >}}
+
+   Replace the following:
+
+   - _`<INPUT_CONFIG_PATH>`_: The full path to the OpenTelemetry Collector configuration.
+   - _`<OUTPUT_CONFIG_PATH>`_: The full path to output the {{< param "PRODUCT_NAME" >}} configuration.
+   - _`<OUTPUT_REPORT_PATH>`_: The output path for the report.
+
+    Using the [example][] OpenTelemetry Collector configuration below, the diagnostic report provides the following information:
+
+    ```plaintext
+    (Info) Converted receiver/otlp into otelcol.receiver.otlp.default
+    (Info) Converted processor/memory_limiter into otelcol.processor.memory_limiter.default
+    (Info) Converted exporter/otlp into otelcol.exporter.otlp.default
+
+    A configuration file was generated successfully.
+    ```
+
+## Run an OpenTelemetry Collector configuration
+
+If you’re not ready to completely switch to a {{< param "PRODUCT_NAME" >}} configuration, you can run {{< param "PRODUCT_ROOT_NAME" >}} using your existing OpenTelemetry Collector configuration.
+The `--config.format=otelcol` flag tells {{< param "PRODUCT_ROOT_NAME" >}} to convert your OpenTelemetry Collector configuration to a {{< param "PRODUCT_NAME" >}} configuration and load it directly without saving the new configuration.
+This allows you to try {{< param "PRODUCT_NAME" >}} without modifying your existing OpenTelemetry Collector configuration infrastructure.
+
+> In this task, you will use the [run][] CLI command to run {{< param "PRODUCT_NAME" >}}
+> using an OpenTelemetry Collector configuration.
+
+[Run][] {{< param "PRODUCT_NAME" >}} and include the command line flag `--config.format=otelcol`.
+Your configuration file must be a valid OpenTelemetry Collector configuration file rather than a {{< param "PRODUCT_NAME" >}} configuration file.
+
+### Debugging
+
+1. You can follow the convert CLI command [debugging][] instructions to generate a diagnostic report.
+
+1. Refer to the {{< param "PRODUCT_NAME" >}} [Debugging][DebuggingUI] for more information about a running {{< param "PRODUCT_NAME" >}}.
+
+1. If your OpenTelemetry Collector configuration can't be converted and loaded directly into {{< param "PRODUCT_NAME" >}}, diagnostic information is sent to `stderr`.
+   You can bypass any non-critical issues and start the Agent by including the `--config.bypass-conversion-errors` flag in addition to `--config.format=otelcol`.
+
+   {{< admonition type="caution" >}}
+   If you bypass the errors, the behavior of the converted configuration may not match the original Prometheus configuration.
+   Do not use this flag in a production environment.
+   {{< /admonition >}}
+
+## Example
+
+This example demonstrates converting an OpenTelemetry Collector configuration file to a {{< param "PRODUCT_NAME" >}} configuration file.
+
+The following OpenTelemetry Collector configuration file provides the input for the conversion.
+
+```yaml
+receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
+
+exporters:
+  otlp:
+    endpoint: database:4317
+
+processors:
+  memory_limiter:
+    limit_percentage: 90
+    check_interval: 1s
+
+
+service:
+  pipelines:
+    metrics:
+      receivers: [otlp]
+      processors: [memory_limiter]
+      exporters: [otlp]
+    logs:
+      receivers: [otlp]
+      processors: [memory_limiter]
+      exporters: [otlp]
+    traces:
+      receivers: [otlp]
+      processors: [memory_limiter]
+      exporters: [otlp]
+```
+
+The convert command takes the YAML file as input and outputs a [River][] file.
+
+{{< code >}}
+
+```static-binary
+AGENT_MODE=flow grafana-agent convert --source-format=otelcol --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+```
+
+```flow-binary
+grafana-agent-flow convert --source-format=otelcol --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+```
+
+{{< /code >}}
+
+Replace the following:
+
+- _`<INPUT_CONFIG_PATH>`_: The full path to the OpenTelemetry Collector configuration.
+- _`<OUTPUT_CONFIG_PATH>`_: The full path to output the {{< param "PRODUCT_NAME" >}} configuration.
+
+The new {{< param "PRODUCT_NAME" >}} configuration file looks like this:
+
+```river
+otelcol.receiver.otlp "default" {
+	grpc { }
+
+	http { }
+
+	output {
+		metrics = [otelcol.processor.memory_limiter.default.input]
+		logs    = [otelcol.processor.memory_limiter.default.input]
+		traces  = [otelcol.processor.memory_limiter.default.input]
+	}
+}
+
+otelcol.processor.memory_limiter "default" {
+	check_interval   = "1s"
+	limit_percentage = 90
+
+	output {
+		metrics = [otelcol.exporter.otlp.default.input]
+		logs    = [otelcol.exporter.otlp.default.input]
+		traces  = [otelcol.exporter.otlp.default.input]
+	}
+}
+
+otelcol.exporter.otlp "default" {
+	client {
+		endpoint = "database:4317"
+	}
+}
+```
+
+## Limitations
+
+Configuration conversion is done on a best-effort basis. {{< param "PRODUCT_ROOT_NAME" >}} will issue warnings or errors where the conversion can't be performed.
+
+After the configuration is converted, review the {{< param "PRODUCT_NAME" >}} configuration file created and verify that it's correct before starting to use it in a production environment.
+
+The following list is specific to the convert command and not {{< param "PRODUCT_NAME" >}}:
+
+* Components are supported which directly embed upstream OpenTelemetry Collector features. You can get a general idea of which exist in
+  {{< param "PRODUCT_NAME" >}} for conversion by reviewing the `otelcol.*` components in the [Component Reference][].
+  Any additional unsupported features are returned as errors during conversion.
+* Check if you are using any extra command line arguments with OpenTelemetry Collector that aren't present in your configuration file.
+* Metamonitoring metrics exposed by {{< param "PRODUCT_NAME" >}} usually match OpenTelemetry Collector metamonitoring metrics but will use a different name.
+  Make sure that you use the new metric names, for example, in your alerts and dashboards queries.
+* The logs produced by {{< param "PRODUCT_NAME" >}} differ from those produced by OpenTelemetry Collector.
+* {{< param "PRODUCT_ROOT_NAME" >}} exposes the {{< param "PRODUCT_NAME" >}} [UI][].
+
+[OpenTelemetry Collector]: https://opentelemetry.io/docs/collector/configuration/
+[debugging]: #debugging
+[example]: #example
+
+{{% docs/reference %}}
+[otelcol.receiver.otlp]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/reference/components/otelcol.receiver.otlp.md"
+[otelcol.processor.memory_limiter]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/reference/components/otelcol.processor.memory_limiter.md"
+[otelcol.exporter.otlp]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/reference/components/otelcol.exporter.otlp.md"
+[Components]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/concepts/components.md"
+[Components]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/concepts/components.md"
+[Component Reference]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/reference/components/_index.md"
+[Component Reference]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/reference/components/_index.md"
+[convert]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/reference/cli/convert.md"
+[convert]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/reference/cli/convert.md"
+[run]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/reference/cli/run.md"
+[run]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/reference/cli/run.md"
+[Run]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/get-started/run/"
+[Run]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/get-started/run/"
+[DebuggingUI]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/tasks/debug.md"
+[DebuggingUI]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/tasks/debug.md"
+[River]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/concepts/config-language/_index.md"
+[River]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/concepts/config-language/_index.md"
+[UI]: "/docs/agent/ -> /docs/agent/<AGENT_VERSION>/flow/tasks/debug#grafana-agent-flow-ui"
+[UI]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/send-data/agent/flow/tasks/debug#grafana-agent-flow-ui"
+{{% /docs/reference %}}
diff --git a/docs/sources/flow/tasks/migrate/from-static.md b/docs/sources/flow/tasks/migrate/from-static.md
index 5d1b73626f60..eb035223ce80 100644
--- a/docs/sources/flow/tasks/migrate/from-static.md
+++ b/docs/sources/flow/tasks/migrate/from-static.md
@@ -339,7 +339,7 @@ After the configuration is converted, review the {{< param "PRODUCT_NAME" >}} co
 
 The following list is specific to the convert command and not {{< param "PRODUCT_NAME" >}}:
 
-* The  [Traces][] and [Agent Management][] configuration options can't be automatically converted to {{< param "PRODUCT_NAME" >}}. However, traces are fully supported in {{< param "PRODUCT_NAME" >}} and you can build your configuration manually.
+* The  [Agent Management][] configuration options can't be automatically converted to {{< param "PRODUCT_NAME" >}}.
   Any additional unsupported features are returned as errors during conversion.
 * There is no gRPC server to configure for {{< param "PRODUCT_NAME" >}}, as any non-default configuration will show as unsupported during the conversion.
 * Check if you are using any extra command line arguments with Static that aren't present in your configuration file. For example, `-server.http.address`.
diff --git a/go.mod b/go.mod
index df02090c846b..c19e876cd204 100644
--- a/go.mod
+++ b/go.mod
@@ -215,11 +215,11 @@ require (
 	go.uber.org/goleak v1.3.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.20.0
+	golang.org/x/crypto v0.21.0
 	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
 	golang.org/x/net v0.21.0
 	golang.org/x/oauth2 v0.17.0
-	golang.org/x/sys v0.17.0
+	golang.org/x/sys v0.18.0
 	golang.org/x/text v0.14.0
 	golang.org/x/time v0.5.0
 	google.golang.org/api v0.155.0
@@ -300,7 +300,6 @@ require (
 	github.com/aws/smithy-go v1.20.1 // indirect
 	github.com/beevik/ntp v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver v3.5.2-0.20180723201105-3c1074078d32+incompatible // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/boynux/squid-exporter v1.10.5-0.20230618153315-c1fae094e18e
 	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect
@@ -320,7 +319,7 @@ require (
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dennwc/btrfs v0.0.0-20230312211831-a1f570bd01a1 // indirect
 	github.com/dennwc/ioctl v1.0.0 // indirect
 	github.com/dennwc/varint v1.0.0 // indirect
@@ -545,8 +544,8 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 // indirect
 	github.com/tg123/go-htpasswd v1.2.2 // indirect
 	github.com/tilinna/clock v1.1.0
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/vertica/vertica-sql-go v1.3.3 // indirect
@@ -567,7 +566,7 @@ require (
 	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
 	github.com/xo/dburl v0.20.0 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.10 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.10 // indirect
@@ -578,9 +577,9 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
 	go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect
 	go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
-	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/mod v0.15.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/term v0.17.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/tools v0.16.1
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -608,6 +607,7 @@ require (
 	github.com/Shopify/sarama v1.38.1
 	github.com/githubexporter/github-exporter v0.0.0-20231025122338-656e7dc33fe7
 	github.com/grafana/agent-remote-config v0.0.2
+	github.com/grafana/beyla v1.4.1-0.20240328093156-fca861576b2c
 	github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361
 	github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d
 	github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a
@@ -627,6 +627,7 @@ require (
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
+	github.com/AlessandroPomponio/go-gibberish v0.0.0-20191004143433-a2d4156f0396 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 // indirect
 	github.com/DataDog/sketches-go v1.4.4 // indirect
@@ -638,22 +639,25 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.19.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.38.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.36.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.147.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.149.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.20.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/shield v1.24.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/storagegateway v1.26.0 // indirect
 	github.com/axiomhq/hyperloglog v0.0.0-20240124082744-24bca3a5b39b // indirect
+	github.com/caarlos0/env/v9 v9.0.0 // indirect
 	github.com/channelmeter/iso8601duration v0.0.0-20150204201828-8da3af7a2a61 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
 	github.com/drone/envsubst v1.0.3 // indirect
 	github.com/expr-lang/expr v1.16.1 // indirect
+	github.com/gavv/monotime v0.0.0-20190418164738-30dba4353424 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.3 // indirect
 	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
 	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/grafana/go-offsets-tracker v0.1.7 // indirect
 	github.com/grafana/jfr-parser v0.8.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hetznercloud/hcloud-go/v2 v2.4.0 // indirect
@@ -661,6 +665,7 @@ require (
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/knadh/koanf/v2 v2.1.0 // indirect
 	github.com/lightstep/go-expohisto v1.0.0 // indirect
+	github.com/mariomac/pipes v0.9.0 // indirect
 	github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect
 	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
 	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
@@ -680,6 +685,7 @@ require (
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/skeema/knownhosts v1.2.1 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
@@ -688,6 +694,8 @@ require (
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tidwall/tinylru v1.1.0 // indirect
 	github.com/tidwall/wal v1.1.7 // indirect
+	github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 // indirect
+	github.com/yl2chen/cidranger v1.0.2 // indirect
 	go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.0 // indirect
 	go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.0 // indirect
 	go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.0 // indirect
@@ -698,6 +706,7 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
 )
 
 // NOTE: replace directives below must always be *temporary*.
@@ -752,7 +761,7 @@ replace (
 	// https://github.com/grafana/cadvisor/tree/grafana-v0.47-noglobals
 	github.com/google/cadvisor => github.com/grafana/cadvisor v0.0.0-20231110094609-5f7917925dea
 
-	github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520
+	github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.15.1-0.20240402092333-fad5f95ea113 // exporter-package-v0.15.0 branch
 
 	// TODO(marctc): remove once this PR is merged upstream: https://github.com/prometheus/mysqld_exporter/pull/774
 	github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595
diff --git a/go.sum b/go.sum
index 268b84e93f36..4d664716ca6b 100644
--- a/go.sum
+++ b/go.sum
@@ -70,6 +70,8 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AlekSi/pointer v1.1.0 h1:SSDMPcXD9jSl8FPy9cRzoRaMJtm9g9ggGTxecRUbQoI=
 github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE=
+github.com/AlessandroPomponio/go-gibberish v0.0.0-20191004143433-a2d4156f0396 h1:cKIHT8I2mrmw/VgdyNeACP/AvetK8AgGsiRfOC3ZjmQ=
+github.com/AlessandroPomponio/go-gibberish v0.0.0-20191004143433-a2d4156f0396/go.mod h1:2VCDG9kHYQ5vfYUqeoB7foVlcvIvB7rp9LxTELLD1qU=
 github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg=
 github.com/Azure/azure-event-hubs-go/v3 v3.2.0/go.mod h1:BPIIJNH/l/fVHYq3Rm6eg4clbrULrQ3q7+icmqHyyLc=
 github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg=
@@ -308,11 +310,9 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.34.34/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.50.27 h1:96ifhrSuja+AzdP3W/T2337igqVQ2FcSIJYkk+0rCeA=
 github.com/aws/aws-sdk-go v1.50.27/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/aws/aws-sdk-go-v2 v1.7.0/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4=
 github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
 github.com/aws/aws-sdk-go-v2 v1.25.2 h1:/uiG1avJRgLGiQM9X3qJM8+Qa6KRGK5rRPuXE0HUM+w=
 github.com/aws/aws-sdk-go-v2 v1.25.2/go.mod h1:Evoc5AsmtveRt1komDwIsjHFyrP5tDuF1D1U+6z6pNo=
@@ -347,11 +347,10 @@ github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.19.0/go.mod h1:sfDv1ZbBmaID
 github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.38.0 h1:BnElrrgowaG50hoUCbBc5lq5XX7Fr7F4nvZovCDjevk=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.38.0/go.mod h1:6ioQn0JPZSvTdXmnUAQa9h7x8m+KU63rkgiAD1ZLnqc=
-github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.5.0/go.mod h1:acH3+MQoiMzozT/ivU+DbRg7Ooo2298RdRaWcOv+4vM=
 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.36.0 h1:aQD36/NeII5cKl5tDgGgFRIIVCVofPsYQ/tYJnlVkqY=
 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.36.0/go.mod h1:EF/UkL+0uEqcqr0sKFJJIT3Jbcxgt2oWz9R0vaLNSVU=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.147.0 h1:m9+QgPg/qzlxL0Oxb/dD12jzeWfuQGn9XqCWyDAipi8=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.147.0/go.mod h1:ntWksNNQcXImRQMdxab74tp+H94neF/TwQJ9Ndxb04k=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.149.1 h1:OGZUMBYZnz+R5nkW6FS1J8UlfLeM/pKojck+74+ZQGY=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.149.1/go.mod h1:XxJNg7fIkR8cbm89i0zVZSxKpcPYsC8BWRwMIJOWbnk=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 h1:EyBZibRTVAs6ECHZOw5/wlylS9OcTzwyjeQMudmREjE=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1/go.mod h1:JKpmtYhhPs7D97NL/ltqz7yCkERFW5dOlHyVl66ZYF8=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.0 h1:UiSyK6ent6OKpkMJN3+k5HZ4sk4UfchEaaW5wv7SblQ=
@@ -379,7 +378,6 @@ github.com/aws/aws-sdk-go-v2/service/storagegateway v1.26.0/go.mod h1:vs7VbPSVlT
 github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
 github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 h1:3I2cBEYgKhrWlwyZgfpSO2BpaMY1LHPqXYk/QGlu2ew=
 github.com/aws/aws-sdk-go-v2/service/sts v1.28.1/go.mod h1:uQ7YYKZt3adCRrdCBREm1CD3efFLOUNH77MrUCvx5oA=
-github.com/aws/smithy-go v1.5.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw=
 github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
@@ -405,9 +403,6 @@ github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENU
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/bkaradzic/go-lz4 v1.0.0 h1:RXc4wYsyz985CkXXeX04y4VnZFGG8Rd43pRaHsOXAKk=
 github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
-github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/blang/semver v3.5.2-0.20180723201105-3c1074078d32+incompatible h1:8fBbhRkI5/0ocLFbrhPgnGUm0ogc+Gko1cRodPWDKX4=
-github.com/blang/semver v3.5.2-0.20180723201105-3c1074078d32+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
@@ -421,9 +416,10 @@ github.com/burningalchemist/sql_exporter v0.0.0-20240103092044-466b38b6abc4/go.m
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY=
 github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
+github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc=
+github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020=
 github.com/caio/go-tdigest v2.3.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/casbin/casbin/v2 v2.31.6/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
 github.com/cenkalti/backoff v2.0.0+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
@@ -689,6 +685,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gavv/monotime v0.0.0-20190418164738-30dba4353424 h1:Vh7rylVZRZCj6W41lRlP17xPk4Nq260H4Xo/DDYmEZk=
+github.com/gavv/monotime v0.0.0-20190418164738-30dba4353424/go.mod h1:vmp8DIyckQMXOPl0AQVHt+7n5h7Gb7hS6CUydiV8QeA=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
@@ -716,7 +714,6 @@ github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQr
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
-github.com/go-kit/kit v0.11.0/go.mod h1:73/6Ixaufkvb5Osvkls8C79vuQ49Ba1rUEUYNSf+FUw=
 github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU=
 github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg=
 github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
@@ -809,7 +806,6 @@ github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
 github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c=
 github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
-github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
 github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
@@ -1030,6 +1026,10 @@ github.com/gosnmp/gosnmp v1.36.0/go.mod h1:iLcZxN2MxKhH0jPQDVMZaSNypw1ykqVi27O79
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/grafana/agent-remote-config v0.0.2 h1:s3FKgVzfY5Ij+xG0wVKgVvtDrh/Bz0ZvB3D5MM7LJxU=
 github.com/grafana/agent-remote-config v0.0.2/go.mod h1:amyG3pVNXKcMo+kNN46yhnAXAz/m/9Ew9MRf53n7XBg=
+github.com/grafana/beyla v1.4.1-0.20240327164442-58a6a7f202b6 h1:9AFgJEhaJuOTH0rdxB4pKUVmYtV7jRoMxutqCdFKq6k=
+github.com/grafana/beyla v1.4.1-0.20240327164442-58a6a7f202b6/go.mod h1:Sr/rrYyfY5jP8THckwt0czat+1gstouBqcJ96djHaVk=
+github.com/grafana/beyla v1.4.1-0.20240328093156-fca861576b2c h1:ZmhqaUU7ELXwIYlUMlAG5Sl2DJC4ctKyIVLny5rVtgU=
+github.com/grafana/beyla v1.4.1-0.20240328093156-fca861576b2c/go.mod h1:Sr/rrYyfY5jP8THckwt0czat+1gstouBqcJ96djHaVk=
 github.com/grafana/cadvisor v0.0.0-20231110094609-5f7917925dea h1:Q5f5/nJJ0SbusZjA6F6XkJuHDbl2/PqdTGw6wHsuccA=
 github.com/grafana/cadvisor v0.0.0-20231110094609-5f7917925dea/go.mod h1:XjiOCFjmxXIWwauV5p39Mr2Yxlpyk72uKQH1UZvd4fQ=
 github.com/grafana/ckit v0.0.0-20230906125525-c046c99a5c04 h1:tG8Qxq4dN1WqakMmsPaxaH4+OQhYg5HVsarw5acLBX8=
@@ -1040,6 +1040,8 @@ github.com/grafana/dskit v0.0.0-20240104111617-ea101a3b86eb h1:AWE6+kvtE18HP+lRW
 github.com/grafana/dskit v0.0.0-20240104111617-ea101a3b86eb/go.mod h1:kkWM4WUV230bNG3urVRWPBnSJHs64y/0RmWjftnnn0c=
 github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak=
 github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90=
+github.com/grafana/go-offsets-tracker v0.1.7 h1:2zBQ7iiGzvyXY7LA8kaaSiEqH/Yx82UcfRabbY5aOG4=
+github.com/grafana/go-offsets-tracker v0.1.7/go.mod h1:qcQdu7zlUKIFNUdBJlLyNHuJGW0SKWKjkrN6jtt+jds=
 github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85/go.mod h1:crI9WX6p0IhrqB+DqIUHulRW853PaNFf7o4UprV//3I=
 github.com/grafana/gomemcache v0.0.0-20231204155601-7de47a8c3cb0 h1:aLBiDMjTtXx2800iCIp+8kdjIlvGX0MF/zICQMQO2qU=
 github.com/grafana/gomemcache v0.0.0-20231204155601-7de47a8c3cb0/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU=
@@ -1063,8 +1065,8 @@ github.com/grafana/opentelemetry-collector/otelcol v0.0.0-20240321103955-8919a1c
 github.com/grafana/opentelemetry-collector/otelcol v0.0.0-20240321103955-8919a1c85cbe/go.mod h1:Xo58hEmoZFLyOIs9Wk400ME9gEFV+ttxCGcls6NxbhI=
 github.com/grafana/opentelemetry-collector/service v0.0.0-20240321103955-8919a1c85cbe h1:LEmmaAnTjtp7pWCsnc8iMfuHIHzDbYIiCXnxpMTOLms=
 github.com/grafana/opentelemetry-collector/service v0.0.0-20240321103955-8919a1c85cbe/go.mod h1:9El7PPhnV+2xPXLlyileLaUa5mOE+vw6sswmcZBaUlc=
-github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520 h1:HnFWqxhoSF3WC7sKAdMZ+SRXvHLVZlZ3sbQjuUlTqkw=
-github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520/go.mod h1:+HPXgiOV0InDHcZ2jNijL1SOKvo0eEPege5fQA0+ICI=
+github.com/grafana/postgres_exporter v0.15.1-0.20240402092333-fad5f95ea113 h1:fDgs4u+TGjrv7TIGJObZwKSkOFbhLpnBhnebBU7gWiQ=
+github.com/grafana/postgres_exporter v0.15.1-0.20240402092333-fad5f95ea113/go.mod h1:4mAJeXjzbzXMWIffmquWgGR2W0PEV/OiW+AEPb5Ghik=
 github.com/grafana/prometheus v1.8.2-0.20240130142130-51b39f24d406 h1:LVIOYe5j92m10wluP5hgeHqSkOLnZzcPxhYCkdbLXCE=
 github.com/grafana/prometheus v1.8.2-0.20240130142130-51b39f24d406/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY=
@@ -1108,14 +1110,12 @@ github.com/hashicorp/consul v1.5.1 h1:p7tRmQ4m3ZMYkGQkuyjLXKbdU1weeumgZFqZOvw7o4
 github.com/hashicorp/consul v1.5.1/go.mod h1:QsmgXh2YA9Njv6y3/FHXqHYhsMye++3oBoAZ6SR8R8I=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
-github.com/hashicorp/consul/api v1.8.1/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk=
 github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
 github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ=
 github.com/hashicorp/consul/api v1.27.0 h1:gmJ6DPKQog1426xsdmgk5iqDyoRiNc+ipBdJOqKQFjc=
 github.com/hashicorp/consul/api v1.27.0/go.mod h1:JkekNRSou9lANFdt+4IKx3Za7XY0JzzpQjEb4Ivo1c8=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/consul/sdk v0.15.1 h1:kKIGxc7CZtflcF5DLfHeq7rOQmRq3vk7kwISN9bif8Q=
 github.com/hashicorp/consul/sdk v0.15.1/go.mod h1:7pxqqhqoaPqnBnzXD1StKed62LqJeClzVsUEy85Zr0A=
@@ -1217,7 +1217,6 @@ github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/memberlist v0.1.4/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/memberlist v0.1.5/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
@@ -1228,7 +1227,6 @@ github.com/hashicorp/raft v1.0.1-0.20190409200437-d9fe23f7d472/go.mod h1:DVSAWIt
 github.com/hashicorp/raft-boltdb v0.0.0-20150201200839-d1e82c1ec3f1/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
 github.com/hashicorp/serf v0.8.1/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
@@ -1297,7 +1295,6 @@ github.com/influxdata/go-syslog/v2 v2.0.1/go.mod h1:hjvie1UTaD5E1fTnDmxaCw8RRDrT
 github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM=
 github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4/go.mod h1:1yEQhaLb/cETXCqQmdh7lDjupNAReO7c83AHyK2dJ48=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4/go.mod h1:VeiWgI3qaGdJWust2fP27a6J+koITo/1c/UhxeOxgaM=
 github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b h1:i44CesU68ZBRvtCjBi3QSosCIKrjmMbYlQMFAwVLds4=
 github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y=
@@ -1442,7 +1439,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
 github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
@@ -1485,7 +1481,6 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
@@ -1514,6 +1509,10 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mariomac/guara v0.0.0-20230621100729-42bd7716e524 h1:24nnoPrOI7cw2YZTWqDHqIchSJ07thcQDIUNnL6V+2o=
+github.com/mariomac/guara v0.0.0-20230621100729-42bd7716e524/go.mod h1:TMuTALUh4SPCDJdYOuOYIEwBgH2rzCDP1nNgj+lI8AE=
+github.com/mariomac/pipes v0.9.0 h1:spCbBgHQpCbFoI8yNZDiwsUFuKaeUSbWe1oqt0mnY8U=
+github.com/mariomac/pipes v0.9.0/go.mod h1:c4UsamVvniQ7+YX+X2mxDTTfyXOEU35pMFKZ8JD4ShE=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -1578,7 +1577,6 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpsp
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
-github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1:aKW/4cBs+yK6gpqU3K/oIwk9Q/XICqd3zOX/UFuvqmk=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
@@ -1657,17 +1655,11 @@ github.com/natefinch/atomic v1.0.1 h1:ZPYKxkqQOx3KZ+RsbnP/YsgvxWQPGxjC0oBt2AhwV0
 github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjHV22AZRbM=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
-github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q=
-github.com/nats-io/jwt/v2 v2.0.2/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY=
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
 github.com/nats-io/nats-server/v2 v2.1.4/go.mod h1:Jw1Z28soD/QasIA2uWjXyM9El1jly3YwyFOuR8tH1rg=
-github.com/nats-io/nats-server/v2 v2.2.6/go.mod h1:sEnFaxqe09cDmfMgACxZbziXnhQFhwk+aKkZjBBRYrI=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
-github.com/nats-io/nats.go v1.11.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
-github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/ncabatoff/fakescraper v0.0.0-20201102132415-4b37ba603d65/go.mod h1:Tx6UMSMyIsjLG/VU/F6xA1+0XI+/f9o1dGJnf1l+bPg=
 github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 h1:t4WWQ9I797y7QUgeEjeXnVb+oYuEDQc6gLvrZJTYo94=
@@ -1851,7 +1843,6 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE=
 github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA=
 github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY=
 github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod h1:js2AbwmHW0YD9DwIw2JhQWmbfFi/UnWyYwdVhqbCDOE=
@@ -1972,7 +1963,6 @@ github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdD
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
 github.com/prometheus/consul_exporter v0.8.0 h1:2z3drFic65WFoHaJRKkmnJRRlBLmmxVqT8L9LO2yxAo=
 github.com/prometheus/consul_exporter v0.8.0/go.mod h1:KHTgkT1/oLpXKC4+mKZV63hZSMHuKskUnHoenEave4Y=
-github.com/prometheus/exporter-toolkit v0.6.0/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
 github.com/prometheus/exporter-toolkit v0.7.0/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
 github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
 github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
@@ -2066,6 +2056,8 @@ github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI=
 github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
@@ -2146,9 +2138,7 @@ github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMV
 github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
-github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -2204,10 +2194,12 @@ github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpY
 github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs=
 github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
-github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
-github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
+github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
 github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
+github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
+github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 h1:nrZ3ySNYwJbSpD6ce9duiP+QkD3JuLCcWkdaehUS/3Y=
 github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFyPdL66DjUD96XmzVL3ZntbzcflLnznH0fr99w5VqE=
@@ -2282,6 +2274,10 @@ github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtX
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xo/dburl v0.20.0 h1:v601OhM9J4Zh56R270ncM9HRgoxp39tf9+nt5ft9UD0=
 github.com/xo/dburl v0.20.0/go.mod h1:B7/G9FGungw6ighV8xJNwWYQPMfn3gsi2sn5SE8Bzco=
+github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ=
+github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
+github.com/yl2chen/cidranger v1.0.2 h1:lbOWZVCG1tCRX4u24kuM1Tb4nHqWkDxwLdoS+SevawU=
+github.com/yl2chen/cidranger v1.0.2/go.mod h1:9U1yz7WPYDwf0vpNWFaeRh0bjwz5RVgRy/9UEQfHl0g=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -2293,8 +2289,9 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
 github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
 github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
-github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
 github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
@@ -2304,16 +2301,12 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
 go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
 go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
-go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0=
 go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
-go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
-go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0=
 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao=
 go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
@@ -2476,6 +2469,8 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go4.org/netipx v0.0.0-20230125063823-8449b0a6169f h1:ketMxHg+vWm3yccyYiq+uK8D3fRmna2Fcj+awpQp84s=
 go4.org/netipx v0.0.0-20230125063823-8449b0a6169f/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -2495,13 +2490,11 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -2515,8 +2508,8 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
-golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91 h1:Lyizcy9jX02jYR0ceBkL6S+jRys8Uepf7wt1vrz6Ras=
 golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91/go.mod h1:kNa9WdvYnzFwC79zRpLRMJbdEFlhyM5RPFBBZp/wWH8=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2564,8 +2557,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2682,7 +2675,6 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2793,8 +2785,9 @@ golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -2804,8 +2797,9 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
-golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/internal/component/all/all.go b/internal/component/all/all.go
index f6911eb95b30..eff9706a8c9c 100644
--- a/internal/component/all/all.go
+++ b/internal/component/all/all.go
@@ -2,6 +2,7 @@
 package all
 
 import (
+	_ "github.com/grafana/agent/internal/component/beyla/ebpf"                               // Import beyla.ebpf
 	_ "github.com/grafana/agent/internal/component/discovery/aws"                            // Import discovery.aws.ec2 and discovery.aws.lightsail
 	_ "github.com/grafana/agent/internal/component/discovery/azure"                          // Import discovery.azure
 	_ "github.com/grafana/agent/internal/component/discovery/consul"                         // Import discovery.consul
diff --git a/internal/component/beyla/ebpf/args.go b/internal/component/beyla/ebpf/args.go
new file mode 100644
index 000000000000..1f904d51d0b6
--- /dev/null
+++ b/internal/component/beyla/ebpf/args.go
@@ -0,0 +1,48 @@
+package beyla
+
+import (
+	"github.com/grafana/agent/internal/component/discovery"
+	"github.com/grafana/agent/internal/component/otelcol"
+)
+
+// Arguments configures the Beyla component.
+type Arguments struct {
+	Port           string                     `river:"open_port,attr,optional"`
+	ExecutableName string                     `river:"executable_name,attr,optional"`
+	Routes         Routes                     `river:"routes,block,optional"`
+	Attributes     Attributes                 `river:"attributes,block,optional"`
+	Discovery      Discovery                  `river:"discovery,block,optional"`
+	Output         *otelcol.ConsumerArguments `river:"output,block,optional"`
+}
+
+type Exports struct {
+	Targets []discovery.Target `river:"targets,attr"`
+}
+
+type Routes struct {
+	Unmatch        string   `river:"unmatched,attr,optional"`
+	Patterns       []string `river:"patterns,attr,optional"`
+	IgnorePatterns []string `river:"ignored_patterns,attr,optional"`
+	IgnoredEvents  string   `river:"ignore_mode,attr,optional"`
+}
+
+type Attributes struct {
+	Kubernetes KubernetesDecorator `river:"kubernetes,block"`
+}
+
+type KubernetesDecorator struct {
+	Enable string `river:"enable,attr"`
+}
+
+type Services []Service
+
+type Service struct {
+	Name      string `river:"name,attr,optional"`
+	Namespace string `river:"namespace,attr,optional"`
+	OpenPorts string `river:"open_ports,attr,optional"`
+	Path      string `river:"exe_path,attr,optional"`
+}
+
+type Discovery struct {
+	Services Services `river:"services,block"`
+}
diff --git a/internal/component/beyla/ebpf/beyla_linux.go b/internal/component/beyla/ebpf/beyla_linux.go
new file mode 100644
index 000000000000..523317ad34be
--- /dev/null
+++ b/internal/component/beyla/ebpf/beyla_linux.go
@@ -0,0 +1,287 @@
+//go:build (linux && arm64) || (linux && amd64)
+
+package beyla
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"os"
+	"path"
+	"regexp"
+	"sync"
+	"time"
+
+	"github.com/grafana/agent/internal/component"
+	"github.com/grafana/agent/internal/component/discovery"
+	"github.com/grafana/agent/internal/component/otelcol"
+	"github.com/grafana/agent/internal/featuregate"
+	"github.com/grafana/agent/internal/flow/logging/level"
+	http_service "github.com/grafana/agent/internal/service/http"
+	"github.com/grafana/beyla/pkg/beyla"
+	"github.com/grafana/beyla/pkg/components"
+	"github.com/grafana/beyla/pkg/services"
+	"github.com/grafana/beyla/pkg/transform"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/prometheus/common/model"
+)
+
+func init() {
+	component.Register(component.Registration{
+		Name:      "beyla.ebpf",
+		Stability: featuregate.StabilityBeta,
+		Args:      Arguments{},
+		Exports:   Exports{},
+
+		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
+			return New(opts, args.(Arguments))
+		},
+	})
+}
+
+type Component struct {
+	opts      component.Options
+	mut       sync.Mutex
+	args      Arguments
+	reload    chan struct{}
+	reg       *prometheus.Registry
+	healthMut sync.RWMutex
+	health    component.Health
+}
+
+var _ component.HealthComponent = (*Component)(nil)
+
+func (args Routes) Convert() *transform.RoutesConfig {
+	return &transform.RoutesConfig{
+		Unmatch:        transform.UnmatchType(args.Unmatch),
+		Patterns:       args.Patterns,
+		IgnorePatterns: args.IgnorePatterns,
+		IgnoredEvents:  transform.IgnoreMode(args.IgnoredEvents),
+	}
+}
+
+func (args Attributes) Convert() beyla.Attributes {
+	return beyla.Attributes{
+		Kubernetes: transform.KubernetesDecorator{
+			Enable: transform.KubeEnableFlag(args.Kubernetes.Enable),
+		},
+	}
+}
+
+func (args Discovery) Convert() (services.DiscoveryConfig, error) {
+	srv, err := args.Services.Convert()
+	if err != nil {
+		return services.DiscoveryConfig{}, err
+	}
+	return services.DiscoveryConfig{
+		Services: srv,
+	}, nil
+}
+
+func (args Services) Convert() (services.DefinitionCriteria, error) {
+	var attrs services.DefinitionCriteria
+	for _, s := range args {
+		ports, err := stringToPortEnum(s.OpenPorts)
+		if err != nil {
+			return nil, err
+		}
+		paths, err := stringToRegexpAttr(s.Path)
+		if err != nil {
+			return nil, err
+		}
+		attrs = append(attrs, services.Attributes{
+			Name:      s.Name,
+			Namespace: s.Namespace,
+			OpenPorts: ports,
+			Path:      paths,
+		})
+	}
+	return attrs, nil
+}
+
+func New(opts component.Options, args Arguments) (*Component, error) {
+	reg := prometheus.NewRegistry()
+	c := &Component{
+		opts:   opts,
+		args:   args,
+		reload: make(chan struct{}, 1),
+		reg:    reg,
+	}
+
+	if err := c.Update(args); err != nil {
+		return nil, err
+	}
+	return c, nil
+}
+
+// Run implements component.Component.
+func (c *Component) Run(ctx context.Context) error {
+	var cancel context.CancelFunc
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		case <-c.reload:
+			// cancel any previously running Beyla instance
+			if cancel != nil {
+				cancel()
+			}
+			newCtx, cancelFunc := context.WithCancel(ctx)
+			cancel = cancelFunc
+
+			c.mut.Lock()
+			cfg, err := c.args.Convert()
+			if err != nil {
+				level.Error(c.opts.Logger).Log("msg", "failed to convert arguments", "err", err)
+				c.reportUnhealthy(err)
+				c.mut.Unlock()
+				continue
+			}
+			c.reportHealthy()
+			cfg.Prometheus.Registry = c.reg
+			c.mut.Unlock()
+			components.RunBeyla(newCtx, cfg)
+		}
+	}
+}
+
+// Update implements component.Component.
+func (c *Component) Update(args component.Arguments) error {
+	c.mut.Lock()
+	defer c.mut.Unlock()
+	baseTarget, err := c.baseTarget()
+	if err != nil {
+		return err
+	}
+	c.opts.OnStateChange(Exports{
+		Targets: []discovery.Target{baseTarget},
+	})
+	select {
+	case c.reload <- struct{}{}:
+	default:
+	}
+	return nil
+}
+
+// baseTarget returns the base target for the component which includes metrics of the instrumented services.
+func (c *Component) baseTarget() (discovery.Target, error) {
+	data, err := c.opts.GetServiceData(http_service.ServiceName)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get HTTP information: %w", err)
+	}
+	httpData := data.(http_service.Data)
+
+	return discovery.Target{
+		model.AddressLabel:     httpData.MemoryListenAddr,
+		model.SchemeLabel:      "http",
+		model.MetricsPathLabel: path.Join(httpData.HTTPPathForComponent(c.opts.ID), "metrics"),
+		"instance":             defaultInstance(),
+		"job":                  "beyla",
+	}, nil
+}
+
+func (c *Component) reportUnhealthy(err error) {
+	c.healthMut.Lock()
+	defer c.healthMut.Unlock()
+	c.health = component.Health{
+		Health:     component.HealthTypeUnhealthy,
+		Message:    err.Error(),
+		UpdateTime: time.Now(),
+	}
+}
+
+func (c *Component) reportHealthy() {
+	c.healthMut.Lock()
+	defer c.healthMut.Unlock()
+	c.health = component.Health{
+		Health:     component.HealthTypeHealthy,
+		UpdateTime: time.Now(),
+	}
+}
+
+func (c *Component) CurrentHealth() component.Health {
+	c.healthMut.RLock()
+	defer c.healthMut.RUnlock()
+	return c.health
+}
+
+func (c *Component) Handler() http.Handler {
+	return promhttp.HandlerFor(c.reg, promhttp.HandlerOpts{})
+}
+
+func (a *Arguments) Convert() (*beyla.Config, error) {
+	var err error
+	cfg := beyla.DefaultConfig
+	if a.Output != nil {
+		cfg.TracesReceiver = convertTraceConsumers(a.Output.Traces)
+	}
+	cfg.Port, err = stringToPortEnum(a.Port)
+	if err != nil {
+		return nil, err
+	}
+	cfg.Exec, err = stringToRegexpAttr(a.ExecutableName)
+	if err != nil {
+		return nil, err
+	}
+	cfg.Routes = a.Routes.Convert()
+	cfg.Attributes = a.Attributes.Convert()
+	cfg.Discovery, err = a.Discovery.Convert()
+	if err != nil {
+		return nil, err
+	}
+	return &cfg, nil
+}
+
+func (args *Arguments) Validate() error {
+	if args.Port == "" && args.ExecutableName == "" && len(args.Discovery.Services) == 0 {
+		return fmt.Errorf("you need to define at least open_port, executable_name, or services in the discovery section")
+	}
+	return nil
+}
+
+func stringToRegexpAttr(s string) (services.RegexpAttr, error) {
+	if s == "" {
+		return services.RegexpAttr{}, nil
+	}
+	re, err := regexp.Compile(s)
+	if err != nil {
+		return services.RegexpAttr{}, err
+	}
+	return services.NewPathRegexp(re), nil
+}
+
+func stringToPortEnum(s string) (services.PortEnum, error) {
+	if s == "" {
+		return services.PortEnum{}, nil
+	}
+	p := services.PortEnum{}
+	err := p.UnmarshalText([]byte(s))
+	if err != nil {
+		return services.PortEnum{}, err
+	}
+	return p, nil
+}
+
+func convertTraceConsumers(consumers []otelcol.Consumer) beyla.TracesReceiverConfig {
+	convertedConsumers := make([]beyla.Consumer, len(consumers))
+	for i, trace := range consumers {
+		convertedConsumers[i] = trace
+	}
+	return beyla.TracesReceiverConfig{
+		Traces: convertedConsumers,
+	}
+}
+
+func defaultInstance() string {
+	hostname := os.Getenv("HOSTNAME")
+	if hostname != "" {
+		return hostname
+	}
+
+	hostname, err := os.Hostname()
+	if err != nil {
+		return "unknown"
+	}
+	return hostname
+}
diff --git a/internal/component/beyla/ebpf/beyla_linux_test.go b/internal/component/beyla/ebpf/beyla_linux_test.go
new file mode 100644
index 000000000000..5de85615f58a
--- /dev/null
+++ b/internal/component/beyla/ebpf/beyla_linux_test.go
@@ -0,0 +1,200 @@
+//go:build (linux && arm64) || (linux && amd64)
+
+package beyla
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/grafana/beyla/pkg/beyla"
+	"github.com/grafana/beyla/pkg/services"
+	"github.com/grafana/beyla/pkg/transform"
+	"github.com/grafana/river"
+	"github.com/stretchr/testify/require"
+)
+
+func TestArguments_UnmarshalRiver(t *testing.T) {
+	in := `
+		open_port = "80,443,8000-8999"
+		executable_name = "test"
+		routes {
+			unmatched = "wildcard"
+			patterns = ["/api/v1/*"]
+			ignored_patterns = ["/api/v1/health"]
+			ignore_mode = "all"
+		}
+		attributes {
+			kubernetes {
+				enable = "true"
+			}
+		}
+		discovery {
+			services {
+				name = "test"
+				namespace = "default"
+				open_ports = "80,443"
+			}
+			services {
+				name = "test2"
+				namespace = "default"
+				open_ports = "80,443"
+			}
+		}
+		output { /* no-op */ }
+	`
+	var args Arguments
+	require.NoError(t, river.Unmarshal([]byte(in), &args))
+	cfg, err := args.Convert()
+	require.NoError(t, err)
+	require.Equal(t, services.PortEnum{Ranges: []services.PortRange{{Start: 80, End: 0}, {Start: 443, End: 0}, {Start: 8000, End: 8999}}}, cfg.Port)
+	require.True(t, cfg.Exec.IsSet())
+	require.Equal(t, transform.UnmatchType("wildcard"), cfg.Routes.Unmatch)
+	require.Equal(t, []string{"/api/v1/*"}, cfg.Routes.Patterns)
+	require.Equal(t, []string{"/api/v1/health"}, cfg.Routes.IgnorePatterns)
+	require.Equal(t, transform.IgnoreMode("all"), cfg.Routes.IgnoredEvents)
+	require.Equal(t, transform.KubeEnableFlag("true"), cfg.Attributes.Kubernetes.Enable)
+	require.Len(t, cfg.Discovery.Services, 2)
+	require.Equal(t, "test", cfg.Discovery.Services[0].Name)
+	require.Equal(t, "default", cfg.Discovery.Services[0].Namespace)
+}
+
+func TestArguments_UnmarshalInvalidRiver(t *testing.T) {
+	var tests = []struct {
+		testname      string
+		cfg           string
+		expectedError string
+	}{
+		{
+			"invalid regex",
+			`
+		executable_name = "["
+		`,
+			"error parsing regexp: missing closing ]: `[`",
+		},
+		{
+			"invalid port range",
+			`
+		open_port = "-8000"
+		`,
+			"invalid port range \"-8000\". Must be a comma-separated list of numeric ports or port ranges (e.g. 8000-8999)",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.testname, func(t *testing.T) {
+			var args Arguments
+			require.NoError(t, river.Unmarshal([]byte(tt.cfg), &args))
+			_, err := args.Convert()
+			require.EqualError(t, err, tt.expectedError)
+		})
+	}
+}
+
+func TestConvert_Routes(t *testing.T) {
+	args := Routes{
+		Unmatch:        "wildcard",
+		Patterns:       []string{"/api/v1/*"},
+		IgnorePatterns: []string{"/api/v1/health"},
+		IgnoredEvents:  "all",
+	}
+
+	expectedConfig := &transform.RoutesConfig{
+		Unmatch:        transform.UnmatchType(args.Unmatch),
+		Patterns:       args.Patterns,
+		IgnorePatterns: args.IgnorePatterns,
+		IgnoredEvents:  transform.IgnoreMode(args.IgnoredEvents),
+	}
+
+	config := args.Convert()
+
+	require.Equal(t, expectedConfig, config)
+}
+
+func TestConvert_Attribute(t *testing.T) {
+	args := Attributes{
+		Kubernetes: KubernetesDecorator{
+			Enable: "true",
+		},
+	}
+
+	expectedConfig := beyla.Attributes{
+		Kubernetes: transform.KubernetesDecorator{
+			Enable: transform.KubeEnableFlag(args.Kubernetes.Enable),
+		},
+	}
+
+	config := args.Convert()
+
+	require.Equal(t, expectedConfig, config)
+}
+
+func TestConvert_Discovery(t *testing.T) {
+	args := Discovery{
+		Services: []Service{
+			{
+				Name:      "test",
+				Namespace: "default",
+				OpenPorts: "80",
+				Path:      "/api/v1/*",
+			},
+		},
+	}
+	config, err := args.Convert()
+
+	require.NoError(t, err)
+	require.Len(t, config.Services, 1)
+	require.Equal(t, "test", config.Services[0].Name)
+	require.Equal(t, "default", config.Services[0].Namespace)
+	require.Equal(t, services.PortEnum{Ranges: []services.PortRange{{Start: 80, End: 0}}}, config.Services[0].OpenPorts)
+	require.True(t, config.Services[0].Path.IsSet())
+}
+
+func TestArguments_Validate(t *testing.T) {
+	tests := []struct {
+		name     string
+		args     Arguments
+		expected error
+	}{
+		{
+			name:     "empty arguments",
+			args:     Arguments{},
+			expected: errors.New("you need to define at least open_port, executable_name, or services in the discovery section"),
+		},
+		{
+			name: "with service discovery",
+			args: Arguments{
+				Discovery: Discovery{
+					Services: []Service{
+						{
+							Name:      "test",
+							Namespace: "default",
+							OpenPorts: "80",
+							Path:      "/api/v1/*",
+						},
+					},
+				},
+			},
+			expected: nil,
+		},
+		{
+			name: "with port",
+			args: Arguments{
+				Port: "80",
+			},
+			expected: nil,
+		},
+		{
+			name: "with executable name",
+			args: Arguments{
+				ExecutableName: "test",
+			},
+			expected: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.args.Validate()
+			require.Equal(t, tt.expected, err)
+		})
+	}
+}
diff --git a/internal/component/beyla/ebpf/beyla_placeholder.go b/internal/component/beyla/ebpf/beyla_placeholder.go
new file mode 100644
index 000000000000..0226ff372095
--- /dev/null
+++ b/internal/component/beyla/ebpf/beyla_placeholder.go
@@ -0,0 +1,43 @@
+//go:build !(linux && (arm64 || amd64))
+
+package beyla
+
+import (
+	"context"
+
+	"github.com/grafana/agent/internal/component"
+	"github.com/grafana/agent/internal/featuregate"
+	"github.com/grafana/agent/internal/flow/logging/level"
+)
+
+func init() {
+	component.Register(component.Registration{
+		Name:      "beyla.ebpf",
+		Stability: featuregate.StabilityBeta,
+		Args:      Arguments{},
+		Exports:   Exports{},
+
+		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
+			arguments := args.(Arguments)
+			return New(opts, arguments)
+		},
+	})
+}
+
+// Component is a noop placeholder to print a warning when the ebpf component is used but the OS is not linux.
+type Component struct {
+}
+
+func New(opts component.Options, args Arguments) (component.Component, error) {
+	level.Warn(opts.Logger).Log("msg", "the beyla.ebpf component only works on ARM64 and AMD64 Linux platforms; enabling it otherwise will do nothing")
+	return &Component{}, nil
+}
+
+func (i *Component) Run(ctx context.Context) error {
+	<-ctx.Done()
+	return ctx.Err()
+}
+
+func (c *Component) Update(args component.Arguments) error {
+	return nil
+}
diff --git a/internal/component/common/loki/positions/positions.go b/internal/component/common/loki/positions/positions.go
index 0201d39e4748..f985ff849ead 100644
--- a/internal/component/common/loki/positions/positions.go
+++ b/internal/component/common/loki/positions/positions.go
@@ -96,6 +96,65 @@ type Positions interface {
 	Stop()
 }
 
+// LegacyFile is the copied struct for the static mode positions file.
+type LegacyFile struct {
+	Positions map[string]string `yaml:"positions"`
+}
+
+// ConvertLegacyPositionsFile will convert the legacy positions file to the new format if:
+// 1. There is no file at the newpath
+// 2. There is a file at the legacy path and that it is valid yaml
+func ConvertLegacyPositionsFile(legacyPath, newPath string, l log.Logger) {
+	legacyPositions := readLegacyFile(legacyPath, l)
+	// LegacyPositions did not exist or was invalid so return.
+	if legacyPositions == nil {
+		return
+	}
+	fi, err := os.Stat(newPath)
+	// If the newpath exists, then don't convert.
+	if err == nil && fi.Size() > 0 {
+		level.Info(l).Log("msg", "new positions file already exists", "path", newPath)
+		return
+	}
+
+	newPositions := make(map[Entry]string)
+	for k, v := range legacyPositions.Positions {
+		newPositions[Entry{
+			Path: k,
+			// This is a map of labels but must be an empty map since that is what the new positions expects.
+			Labels: "{}",
+		}] = v
+	}
+	// After conversion remove the file.
+	err = writePositionFile(newPath, newPositions)
+	if err != nil {
+		level.Error(l).Log("msg", "error writing new positions file from legacy", "path", newPath, "error", err)
+	}
+}
+
+func readLegacyFile(legacyPath string, l log.Logger) *LegacyFile {
+	oldFile, err := os.Stat(legacyPath)
+	// If the old file doesn't exist or is empty then return early.
+	if err != nil || oldFile.Size() == 0 {
+		level.Info(l).Log("msg", "no legacy positions file found", "path", legacyPath)
+		return nil
+	}
+	// Try to read and parse the legacy file.
+	clean := filepath.Clean(legacyPath)
+	buf, err := os.ReadFile(clean)
+	if err != nil {
+		level.Error(l).Log("msg", "error reading legacy positions file", "path", clean, "error", err)
+		return nil
+	}
+	legacyPositions := &LegacyFile{}
+	err = yaml.UnmarshalStrict(buf, legacyPositions)
+	if err != nil {
+		level.Error(l).Log("msg", "error parsing legacy positions file", "path", clean, "error", err)
+		return nil
+	}
+	return legacyPositions
+}
+
 // New makes a new Positions.
 func New(logger log.Logger, cfg Config) (Positions, error) {
 	positionData, err := readPositionsFile(cfg, logger)
diff --git a/internal/component/common/loki/positions/positions_test.go b/internal/component/common/loki/positions/positions_test.go
index ab62cfcc5fd8..9048720f11e4 100644
--- a/internal/component/common/loki/positions/positions_test.go
+++ b/internal/component/common/loki/positions/positions_test.go
@@ -6,12 +6,14 @@ package positions
 
 import (
 	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/go-kit/log"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v2"
 
 	util_log "github.com/grafana/loki/pkg/util/log"
 )
@@ -37,6 +39,81 @@ func tempFilename(t *testing.T) string {
 	return name
 }
 
+func writeLegacy(t *testing.T, tmpDir string) string {
+	legacy := filepath.Join(tmpDir, "legacy")
+	legacyPositions := LegacyFile{
+		Positions: make(map[string]string),
+	}
+	// Filename and byte offset
+	legacyPositions.Positions["/tmp/random.log"] = "17623"
+	buf, err := yaml.Marshal(legacyPositions)
+	require.NoError(t, err)
+	err = os.WriteFile(legacy, buf, 0644)
+	require.NoError(t, err)
+	return legacy
+}
+
+func TestLegacyConversion(t *testing.T) {
+	tmpDir := t.TempDir()
+	legacy := writeLegacy(t, tmpDir)
+	positionsPath := filepath.Join(tmpDir, "positions")
+	ConvertLegacyPositionsFile(legacy, positionsPath, log.NewNopLogger())
+	ps, err := readPositionsFile(Config{
+		PositionsFile: positionsPath,
+	}, log.NewNopLogger())
+	require.NoError(t, err)
+	require.Len(t, ps, 1)
+	for k, v := range ps {
+		require.True(t, k.Path == "/tmp/random.log")
+		require.True(t, v == "17623")
+	}
+}
+
+func TestLegacyConversionWithNewFile(t *testing.T) {
+	tmpDir := t.TempDir()
+	legacy := writeLegacy(t, tmpDir)
+	// Write a new file.
+	positionsPath := filepath.Join(tmpDir, "positions")
+	err := writePositionFile(positionsPath, map[Entry]string{
+		{Path: "/tmp/newrandom.log", Labels: ""}: "100",
+	})
+	require.NoError(t, err)
+
+	// In this state nothing should be overwritten.
+	ConvertLegacyPositionsFile(legacy, positionsPath, log.NewNopLogger())
+	ps, err := readPositionsFile(Config{
+		PositionsFile: positionsPath,
+	}, log.NewNopLogger())
+	require.NoError(t, err)
+	require.Len(t, ps, 1)
+	for k, v := range ps {
+		require.True(t, k.Path == "/tmp/newrandom.log")
+		require.True(t, v == "100")
+	}
+}
+
+func TestLegacyConversionWithNoLegacyFile(t *testing.T) {
+	tmpDir := t.TempDir()
+	legacy := filepath.Join(tmpDir, "legacy")
+	positionsPath := filepath.Join(tmpDir, "positions")
+	// Write a new file.
+	err := writePositionFile(positionsPath, map[Entry]string{
+		{Path: "/tmp/newrandom.log", Labels: ""}: "100",
+	})
+	require.NoError(t, err)
+
+	ConvertLegacyPositionsFile(legacy, positionsPath, log.NewNopLogger())
+	ps, err := readPositionsFile(Config{
+		PositionsFile: positionsPath,
+	}, log.NewNopLogger())
+	require.NoError(t, err)
+	require.Len(t, ps, 1)
+	for k, v := range ps {
+		require.True(t, k.Path == "/tmp/newrandom.log")
+		require.True(t, v == "100")
+	}
+}
+
 func TestReadPositionsOK(t *testing.T) {
 	temp := tempFilename(t)
 	defer func() {
diff --git a/internal/component/faro/receiver/arguments.go b/internal/component/faro/receiver/arguments.go
index 0169f0e80e2c..1513fb624baf 100644
--- a/internal/component/faro/receiver/arguments.go
+++ b/internal/component/faro/receiver/arguments.go
@@ -36,7 +36,8 @@ type ServerArguments struct {
 	APIKey                rivertypes.Secret `river:"api_key,attr,optional"`
 	MaxAllowedPayloadSize units.Base2Bytes  `river:"max_allowed_payload_size,attr,optional"`
 
-	RateLimiting RateLimitingArguments `river:"rate_limiting,block,optional"`
+	RateLimiting    RateLimitingArguments `river:"rate_limiting,block,optional"`
+	IncludeMetadata bool                  `river:"include_metadata,attr,optional"`
 }
 
 func (s *ServerArguments) SetToDefault() {
diff --git a/internal/component/faro/receiver/handler.go b/internal/component/faro/receiver/handler.go
index e6207e511a2d..b3b8c7fe4c51 100644
--- a/internal/component/faro/receiver/handler.go
+++ b/internal/component/faro/receiver/handler.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/agent/internal/flow/logging/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rs/cors"
+	"go.opentelemetry.io/collector/client"
 	"golang.org/x/time/rate"
 )
 
@@ -80,6 +81,13 @@ func (h *handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	h.argsMut.RLock()
 	defer h.argsMut.RUnlock()
 
+	// Propagate request headers as metadata
+	if h.args.IncludeMetadata {
+		cl := client.FromContext(req.Context())
+		cl.Metadata = client.NewMetadata(req.Header.Clone())
+		req = req.WithContext(client.NewContext(req.Context(), cl))
+	}
+
 	if h.cors != nil {
 		h.cors.ServeHTTP(rw, req, h.handleRequest)
 	} else {
diff --git a/internal/component/faro/receiver/receiver_otelcol_test.go b/internal/component/faro/receiver/receiver_otelcol_test.go
new file mode 100644
index 000000000000..1747d6f325b2
--- /dev/null
+++ b/internal/component/faro/receiver/receiver_otelcol_test.go
@@ -0,0 +1,166 @@
+//go:build !race
+
+package receiver
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/grafana/agent/internal/component/otelcol"
+	"github.com/grafana/agent/internal/component/otelcol/auth"
+	"github.com/grafana/agent/internal/component/otelcol/auth/headers"
+	otlphttp "github.com/grafana/agent/internal/component/otelcol/exporter/otlphttp"
+	"github.com/grafana/agent/internal/flow/componenttest"
+	"github.com/grafana/agent/internal/util"
+	"github.com/phayes/freeport"
+	"github.com/stretchr/testify/require"
+)
+
+func TestWithOtelcolConsumer(t *testing.T) {
+	ctx := componenttest.TestContext(t)
+
+	faroReceiver, err := componenttest.NewControllerFromID(
+		util.TestLogger(t),
+		"faro.receiver",
+	)
+	require.NoError(t, err)
+	faroReceiverPort, err := freeport.GetFreePort()
+	require.NoError(t, err)
+
+	otelcolAuthHeader, err := componenttest.NewControllerFromID(
+		util.TestLogger(t),
+		"otelcol.auth.headers",
+	)
+	require.NoError(t, err)
+
+	otelcolExporter, err := componenttest.NewControllerFromID(
+		util.TestLogger(t),
+		"otelcol.exporter.otlphttp",
+	)
+	require.NoError(t, err)
+
+	doneChan := make(chan struct{})
+	finalOtelServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "TENANTID", r.Header.Get("X-Scope-OrgId"))
+		close(doneChan)
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer finalOtelServer.Close()
+
+	tenantId := "Tenant-Id"
+	go func() {
+		err := otelcolAuthHeader.Run(ctx, headers.Arguments{
+			Headers: []headers.Header{
+				{
+					Key:         "X-Scope-OrgId",
+					FromContext: &tenantId,
+					Action:      headers.ActionUpsert,
+				},
+			},
+		})
+		require.NoError(t, err)
+	}()
+
+	require.NoError(t, otelcolAuthHeader.WaitRunning(time.Second), "otelco.auth.headers never started")
+	require.NoError(t, otelcolAuthHeader.WaitExports(time.Second), "otelco.auth.headers never exported anything")
+	otelcolAuthHeaderExport, ok := otelcolAuthHeader.Exports().(auth.Exports)
+	require.True(t, ok)
+
+	go func() {
+		err := otelcolExporter.Run(ctx, otlphttp.Arguments{
+			Client: otlphttp.HTTPClientArguments(otelcol.HTTPClientArguments{
+				Endpoint: finalOtelServer.URL,
+				Auth:     &otelcolAuthHeaderExport.Handler,
+				TLS: otelcol.TLSClientArguments{
+					Insecure:           true,
+					InsecureSkipVerify: true,
+				},
+			}),
+			Encoding: otlphttp.EncodingJSON,
+		})
+		require.NoError(t, err)
+	}()
+
+	require.NoError(t, otelcolExporter.WaitRunning(time.Second), "otelco.exporter.otlphttp never started")
+	require.NoError(t, otelcolExporter.WaitExports(time.Second), "otelco.exporter.otlphttp never exported anything")
+	otelcolExporterExport, ok := otelcolExporter.Exports().(otelcol.ConsumerExports)
+	require.True(t, ok)
+
+	go func() {
+		err := faroReceiver.Run(ctx, Arguments{
+			LogLabels: map[string]string{
+				"foo": "bar",
+			},
+
+			Server: ServerArguments{
+				Host:            "127.0.0.1",
+				Port:            faroReceiverPort,
+				IncludeMetadata: true,
+			},
+
+			Output: OutputArguments{
+				Traces: []otelcol.Consumer{otelcolExporterExport.Input},
+			},
+		})
+		require.NoError(t, err)
+	}()
+
+	// Wait for the server to be running.
+	util.Eventually(t, func(t require.TestingT) {
+		resp, err := http.Get(fmt.Sprintf("http://localhost:%d/-/ready", faroReceiverPort))
+		require.NoError(t, err)
+		defer resp.Body.Close()
+
+		require.Equal(t, http.StatusOK, resp.StatusCode)
+	})
+
+	// Send a sample payload to the server.
+	req, err := http.NewRequest(
+		"POST",
+		fmt.Sprintf("http://localhost:%d/collect", faroReceiverPort),
+		strings.NewReader(`{
+			"traces": {
+				"resourceSpans": [{
+					"scope_spans": [{
+						"spans": [{
+							"name": "TestSpan"
+						}]
+					}]
+				}]
+			},
+			"logs": [{
+				"message": "hello, world",
+				"level": "info",
+				"context": {"env": "dev"},
+				"timestamp": "2021-01-01T00:00:00Z",
+				"trace": {
+					"trace_id": "0",
+					"span_id": "0"
+				}
+			}],
+			"exceptions": [],
+			"measurements": [],
+			"meta": {}
+		}`),
+	)
+	require.NoError(t, err)
+
+	req.Header.Add(tenantId, "TENANTID")
+	req.Header.Add("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	defer resp.Body.Close()
+
+	require.Equal(t, http.StatusAccepted, resp.StatusCode)
+	select {
+	case <-doneChan:
+	case <-time.After(10 * time.Second):
+		t.Fatal("timed out waiting for updates to finish")
+	}
+}
diff --git a/internal/component/faro/receiver/receiver_test.go b/internal/component/faro/receiver/receiver_test.go
index 4e6e78e04e9d..8e4de91705f7 100644
--- a/internal/component/faro/receiver/receiver_test.go
+++ b/internal/component/faro/receiver/receiver_test.go
@@ -40,8 +40,9 @@ func Test(t *testing.T) {
 			},
 
 			Server: ServerArguments{
-				Host: "127.0.0.1",
-				Port: freePort,
+				Host:            "127.0.0.1",
+				Port:            freePort,
+				IncludeMetadata: true,
 			},
 
 			Output: OutputArguments{
@@ -62,9 +63,9 @@ func Test(t *testing.T) {
 	})
 
 	// Send a sample payload to the server.
-	resp, err := http.Post(
+	req, err := http.NewRequest(
+		"POST",
 		fmt.Sprintf("http://localhost:%d/collect", freePort),
-		"application/json",
 		strings.NewReader(`{
 			"traces": {
 				"resourceSpans": []
@@ -85,6 +86,13 @@ func Test(t *testing.T) {
 		}`),
 	)
 	require.NoError(t, err)
+
+	req.Header.Add("Tenant-Id", "TENANTID")
+	req.Header.Add("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
 	defer resp.Body.Close()
 
 	require.Equal(t, http.StatusAccepted, resp.StatusCode)
@@ -124,7 +132,6 @@ func newFakeLogsReceiver(t *testing.T) *fakeLogsReceiver {
 		case <-ctx.Done():
 			return
 		case ent := <-lr.Chan():
-
 			lr.entriesMut.Lock()
 			lr.entries = append(lr.entries, loki.Entry{
 				Labels: ent.Labels,
diff --git a/internal/component/faro/receiver/sourcemaps.go b/internal/component/faro/receiver/sourcemaps.go
index 5dc1e7643f32..c2c099d5c7cb 100644
--- a/internal/component/faro/receiver/sourcemaps.go
+++ b/internal/component/faro/receiver/sourcemaps.go
@@ -172,10 +172,8 @@ func (store *sourceMapsStoreImpl) getSourceMapContent(sourceURL string, release
 		}
 	}
 
-	// Attempt to download the sourcemap.
-	//
-	// TODO(rfratto): check if downloading is enabled.
-	if strings.HasPrefix(sourceURL, "http") && urlMatchesOrigins(sourceURL, store.args.DownloadFromOrigins) {
+	// Attempt to download the sourcemap if enabled.
+	if strings.HasPrefix(sourceURL, "http") && urlMatchesOrigins(sourceURL, store.args.DownloadFromOrigins) && store.args.Download {
 		return store.downloadSourceMapContent(sourceURL)
 	}
 	return nil, "", nil
diff --git a/internal/component/faro/receiver/sourcemaps_test.go b/internal/component/faro/receiver/sourcemaps_test.go
index 6ad1f7fcdd33..b154820bfe67 100644
--- a/internal/component/faro/receiver/sourcemaps_test.go
+++ b/internal/component/faro/receiver/sourcemaps_test.go
@@ -349,6 +349,88 @@ func Test_sourceMapsStoreImpl_ReadFromFileSystemAndDownload(t *testing.T) {
 	require.Equal(t, expect, actual)
 }
 
+func Test_sourceMapsStoreImpl_ReadFromFileSystemAndNotDownloadIfDisabled(t *testing.T) {
+	var (
+		logger = util.TestLogger(t)
+
+		httpClient = &mockHTTPClient{
+			responses: []struct {
+				*http.Response
+				error
+			}{
+				{newResponseFromTestData(t, "foo.js"), nil},
+				{newResponseFromTestData(t, "foo.js.map"), nil},
+			},
+		}
+
+		fileService = &mockFileService{
+			files: map[string][]byte{
+				filepath.FromSlash("/var/build/latest/foo.js.map"): loadTestData(t, "foo.js.map"),
+			},
+		}
+
+		store = newSourceMapsStore(
+			logger,
+			SourceMapsArguments{
+				Download:            false,
+				DownloadFromOrigins: []string{"*"},
+				Locations: []LocationArguments{
+					{
+						MinifiedPathPrefix: "http://foo.com/",
+						Path:               filepath.FromSlash("/var/build/latest/"),
+					},
+				},
+			},
+			newSourceMapMetrics(prometheus.NewRegistry()),
+			httpClient,
+			fileService,
+		)
+	)
+
+	expect := &payload.Exception{
+		Stacktrace: &payload.Stacktrace{
+			Frames: []payload.Frame{
+				{
+					Colno:    37,
+					Filename: "/__parcel_source_root/demo/src/actions.ts",
+					Function: "?",
+					Lineno:   6,
+				},
+				{
+					Colno:    5,
+					Filename: "http://bar.com/foo.js",
+					Function: "callUndefined",
+					Lineno:   6,
+				},
+			},
+		},
+	}
+
+	actual := transformException(logger, store, &payload.Exception{
+		Stacktrace: &payload.Stacktrace{
+			Frames: []payload.Frame{
+				{
+					Colno:    6,
+					Filename: "http://foo.com/foo.js",
+					Function: "eval",
+					Lineno:   5,
+				},
+				{
+					Colno:    5,
+					Filename: "http://bar.com/foo.js",
+					Function: "callUndefined",
+					Lineno:   6,
+				},
+			},
+		},
+	}, "123")
+
+	require.Equal(t, []string{filepath.FromSlash("/var/build/latest/foo.js.map")}, fileService.stats)
+	require.Equal(t, []string{filepath.FromSlash("/var/build/latest/foo.js.map")}, fileService.reads)
+	require.Nil(t, httpClient.requests)
+	require.Equal(t, expect, actual)
+}
+
 func Test_sourceMapsStoreImpl_FilepathSanitized(t *testing.T) {
 	var (
 		logger = util.TestLogger(t)
diff --git a/internal/component/loki/rules/kubernetes/rules.go b/internal/component/loki/rules/kubernetes/rules.go
index fe0cf7b0e8a8..9fbccfdf7ba5 100644
--- a/internal/component/loki/rules/kubernetes/rules.go
+++ b/internal/component/loki/rules/kubernetes/rules.go
@@ -212,7 +212,8 @@ func (c *Component) Run(ctx context.Context) error {
 
 // startup launches the informers and starts the event loop.
 func (c *Component) startup(ctx context.Context) error {
-	c.queue = workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "loki.rules.kubernetes")
+	cfg := workqueue.RateLimitingQueueConfig{Name: "loki.rules.kubernetes"}
+	c.queue = workqueue.NewRateLimitingQueueWithConfig(workqueue.DefaultControllerRateLimiter(), cfg)
 	c.informerStopChan = make(chan struct{})
 
 	if err := c.startNamespaceInformer(); err != nil {
diff --git a/internal/component/loki/source/file/file.go b/internal/component/loki/source/file/file.go
index 63598afe86c1..311abcaa6c88 100644
--- a/internal/component/loki/source/file/file.go
+++ b/internal/component/loki/source/file/file.go
@@ -45,6 +45,7 @@ type Arguments struct {
 	DecompressionConfig DecompressionConfig `river:"decompression,block,optional"`
 	FileWatch           FileWatch           `river:"file_watch,block,optional"`
 	TailFromEnd         bool                `river:"tail_from_end,attr,optional"`
+	LegacyPositionsFile string              `river:"legacy_positions_file,attr,optional"`
 }
 
 type FileWatch struct {
@@ -70,9 +71,7 @@ type DecompressionConfig struct {
 	Format       CompressionFormat `river:"format,attr"`
 }
 
-var (
-	_ component.Component = (*Component)(nil)
-)
+var _ component.Component = (*Component)(nil)
 
 // Component implements the loki.source.file component.
 type Component struct {
@@ -95,9 +94,14 @@ func New(o component.Options, args Arguments) (*Component, error) {
 	if err != nil && !os.IsExist(err) {
 		return nil, err
 	}
+	newPositionsPath := filepath.Join(o.DataPath, "positions.yml")
+	// Check to see if we can convert the legacy positions file to the new format.
+	if args.LegacyPositionsFile != "" {
+		positions.ConvertLegacyPositionsFile(args.LegacyPositionsFile, newPositionsPath, o.Logger)
+	}
 	positionsFile, err := positions.New(o.Logger, positions.Config{
 		SyncPeriod:        10 * time.Second,
-		PositionsFile:     filepath.Join(o.DataPath, "positions.yml"),
+		PositionsFile:     newPositionsPath,
 		IgnoreInvalidYaml: false,
 		ReadOnly:          false,
 	})
@@ -197,7 +201,7 @@ func (c *Component) Update(args component.Arguments) error {
 	for _, target := range newArgs.Targets {
 		path := target[pathLabel]
 
-		var labels = make(model.LabelSet)
+		labels := make(model.LabelSet)
 		for k, v := range target {
 			if strings.HasPrefix(k, model.ReservedLabelPrefix) {
 				continue
diff --git a/internal/component/loki/source/file/legacy_file_test.go b/internal/component/loki/source/file/legacy_file_test.go
new file mode 100644
index 000000000000..c73d46f432d7
--- /dev/null
+++ b/internal/component/loki/source/file/legacy_file_test.go
@@ -0,0 +1,165 @@
+//go:build linux
+
+package file
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/grafana/agent/internal/component/common/loki/positions"
+	"github.com/grafana/loki/pkg/loghttp/push"
+	"gopkg.in/yaml.v2"
+
+	logkit "github.com/go-kit/log"
+	"github.com/grafana/agent/internal/component"
+	"github.com/grafana/agent/internal/component/common/loki"
+	"github.com/grafana/agent/internal/component/discovery"
+	"github.com/grafana/agent/internal/static/logs"
+	"github.com/grafana/agent/internal/util"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/atomic"
+)
+
+// TestFullEndToEndLegacyConversion tests using static mode to tail a log, then converting and then writing new entries and ensuring
+// the previously tailed data does not come through.
+func TestFullEndToEndLegacyConversion(t *testing.T) {
+	//
+	// Create a temporary file to tail
+	//
+	positionsDir := t.TempDir()
+	tmpFileDir := t.TempDir()
+
+	tmpFile, err := os.CreateTemp(tmpFileDir, "*.log")
+	require.NoError(t, err)
+
+	//
+	// Listen for push requests and pass them through to a channel
+	//
+	lis, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		require.NoError(t, lis.Close())
+	})
+	var written atomic.Bool
+	go func() {
+		_ = http.Serve(lis, http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+			_, err := push.ParseRequest(logkit.NewNopLogger(), "user_id", r, nil, nil, push.ParseLokiRequest)
+			require.NoError(t, err)
+			_, _ = rw.Write(nil)
+			written.Store(true)
+		}))
+	}()
+
+	//
+	// Launch Loki so it starts tailing the file and writes to our server.
+	//
+	cfgText := util.Untab(fmt.Sprintf(`
+positions_directory: %s
+configs:
+- name: default
+  clients:
+  - url: http://%s/loki/api/v1/push
+		batchwait: 50ms
+		batchsize: 1
+  scrape_configs:
+  - job_name: system
+    static_configs:
+    - targets: [localhost]
+      labels:
+        job: test
+        __path__: %s
+	`, positionsDir, lis.Addr().String(), tmpFile.Name()))
+
+	var cfg logs.Config
+	dec := yaml.NewDecoder(strings.NewReader(cfgText))
+	dec.SetStrict(true)
+	require.NoError(t, dec.Decode(&cfg))
+	require.NoError(t, cfg.ApplyDefaults())
+	logger := logkit.NewNopLogger()
+	l, err := logs.New(prometheus.NewRegistry(), &cfg, logger, false)
+	require.NoError(t, err)
+	//
+	// Write a log line and wait for it to come through.
+	//
+	fmt.Fprintf(tmpFile, "Hello, world!\n")
+	// Ensure we have written and received the data.
+	require.Eventually(t, func() bool {
+		return written.Load()
+	}, 10*time.Second, 100*time.Millisecond)
+
+	// Stop the tailer.
+	l.Stop()
+
+	// Read the legacy file so we can ensure it is the same as the the new file logically.
+	oldPositions, err := os.ReadFile(filepath.Join(positionsDir, "default.yml"))
+	require.NoError(t, err)
+
+	legacy := positions.LegacyFile{Positions: make(map[string]string)}
+	err = yaml.UnmarshalStrict(oldPositions, legacy)
+	require.NoError(t, err)
+
+	opts := component.Options{
+		Logger:        util.TestFlowLogger(t),
+		Registerer:    prometheus.NewRegistry(),
+		OnStateChange: func(e component.Exports) {},
+		DataPath:      t.TempDir(),
+	}
+
+	// Create the Logs receiver component which will convert the legacy positions file into the new format.
+	ch1 := loki.NewLogsReceiver()
+	args := Arguments{}
+	args.LegacyPositionsFile = filepath.Join(positionsDir, "default.yml")
+	args.ForwardTo = []loki.LogsReceiver{ch1}
+	args.Targets = []discovery.Target{
+		{
+			"__path__": tmpFile.Name(),
+		},
+	}
+
+	// New will do the actual conversion
+	c, err := New(opts, args)
+	require.NoError(t, err)
+	require.NotNil(t, c)
+
+	// Before we actually start the component check to see if the legacy file and new file are logically the same.
+	buf, err := os.ReadFile(filepath.Join(opts.DataPath, "positions.yml"))
+	require.NoError(t, err)
+	newPositions := positions.File{Positions: make(map[positions.Entry]string)}
+	err = yaml.UnmarshalStrict(buf, newPositions)
+	require.NoError(t, err)
+
+	require.Len(t, newPositions.Positions, 1)
+	require.Len(t, legacy.Positions, 1)
+
+	for k, v := range newPositions.Positions {
+		val, found := legacy.Positions[k.Path]
+		require.True(t, found)
+		require.True(t, val == v)
+	}
+
+	// Write some data, we should see this data but not old data.
+	fmt.Fprintf(tmpFile, "new thing!\n")
+	ctx := context.Background()
+	ctx, cncl := context.WithTimeout(ctx, 10*time.Second)
+	defer cncl()
+	go func() {
+		runErr := c.Run(ctx)
+		require.NoError(t, runErr)
+	}()
+
+	// Check for the new data ensuring that we do not see the old data.
+	require.Eventually(t, func() bool {
+		entry := <-ch1.Chan()
+		// We don't want to reread the hello world so if something went wrong then the conversion didnt work.
+		require.False(t, strings.Contains(entry.Line, "Hello, world!"))
+		return strings.Contains(entry.Line, "new thing!")
+	}, 5*time.Second, 100*time.Millisecond)
+}
diff --git a/internal/component/mimir/rules/kubernetes/rules.go b/internal/component/mimir/rules/kubernetes/rules.go
index afd28c72fda3..58e723290c52 100644
--- a/internal/component/mimir/rules/kubernetes/rules.go
+++ b/internal/component/mimir/rules/kubernetes/rules.go
@@ -212,7 +212,8 @@ func (c *Component) Run(ctx context.Context) error {
 
 // startup launches the informers and starts the event loop.
 func (c *Component) startup(ctx context.Context) error {
-	c.queue = workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "mimir.rules.kubernetes")
+	cfg := workqueue.RateLimitingQueueConfig{Name: "mimir.rules.kubernetes"}
+	c.queue = workqueue.NewRateLimitingQueueWithConfig(workqueue.DefaultControllerRateLimiter(), cfg)
 	c.informerStopChan = make(chan struct{})
 
 	if err := c.startNamespaceInformer(); err != nil {
diff --git a/internal/component/otelcol/internal/fanoutconsumer/metrics.go b/internal/component/otelcol/internal/fanoutconsumer/metrics.go
index 4ace8e35a4b0..bceaaaa78234 100644
--- a/internal/component/otelcol/internal/fanoutconsumer/metrics.go
+++ b/internal/component/otelcol/internal/fanoutconsumer/metrics.go
@@ -28,6 +28,9 @@ func Metrics(in []otelcol.Consumer) otelconsumer.Metrics {
 	// Iterate through all the consumers besides the last.
 	for i := 0; i < len(in)-1; i++ {
 		consumer := in[i]
+		if consumer == nil {
+			continue
+		}
 
 		if consumer.Capabilities().MutatesData {
 			clone = append(clone, consumer)
diff --git a/internal/component/otelcol/internal/fanoutconsumer/traces.go b/internal/component/otelcol/internal/fanoutconsumer/traces.go
index 51403b6a04f8..9f024c1b1720 100644
--- a/internal/component/otelcol/internal/fanoutconsumer/traces.go
+++ b/internal/component/otelcol/internal/fanoutconsumer/traces.go
@@ -28,6 +28,9 @@ func Traces(in []otelcol.Consumer) otelconsumer.Traces {
 	// Iterate through all the consumers besides the last.
 	for i := 0; i < len(in)-1; i++ {
 		consumer := in[i]
+		if consumer == nil {
+			continue
+		}
 
 		if consumer.Capabilities().MutatesData {
 			clone = append(clone, consumer)
diff --git a/internal/component/prometheus/exporter/postgres/postgres.go b/internal/component/prometheus/exporter/postgres/postgres.go
index d67eeafb61f1..5fddac862184 100644
--- a/internal/component/prometheus/exporter/postgres/postgres.go
+++ b/internal/component/prometheus/exporter/postgres/postgres.go
@@ -27,7 +27,7 @@ func init() {
 
 func createExporter(opts component.Options, args component.Arguments, defaultInstanceKey string) (integrations.Integration, string, error) {
 	a := args.(Arguments)
-	return integrations.NewIntegrationWithInstanceKey(opts.Logger, a.Convert(), defaultInstanceKey)
+	return integrations.NewIntegrationWithInstanceKey(opts.Logger, a.convert(opts.ID), defaultInstanceKey)
 }
 
 func parsePostgresURL(url string) (map[string]string, error) {
@@ -80,15 +80,26 @@ type Arguments struct {
 	DataSourceNames []rivertypes.Secret `river:"data_source_names,attr,optional"`
 
 	// Attributes
-	DisableSettingsMetrics  bool   `river:"disable_settings_metrics,attr,optional"`
-	DisableDefaultMetrics   bool   `river:"disable_default_metrics,attr,optional"`
-	CustomQueriesConfigPath string `river:"custom_queries_config_path,attr,optional"`
+	DisableSettingsMetrics  bool     `river:"disable_settings_metrics,attr,optional"`
+	DisableDefaultMetrics   bool     `river:"disable_default_metrics,attr,optional"`
+	CustomQueriesConfigPath string   `river:"custom_queries_config_path,attr,optional"`
+	EnabledCollectors       []string `river:"enabled_collectors,attr,optional"`
 
 	// Blocks
 	AutoDiscovery AutoDiscovery `river:"autodiscovery,block,optional"`
 }
 
-// Autodiscovery controls discovery of databases outside any specified in DataSourceNames.
+func (a *Arguments) Validate() error {
+	if a.DisableDefaultMetrics && a.CustomQueriesConfigPath == "" {
+		return fmt.Errorf("custom_queries_config_path must be set when disable_default_metrics is true")
+	}
+	if a.DisableDefaultMetrics && len(a.EnabledCollectors) != 0 {
+		return fmt.Errorf("enabled_collectors cannot be set when disable_default_metrics is true")
+	}
+	return nil
+}
+
+// AutoDiscovery controls discovery of databases outside any specified in DataSourceNames.
 type AutoDiscovery struct {
 	Enabled           bool     `river:"enabled,attr,optional"`
 	DatabaseAllowlist []string `river:"database_allowlist,attr,optional"`
@@ -100,7 +111,7 @@ func (a *Arguments) SetToDefault() {
 	*a = DefaultArguments
 }
 
-func (a *Arguments) Convert() *postgres_exporter.Config {
+func (a *Arguments) convert(instanceName string) *postgres_exporter.Config {
 	return &postgres_exporter.Config{
 		DataSourceNames:        a.convertDataSourceNames(),
 		DisableSettingsMetrics: a.DisableSettingsMetrics,
@@ -109,6 +120,8 @@ func (a *Arguments) Convert() *postgres_exporter.Config {
 		IncludeDatabases:       a.AutoDiscovery.DatabaseAllowlist,
 		DisableDefaultMetrics:  a.DisableDefaultMetrics,
 		QueryPath:              a.CustomQueriesConfigPath,
+		Instance:               instanceName,
+		EnabledCollectors:      a.EnabledCollectors,
 	}
 }
 
diff --git a/internal/component/prometheus/exporter/postgres/postgres_test.go b/internal/component/prometheus/exporter/postgres/postgres_test.go
index b4a84f6c4f9b..ad20bce7e44c 100644
--- a/internal/component/prometheus/exporter/postgres/postgres_test.go
+++ b/internal/component/prometheus/exporter/postgres/postgres_test.go
@@ -46,8 +46,9 @@ func TestRiverConfigConvert(t *testing.T) {
 	var exampleRiverConfig = `
 	data_source_names = ["postgresql://username:password@localhost:5432/database?sslmode=disable"]
 	disable_settings_metrics = true
-	disable_default_metrics = true
+	disable_default_metrics = false
 	custom_queries_config_path = "/tmp/queries.yaml"
+	enabled_collectors = ["collector1", "collector2"]
 	
 	autodiscovery {
 		enabled = false
@@ -59,7 +60,7 @@ func TestRiverConfigConvert(t *testing.T) {
 	err := river.Unmarshal([]byte(exampleRiverConfig), &args)
 	require.NoError(t, err)
 
-	c := args.Convert()
+	c := args.convert("test-instance")
 
 	expected := postgres_exporter.Config{
 		DataSourceNames:        []config_util.Secret{config_util.Secret("postgresql://username:password@localhost:5432/database?sslmode=disable")},
@@ -67,12 +68,54 @@ func TestRiverConfigConvert(t *testing.T) {
 		AutodiscoverDatabases:  false,
 		ExcludeDatabases:       []string{"exclude1", "exclude2"},
 		IncludeDatabases:       []string{"include1"},
-		DisableDefaultMetrics:  true,
+		DisableDefaultMetrics:  false,
 		QueryPath:              "/tmp/queries.yaml",
+		Instance:               "test-instance",
+		EnabledCollectors:      []string{"collector1", "collector2"},
 	}
 	require.Equal(t, expected, *c)
 }
 
+func TestRiverConfigValidate(t *testing.T) {
+	var tc = []struct {
+		name        string
+		args        Arguments
+		expectedErr string
+	}{
+		{
+			name: "no errors on default config",
+			args: Arguments{},
+		},
+		{
+			name: "missing custom queries file path",
+			args: Arguments{
+				DisableDefaultMetrics: true,
+			},
+			expectedErr: "custom_queries_config_path must be set when disable_default_metrics is true",
+		},
+		{
+			name: "disabled default metrics with enabled collectors",
+			args: Arguments{
+				DisableDefaultMetrics:   true,
+				CustomQueriesConfigPath: "/tmp/queries.yaml",
+				EnabledCollectors:       []string{"collector1"},
+			},
+			expectedErr: "enabled_collectors cannot be set when disable_default_metrics is true",
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.args.Validate()
+			if tt.expectedErr == "" {
+				require.NoError(t, err)
+			} else {
+				require.ErrorContains(t, err, tt.expectedErr)
+			}
+		})
+	}
+}
+
 func TestParsePostgresURL(t *testing.T) {
 	dsn := "postgresql://linus:42secret@localhost:5432/postgres?sslmode=disable"
 	expected := map[string]string{
diff --git a/internal/converter/converter.go b/internal/converter/converter.go
index 3b9cf459bbf8..ce2414e8c4ed 100644
--- a/internal/converter/converter.go
+++ b/internal/converter/converter.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/grafana/agent/internal/converter/diag"
+	"github.com/grafana/agent/internal/converter/internal/otelcolconvert"
 	"github.com/grafana/agent/internal/converter/internal/prometheusconvert"
 	"github.com/grafana/agent/internal/converter/internal/promtailconvert"
 	"github.com/grafana/agent/internal/converter/internal/staticconvert"
@@ -15,6 +16,8 @@ import (
 type Input string
 
 const (
+	// InputOtelCol indicates that the input file is an OpenTelemetry Collector YAML file.
+	InputOtelCol Input = "otelcol"
 	// InputPrometheus indicates that the input file is a prometheus YAML file.
 	InputPrometheus Input = "prometheus"
 	// InputPromtail indicates that the input file is a promtail YAML file.
@@ -24,6 +27,7 @@ const (
 )
 
 var SupportedFormats = []string{
+	string(InputOtelCol),
 	string(InputPrometheus),
 	string(InputPromtail),
 	string(InputStatic),
@@ -47,6 +51,8 @@ var SupportedFormats = []string{
 // error is returned alongside the resulting config.
 func Convert(in []byte, kind Input, extraArgs []string) ([]byte, diag.Diagnostics) {
 	switch kind {
+	case InputOtelCol:
+		return otelcolconvert.Convert(in, extraArgs)
 	case InputPrometheus:
 		return prometheusconvert.Convert(in, extraArgs)
 	case InputPromtail:
diff --git a/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go b/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go
index 7f46b5157b4b..b7532432dbd9 100644
--- a/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go
+++ b/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go
@@ -3,7 +3,6 @@ package otelcolconvert
 import (
 	"fmt"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/grafana/agent/internal/component/otelcol"
 	"github.com/grafana/agent/internal/component/otelcol/receiver/kafka"
 	"github.com/grafana/agent/internal/converter/diag"
@@ -78,8 +77,6 @@ func toKafkaReceiver(state *State, id component.InstanceID, cfg *kafkareceiver.C
 }
 
 func toKafkaAuthentication(cfg map[string]any) kafka.AuthenticationArguments {
-	spew.Dump(cfg)
-
 	return kafka.AuthenticationArguments{
 		Plaintext: toKafkaPlaintext(encodeMapstruct(cfg["plain_text"])),
 		SASL:      toKafkaSASL(encodeMapstruct(cfg["sasl"])),
diff --git a/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go b/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go
index 4475badd27e3..de09d99dde22 100644
--- a/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go
+++ b/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go
@@ -54,10 +54,14 @@ func (loadbalancingExporterConverter) ConvertAndAppend(state *State, id componen
 }
 
 func toLoadbalancingExporter(cfg *loadbalancingexporter.Config) *loadbalancing.Arguments {
+	routingKey := "traceID"
+	if cfg.RoutingKey != "" {
+		routingKey = cfg.RoutingKey
+	}
 	return &loadbalancing.Arguments{
 		Protocol:   toProtocol(cfg.Protocol),
 		Resolver:   toResolver(cfg.Resolver),
-		RoutingKey: cfg.RoutingKey,
+		RoutingKey: routingKey,
 
 		DebugMetrics: common.DefaultValue[loadbalancing.Arguments]().DebugMetrics,
 	}
diff --git a/internal/converter/internal/otelcolconvert/converter_servicegraphconnector.go b/internal/converter/internal/otelcolconvert/converter_servicegraphconnector.go
new file mode 100644
index 000000000000..1211e6184347
--- /dev/null
+++ b/internal/converter/internal/otelcolconvert/converter_servicegraphconnector.go
@@ -0,0 +1,67 @@
+package otelcolconvert
+
+import (
+	"fmt"
+
+	"github.com/grafana/agent/internal/component/otelcol"
+	"github.com/grafana/agent/internal/component/otelcol/connector/servicegraph"
+	"github.com/grafana/agent/internal/converter/diag"
+	"github.com/grafana/agent/internal/converter/internal/common"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector"
+	"go.opentelemetry.io/collector/component"
+)
+
+func init() {
+	converters = append(converters, servicegraphConnectorConverter{})
+}
+
+type servicegraphConnectorConverter struct{}
+
+func (servicegraphConnectorConverter) Factory() component.Factory {
+	return servicegraphconnector.NewFactory()
+}
+
+func (servicegraphConnectorConverter) InputComponentName() string {
+	return "otelcol.connector.servicegraph"
+}
+
+func (servicegraphConnectorConverter) ConvertAndAppend(state *State, id component.InstanceID, cfg component.Config) diag.Diagnostics {
+	var diags diag.Diagnostics
+
+	label := state.FlowComponentLabel()
+
+	args := toServicegraphConnector(state, id, cfg.(*servicegraphconnector.Config))
+	block := common.NewBlockWithOverride([]string{"otelcol", "connector", "servicegraph"}, label, args)
+
+	diags.Add(
+		diag.SeverityLevelInfo,
+		fmt.Sprintf("Converted %s into %s", StringifyInstanceID(id), StringifyBlock(block)),
+	)
+
+	state.Body().AppendBlock(block)
+	return diags
+}
+
+func toServicegraphConnector(state *State, id component.InstanceID, cfg *servicegraphconnector.Config) *servicegraph.Arguments {
+	if cfg == nil {
+		return nil
+	}
+	var (
+		nextMetrics = state.Next(id, component.DataTypeMetrics)
+	)
+
+	return &servicegraph.Arguments{
+		LatencyHistogramBuckets: cfg.LatencyHistogramBuckets,
+		Dimensions:              cfg.Dimensions,
+		Store: servicegraph.StoreConfig{
+			MaxItems: cfg.Store.MaxItems,
+			TTL:      cfg.Store.TTL,
+		},
+		CacheLoop:            cfg.CacheLoop,
+		StoreExpirationLoop:  cfg.StoreExpirationLoop,
+		MetricsFlushInterval: cfg.MetricsFlushInterval,
+		Output: &otelcol.ConsumerArguments{
+			Metrics: ToTokenizedConsumers(nextMetrics),
+		},
+	}
+}
diff --git a/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go b/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go
index 439a84f8572a..7eee487b00ab 100644
--- a/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go
+++ b/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go
@@ -3,7 +3,6 @@ package otelcolconvert
 import (
 	"fmt"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/grafana/agent/internal/component/otelcol"
 	"github.com/grafana/agent/internal/component/otelcol/processor/tail_sampling"
 	"github.com/grafana/agent/internal/converter/diag"
@@ -48,9 +47,6 @@ func toTailSamplingProcessor(state *State, id component.InstanceID, cfg *tailsam
 		nextTraces = state.Next(id, component.DataTypeTraces)
 	)
 
-	testEncode := encodeMapstruct(cfg.PolicyCfgs[0])
-	spew.Dump(testEncode)
-
 	return &tail_sampling.Arguments{
 		PolicyCfgs:              toPolicyCfgs(cfg.PolicyCfgs),
 		DecisionWait:            cfg.DecisionWait,
diff --git a/internal/converter/internal/otelcolconvert/otelcolconvert.go b/internal/converter/internal/otelcolconvert/otelcolconvert.go
index d24e072b94f1..d06fc78882c2 100644
--- a/internal/converter/internal/otelcolconvert/otelcolconvert.go
+++ b/internal/converter/internal/otelcolconvert/otelcolconvert.go
@@ -291,28 +291,39 @@ func validateNoDuplicateReceivers(groups []pipelineGroup, connectorIDs []compone
 
 func buildConverterTable(extraConverters []ComponentConverter) map[converterKey]ComponentConverter {
 	table := make(map[converterKey]ComponentConverter)
-	allConverters := append(converters, extraConverters...)
+
+	// Ordering is critical here because conflicting converters are resolved with
+	// the first one in the list winning.
+	allConverters := append(extraConverters, converters...)
 
 	for _, conv := range allConverters {
 		fact := conv.Factory()
-
+		var kinds []component.Kind
 		switch fact.(type) {
 		case receiver.Factory:
-			table[converterKey{Kind: component.KindReceiver, Type: fact.Type()}] = conv
+			kinds = append(kinds, component.KindReceiver)
 		case processor.Factory:
-			table[converterKey{Kind: component.KindProcessor, Type: fact.Type()}] = conv
+			kinds = append(kinds, component.KindProcessor)
 		case exporter.Factory:
-			table[converterKey{Kind: component.KindExporter, Type: fact.Type()}] = conv
+			kinds = append(kinds, component.KindExporter)
 		case connector.Factory:
-			table[converterKey{Kind: component.KindConnector, Type: fact.Type()}] = conv
+			kinds = append(kinds, component.KindConnector)
 			// We need this so the connector is available as a destination for state.Next
-			table[converterKey{Kind: component.KindExporter, Type: fact.Type()}] = conv
+			kinds = append(kinds, component.KindExporter)
 			// Technically, this isn't required to be here since the entry
 			// won't be required to look up a destination for state.Next, but
 			// adding to reinforce the idea of how connectors are used.
-			table[converterKey{Kind: component.KindReceiver, Type: fact.Type()}] = conv
+			kinds = append(kinds, component.KindReceiver)
 		case extension.Factory:
-			table[converterKey{Kind: component.KindExtension, Type: fact.Type()}] = conv
+			kinds = append(kinds, component.KindExtension)
+		}
+
+		for _, kind := range kinds {
+			// If a converter for this kind and type already exists, skip it.
+			if _, ok := table[converterKey{Kind: kind, Type: fact.Type()}]; ok {
+				continue
+			}
+			table[converterKey{Kind: kind, Type: fact.Type()}] = conv
 		}
 	}
 
diff --git a/internal/converter/internal/otelcolconvert/pipeline_group.go b/internal/converter/internal/otelcolconvert/pipeline_group.go
index 3c6f278aad38..b1b185fecbe3 100644
--- a/internal/converter/internal/otelcolconvert/pipeline_group.go
+++ b/internal/converter/internal/otelcolconvert/pipeline_group.go
@@ -175,6 +175,11 @@ func (group pipelineGroup) NextTraces(fromID component.InstanceID) []component.I
 func nextInPipeline(pipeline *pipelines.PipelineConfig, fromID component.InstanceID) []component.InstanceID {
 	switch fromID.Kind {
 	case component.KindReceiver, component.KindConnector:
+		// Validate this receiver is part of the pipeline.
+		if !findInComponentIds(fromID, pipeline.Receivers) {
+			return nil
+		}
+
 		// Receivers and connectors should either send to the first processor
 		// if one exists or to every exporter otherwise.
 		if len(pipeline.Processors) > 0 {
@@ -183,6 +188,11 @@ func nextInPipeline(pipeline *pipelines.PipelineConfig, fromID component.Instanc
 		return toComponentInstanceIDs(component.KindExporter, pipeline.Exporters)
 
 	case component.KindProcessor:
+		// Validate this processor is part of the pipeline.
+		if !findInComponentIds(fromID, pipeline.Processors) {
+			return nil
+		}
+
 		// Processors should send to the next processor if one exists or to every
 		// exporter otherwise.
 		processorIndex := slices.Index(pipeline.Processors, fromID.ID)
@@ -217,3 +227,12 @@ func toComponentInstanceIDs(kind component.Kind, ids []component.ID) []component
 
 	return res
 }
+
+func findInComponentIds(fromID component.InstanceID, componentIDs []component.ID) bool {
+	for _, id := range componentIDs {
+		if fromID.ID == id {
+			return true
+		}
+	}
+	return false
+}
diff --git a/internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.river b/internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.river
index 141cfb77953f..199156c6ac43 100644
--- a/internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.river
+++ b/internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.river
@@ -12,9 +12,9 @@ otelcol.receiver.otlp "default" {
 
 otelcol.processor.batch "default" {
 	output {
-		metrics = [otelcol.exporter.otlp.default.input]
+		metrics = []
 		logs    = [otelcol.exporter.otlp.default.input]
-		traces  = [otelcol.exporter.otlp.default.input]
+		traces  = []
 	}
 }
 
diff --git a/internal/converter/internal/otelcolconvert/testdata/servicegraph.river b/internal/converter/internal/otelcolconvert/testdata/servicegraph.river
new file mode 100644
index 000000000000..96aeccfaff97
--- /dev/null
+++ b/internal/converter/internal/otelcolconvert/testdata/servicegraph.river
@@ -0,0 +1,37 @@
+otelcol.receiver.otlp "default" {
+	grpc { }
+
+	http { }
+
+	output {
+		metrics = []
+		logs    = []
+		traces  = [otelcol.connector.servicegraph.default.input]
+	}
+}
+
+otelcol.exporter.otlp "default" {
+	sending_queue {
+		queue_size = 5000
+	}
+
+	client {
+		endpoint = "database:4317"
+	}
+}
+
+otelcol.connector.servicegraph "default" {
+	latency_histogram_buckets = ["100ms", "250ms", "1s", "5s", "10s"]
+	dimensions                = ["dimension-1", "dimension-2"]
+
+	store {
+		max_items = 10
+		ttl       = "1s"
+	}
+	cache_loop            = "2m0s"
+	store_expiration_loop = "5s"
+
+	output {
+		metrics = [otelcol.exporter.otlp.default.input]
+	}
+}
diff --git a/internal/converter/internal/otelcolconvert/testdata/servicegraph.yaml b/internal/converter/internal/otelcolconvert/testdata/servicegraph.yaml
new file mode 100644
index 000000000000..f033a9022d6f
--- /dev/null
+++ b/internal/converter/internal/otelcolconvert/testdata/servicegraph.yaml
@@ -0,0 +1,35 @@
+receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
+
+connectors:
+  servicegraph:
+    latency_histogram_buckets: [100ms, 250ms, 1s, 5s, 10s]
+    dimensions:
+      - dimension-1
+      - dimension-2
+    store:
+      ttl: 1s
+      max_items: 10
+    cache_loop: 2m
+    store_expiration_loop: 5s
+
+exporters:
+  otlp:
+    # Our defaults have drifted from upstream, so we explicitly set our
+    # defaults below (balancer_name and queue_size).
+    endpoint: database:4317
+    balancer_name: pick_first
+    sending_queue:
+      queue_size: 5000
+
+service:
+  pipelines:
+    traces:
+      receivers: [otlp]
+      exporters: [servicegraph]
+    metrics:
+      receivers: [servicegraph]
+      exporters: [otlp]
diff --git a/internal/converter/internal/otelcolconvert/testdata/spanmetrics.river b/internal/converter/internal/otelcolconvert/testdata/spanmetrics.river
index 655a859f8e92..7cb422b5b096 100644
--- a/internal/converter/internal/otelcolconvert/testdata/spanmetrics.river
+++ b/internal/converter/internal/otelcolconvert/testdata/spanmetrics.river
@@ -4,7 +4,7 @@ otelcol.receiver.otlp "default" {
 	http { }
 
 	output {
-		metrics = [otelcol.exporter.otlp.default.input]
+		metrics = []
 		logs    = [otelcol.exporter.otlp.default.input]
 		traces  = [otelcol.connector.spanmetrics.default.input]
 	}
diff --git a/internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.river b/internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.river
index ad20c4553708..f2806e3d12df 100644
--- a/internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.river
+++ b/internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.river
@@ -4,7 +4,7 @@ otelcol.receiver.otlp "default_traces" {
 	http { }
 
 	output {
-		metrics = [otelcol.exporter.otlp.default_metrics_backend.input]
+		metrics = []
 		logs    = []
 		traces  = [otelcol.exporter.otlp.default_traces_backend.input, otelcol.connector.spanmetrics.default.input]
 	}
diff --git a/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go b/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go
index 91d0a34a48f8..80aa9c3904f4 100644
--- a/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go
+++ b/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go
@@ -11,11 +11,13 @@ import (
 	filematch "github.com/grafana/agent/internal/component/local/file_match"
 	"github.com/grafana/agent/internal/component/loki/process"
 	"github.com/grafana/agent/internal/component/loki/process/stages"
+
 	lokirelabel "github.com/grafana/agent/internal/component/loki/relabel"
 	lokisourcefile "github.com/grafana/agent/internal/component/loki/source/file"
 	"github.com/grafana/agent/internal/converter/diag"
 	"github.com/grafana/agent/internal/converter/internal/common"
 	"github.com/grafana/agent/internal/converter/internal/prometheusconvert/component"
+	"github.com/grafana/loki/clients/pkg/promtail/positions"
 	"github.com/grafana/loki/clients/pkg/promtail/scrapeconfig"
 	"github.com/grafana/loki/clients/pkg/promtail/targets/file"
 	"github.com/grafana/river/scanner"
@@ -42,7 +44,6 @@ func NewScrapeConfigBuilder(
 	diags *diag.Diagnostics,
 	cfg *scrapeconfig.Config,
 	globalCtx *GlobalContext,
-
 ) *ScrapeConfigBuilder {
 
 	return &ScrapeConfigBuilder{
@@ -61,7 +62,7 @@ func (s *ScrapeConfigBuilder) Sanitize() {
 	}
 }
 
-func (s *ScrapeConfigBuilder) AppendLokiSourceFile(watchConfig *file.WatchConfig) {
+func (s *ScrapeConfigBuilder) AppendLokiSourceFile(watchConfig *file.WatchConfig, positionsCfg *positions.Config) {
 	// If there were no targets expressions collected, that means
 	// we didn't have any components that produced SD targets, so
 	// we can skip this component.
@@ -76,6 +77,7 @@ func (s *ScrapeConfigBuilder) AppendLokiSourceFile(watchConfig *file.WatchConfig
 		Encoding:            s.cfg.Encoding,
 		DecompressionConfig: convertDecompressionConfig(s.cfg.DecompressionCfg),
 		FileWatch:           convertFileWatchConfig(watchConfig),
+		LegacyPositionsFile: positionsCfg.PositionsFile,
 	}
 	overrideHook := func(val interface{}) interface{} {
 		if _, ok := val.([]discovery.Target); ok {
diff --git a/internal/converter/internal/promtailconvert/promtailconvert.go b/internal/converter/internal/promtailconvert/promtailconvert.go
index 8c3664881c1b..515579f11472 100644
--- a/internal/converter/internal/promtailconvert/promtailconvert.go
+++ b/internal/converter/internal/promtailconvert/promtailconvert.go
@@ -93,8 +93,8 @@ func Convert(in []byte, extraArgs []string) ([]byte, diag.Diagnostics) {
 func AppendAll(f *builder.File, cfg *promtailcfg.Config, labelPrefix string, diags diag.Diagnostics) diag.Diagnostics {
 	validateTopLevelConfig(cfg, &diags)
 
-	var writeReceivers = make([]loki.LogsReceiver, len(cfg.ClientConfigs))
-	var writeBlocks = make([]*builder.Block, len(cfg.ClientConfigs))
+	writeReceivers := make([]loki.LogsReceiver, len(cfg.ClientConfigs))
+	writeBlocks := make([]*builder.Block, len(cfg.ClientConfigs))
 	// Each client config needs to be a separate remote_write,
 	// because they may have different ExternalLabels fields.
 	for i, cc := range cfg.ClientConfigs {
@@ -108,7 +108,7 @@ func AppendAll(f *builder.File, cfg *promtailcfg.Config, labelPrefix string, dia
 	}
 
 	for _, sc := range cfg.ScrapeConfig {
-		appendScrapeConfig(f, &sc, &diags, gc, &cfg.Global.FileWatch)
+		appendScrapeConfig(f, &sc, &diags, gc, &cfg.Global.FileWatch, &cfg.PositionsConfig)
 	}
 
 	for _, write := range writeBlocks {
@@ -137,6 +137,7 @@ func appendScrapeConfig(
 	diags *diag.Diagnostics,
 	gctx *build.GlobalContext,
 	watchConfig *file.WatchConfig,
+	positionsCfg *positions.Config,
 ) {
 
 	b := build.NewScrapeConfigBuilder(f, diags, cfg, gctx)
@@ -151,7 +152,7 @@ func appendScrapeConfig(
 	// If any relabelling is required, it will be done via a discovery.relabel component.
 	// The files will be watched and the globs in file paths will be expanded using discovery.file component.
 	// The log entries are sent to loki.process if processing is needed, or directly to loki.write components.
-	b.AppendLokiSourceFile(watchConfig)
+	b.AppendLokiSourceFile(watchConfig, positionsCfg)
 
 	// Append all the components that produce logs directly.
 	// If any relabelling is required, it will be done via a loki.relabel component.
diff --git a/internal/converter/internal/promtailconvert/promtailconvert_test.go b/internal/converter/internal/promtailconvert/promtailconvert_test.go
index 63ea75afbe1c..0932e62eaeea 100644
--- a/internal/converter/internal/promtailconvert/promtailconvert_test.go
+++ b/internal/converter/internal/promtailconvert/promtailconvert_test.go
@@ -1,3 +1,5 @@
+//go:build linux
+
 package promtailconvert_test
 
 import (
diff --git a/internal/converter/internal/promtailconvert/promtailconvert_windows_test.go b/internal/converter/internal/promtailconvert/promtailconvert_windows_test.go
new file mode 100644
index 000000000000..4e6f3ead80e6
--- /dev/null
+++ b/internal/converter/internal/promtailconvert/promtailconvert_windows_test.go
@@ -0,0 +1,16 @@
+//go:build windows
+
+package promtailconvert_test
+
+import (
+	"testing"
+
+	"github.com/grafana/agent/internal/converter/internal/promtailconvert"
+	"github.com/grafana/agent/internal/converter/internal/test_common"
+	_ "github.com/grafana/agent/internal/static/metrics/instance" // Imported to override default values via the init function.
+)
+
+func TestConvert(t *testing.T) {
+	test_common.TestDirectory(t, "testdata", ".yaml", true, []string{}, promtailconvert.Convert)
+	test_common.TestDirectory(t, "testdata_windows", ".yaml", true, []string{}, promtailconvert.Convert)
+}
diff --git a/internal/converter/internal/promtailconvert/testdata/azure.river b/internal/converter/internal/promtailconvert/testdata/azure.river
index 90a652e05dab..3a26563523a9 100644
--- a/internal/converter/internal/promtailconvert/testdata/azure.river
+++ b/internal/converter/internal/promtailconvert/testdata/azure.river
@@ -17,6 +17,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/consul.river b/internal/converter/internal/promtailconvert/testdata/consul.river
index 72563a502d95..4e3e4a42f459 100644
--- a/internal/converter/internal/promtailconvert/testdata/consul.river
+++ b/internal/converter/internal/promtailconvert/testdata/consul.river
@@ -33,6 +33,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/consulagent.river b/internal/converter/internal/promtailconvert/testdata/consulagent.river
index cbadc748d70c..518b9422d2cb 100644
--- a/internal/converter/internal/promtailconvert/testdata/consulagent.river
+++ b/internal/converter/internal/promtailconvert/testdata/consulagent.river
@@ -32,6 +32,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/digitalocean.river b/internal/converter/internal/promtailconvert/testdata/digitalocean.river
index fb71e471c56f..4e567a19ff99 100644
--- a/internal/converter/internal/promtailconvert/testdata/digitalocean.river
+++ b/internal/converter/internal/promtailconvert/testdata/digitalocean.river
@@ -8,6 +8,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/dockerswarm.river b/internal/converter/internal/promtailconvert/testdata/dockerswarm.river
index f436e8fc9010..17ea37ef93d8 100644
--- a/internal/converter/internal/promtailconvert/testdata/dockerswarm.river
+++ b/internal/converter/internal/promtailconvert/testdata/dockerswarm.river
@@ -33,6 +33,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/ec2.river b/internal/converter/internal/promtailconvert/testdata/ec2.river
index 94d70e08c802..b1b264fef899 100644
--- a/internal/converter/internal/promtailconvert/testdata/ec2.river
+++ b/internal/converter/internal/promtailconvert/testdata/ec2.river
@@ -10,6 +10,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/file.river b/internal/converter/internal/promtailconvert/testdata/file.river
index 03b1c400c4ce..10297de361d0 100644
--- a/internal/converter/internal/promtailconvert/testdata/file.river
+++ b/internal/converter/internal/promtailconvert/testdata/file.river
@@ -15,6 +15,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/gce.river b/internal/converter/internal/promtailconvert/testdata/gce.river
index e11993c8bfdb..d9abfe8b4492 100644
--- a/internal/converter/internal/promtailconvert/testdata/gce.river
+++ b/internal/converter/internal/promtailconvert/testdata/gce.river
@@ -9,6 +9,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/globalpositions.river b/internal/converter/internal/promtailconvert/testdata/globalpositions.river
new file mode 100644
index 000000000000..d26820f5c8e1
--- /dev/null
+++ b/internal/converter/internal/promtailconvert/testdata/globalpositions.river
@@ -0,0 +1,43 @@
+discovery.file "fun" {
+	files = ["/etc/prometheus/targets/*.json"]
+}
+
+discovery.file "fun_2" {
+	files            = ["/etc/agent/targets/*.json"]
+	refresh_interval = "30m0s"
+}
+
+local.file_match "fun" {
+	path_targets = concat(
+		discovery.file.fun.targets,
+		discovery.file.fun_2.targets,
+	)
+}
+
+loki.source.file "fun" {
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/good/positions.yml"
+}
+
+discovery.file "fun2" {
+	files = ["/etc/prometheus/targets2/*.json"]
+}
+
+discovery.file "fun2_2" {
+	files            = ["/etc/agent/targets2/*.json"]
+	refresh_interval = "30m0s"
+}
+
+local.file_match "fun2" {
+	path_targets = concat(
+		discovery.file.fun2.targets,
+		discovery.file.fun2_2.targets,
+	)
+}
+
+loki.source.file "fun2" {
+	targets               = local.file_match.fun2.targets
+	forward_to            = []
+	legacy_positions_file = "/good/positions.yml"
+}
diff --git a/internal/converter/internal/promtailconvert/testdata/globalpositions.yaml b/internal/converter/internal/promtailconvert/testdata/globalpositions.yaml
new file mode 100644
index 000000000000..29298f6cb69e
--- /dev/null
+++ b/internal/converter/internal/promtailconvert/testdata/globalpositions.yaml
@@ -0,0 +1,21 @@
+positions:
+  filename: /good/positions.yml
+scrape_configs:
+  - job_name: fun
+    file_sd_configs:
+      - files:
+          - /etc/prometheus/targets/*.json
+        refresh_interval: 5m
+      - files:
+          - /etc/agent/targets/*.json
+        refresh_interval: 30m
+  - job_name: fun2
+    file_sd_configs:
+      - files:
+          - /etc/prometheus/targets2/*.json
+        refresh_interval: 5m
+      - files:
+          - /etc/agent/targets2/*.json
+        refresh_interval: 30m
+tracing: {enabled: false}
+server: {register_instrumentation: false}
\ No newline at end of file
diff --git a/internal/converter/internal/promtailconvert/testdata/kubernetes.river b/internal/converter/internal/promtailconvert/testdata/kubernetes.river
index a343f038ab2e..eb54f0a9af42 100644
--- a/internal/converter/internal/promtailconvert/testdata/kubernetes.river
+++ b/internal/converter/internal/promtailconvert/testdata/kubernetes.river
@@ -72,6 +72,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/marathon.river b/internal/converter/internal/promtailconvert/testdata/marathon.river
index 03abe507541b..9c97f18cc03e 100644
--- a/internal/converter/internal/promtailconvert/testdata/marathon.river
+++ b/internal/converter/internal/promtailconvert/testdata/marathon.river
@@ -21,6 +21,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/mixed_pipeline.river b/internal/converter/internal/promtailconvert/testdata/mixed_pipeline.river
index 24fe5221cfc5..6dd55cf2a576 100644
--- a/internal/converter/internal/promtailconvert/testdata/mixed_pipeline.river
+++ b/internal/converter/internal/promtailconvert/testdata/mixed_pipeline.river
@@ -37,8 +37,9 @@ loki.process "uber_pipeline" {
 }
 
 loki.source.file "uber_pipeline" {
-	targets    = local.file_match.uber_pipeline.targets
-	forward_to = [loki.process.uber_pipeline.receiver]
+	targets               = local.file_match.uber_pipeline.targets
+	forward_to            = [loki.process.uber_pipeline.receiver]
+	legacy_positions_file = "/tmp/positions.yaml"
 }
 
 loki.source.api "uber_pipeline" {
diff --git a/internal/converter/internal/promtailconvert/testdata/nerve.river b/internal/converter/internal/promtailconvert/testdata/nerve.river
index 4f224f34cd5e..9d5faac92696 100644
--- a/internal/converter/internal/promtailconvert/testdata/nerve.river
+++ b/internal/converter/internal/promtailconvert/testdata/nerve.river
@@ -9,6 +9,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/openstack.river b/internal/converter/internal/promtailconvert/testdata/openstack.river
index 703518396e68..0d6253e11441 100644
--- a/internal/converter/internal/promtailconvert/testdata/openstack.river
+++ b/internal/converter/internal/promtailconvert/testdata/openstack.river
@@ -42,6 +42,7 @@ local.file_match "prometheus1" {
 }
 
 loki.source.file "prometheus1" {
-	targets    = local.file_match.prometheus1.targets
-	forward_to = []
+	targets               = local.file_match.prometheus1.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.river
index a8890b1a3908..773ae329028b 100644
--- a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.river
+++ b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.river
@@ -14,8 +14,9 @@ loki.process "example" {
 }
 
 loki.source.file "example" {
-	targets    = local.file_match.example.targets
-	forward_to = [loki.process.example.receiver]
+	targets               = local.file_match.example.targets
+	forward_to            = [loki.process.example.receiver]
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.river
index 5dcb9effcd4c..a3167a73441c 100644
--- a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.river
+++ b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.river
@@ -52,8 +52,9 @@ loki.process "example" {
 }
 
 loki.source.file "example" {
-	targets    = local.file_match.example.targets
-	forward_to = [loki.process.example.receiver]
+	targets               = local.file_match.example.targets
+	forward_to            = [loki.process.example.receiver]
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.river
index 6012d37e354b..33dcf837a4b4 100644
--- a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.river
+++ b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.river
@@ -30,8 +30,9 @@ loki.process "example" {
 }
 
 loki.source.file "example" {
-	targets    = local.file_match.example.targets
-	forward_to = [loki.process.example.receiver]
+	targets               = local.file_match.example.targets
+	forward_to            = [loki.process.example.receiver]
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.river
index fc02a5ee9d91..657c4fd7567a 100644
--- a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.river
+++ b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.river
@@ -90,8 +90,9 @@ loki.process "example" {
 }
 
 loki.source.file "example" {
-	targets    = local.file_match.example.targets
-	forward_to = [loki.process.example.receiver]
+	targets               = local.file_match.example.targets
+	forward_to            = [loki.process.example.receiver]
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.river
index afe10179c0f0..9e26d3d45c5f 100644
--- a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.river
+++ b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.river
@@ -99,8 +99,9 @@ loki.process "example" {
 }
 
 loki.source.file "example" {
-	targets    = local.file_match.example.targets
-	forward_to = [loki.process.example.receiver]
+	targets               = local.file_match.example.targets
+	forward_to            = [loki.process.example.receiver]
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.river
index 32fb65c1cab9..585d280ebbbf 100644
--- a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.river
+++ b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.river
@@ -24,8 +24,9 @@ loki.process "example" {
 }
 
 loki.source.file "example" {
-	targets    = local.file_match.example.targets
-	forward_to = [loki.process.example.receiver]
+	targets               = local.file_match.example.targets
+	forward_to            = [loki.process.example.receiver]
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.river b/internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.river
index 2b5e283f075d..33f11795b424 100644
--- a/internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.river
+++ b/internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.river
@@ -38,8 +38,9 @@ loki.process "funny_one" {
 }
 
 loki.source.file "funny_one" {
-	targets    = local.file_match.funny_one.targets
-	forward_to = [loki.process.funny_one.receiver]
+	targets               = local.file_match.funny_one.targets
+	forward_to            = [loki.process.funny_one.receiver]
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/serverset.river b/internal/converter/internal/promtailconvert/testdata/serverset.river
index 500c733c81a1..1e250bb2e9eb 100644
--- a/internal/converter/internal/promtailconvert/testdata/serverset.river
+++ b/internal/converter/internal/promtailconvert/testdata/serverset.river
@@ -8,6 +8,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/static_pipeline_example.river b/internal/converter/internal/promtailconvert/testdata/static_pipeline_example.river
index 3b7e4b20b436..e5a7e5f28a50 100644
--- a/internal/converter/internal/promtailconvert/testdata/static_pipeline_example.river
+++ b/internal/converter/internal/promtailconvert/testdata/static_pipeline_example.river
@@ -79,6 +79,7 @@ loki.source.file "example" {
 		initial_delay = "30s"
 		format        = "z"
 	}
+	legacy_positions_file = "/var/log/positions.yaml"
 }
 
 loki.write "default" {
diff --git a/internal/converter/internal/promtailconvert/testdata/triton.river b/internal/converter/internal/promtailconvert/testdata/triton.river
index d320c84f06b0..2b4386357dc8 100644
--- a/internal/converter/internal/promtailconvert/testdata/triton.river
+++ b/internal/converter/internal/promtailconvert/testdata/triton.river
@@ -9,6 +9,7 @@ local.file_match "fun" {
 }
 
 loki.source.file "fun" {
-	targets    = local.file_match.fun.targets
-	forward_to = []
+	targets               = local.file_match.fun.targets
+	forward_to            = []
+	legacy_positions_file = "/var/log/positions.yaml"
 }
diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents.river b/internal/converter/internal/promtailconvert/testdata_windows/windowsevents.river
similarity index 100%
rename from internal/converter/internal/promtailconvert/testdata/windowsevents.river
rename to internal/converter/internal/promtailconvert/testdata_windows/windowsevents.river
diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents.yaml b/internal/converter/internal/promtailconvert/testdata_windows/windowsevents.yaml
similarity index 100%
rename from internal/converter/internal/promtailconvert/testdata/windowsevents.yaml
rename to internal/converter/internal/promtailconvert/testdata_windows/windowsevents.yaml
diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.river b/internal/converter/internal/promtailconvert/testdata_windows/windowsevents_relabel.river
similarity index 100%
rename from internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.river
rename to internal/converter/internal/promtailconvert/testdata_windows/windowsevents_relabel.river
diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.yaml b/internal/converter/internal/promtailconvert/testdata_windows/windowsevents_relabel.yaml
similarity index 100%
rename from internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.yaml
rename to internal/converter/internal/promtailconvert/testdata_windows/windowsevents_relabel.yaml
diff --git a/internal/converter/internal/promtailconvert/validate.go b/internal/converter/internal/promtailconvert/validate.go
index 182203e2876b..04e82f0f665f 100644
--- a/internal/converter/internal/promtailconvert/validate.go
+++ b/internal/converter/internal/promtailconvert/validate.go
@@ -8,15 +8,6 @@ import (
 // validateTopLevelConfig validates the top-level config for any unsupported features. There may still be some
 // other unsupported features in scope of each config block, which are raised by their respective conversion code.
 func validateTopLevelConfig(cfg *promtailcfg.Config, diags *diag.Diagnostics) {
-	// The positions global config is not supported in Flow Mode.
-	if cfg.PositionsConfig != DefaultPositionsConfig() {
-		diags.Add(
-			diag.SeverityLevelInfo,
-			"global positions configuration is not supported - each Flow Mode's loki.source.file component "+
-				"has its own positions file in the component's data directory",
-		)
-	}
-
 	// WAL support is still work in progress and not documented. Enabling it won't work, so it's an error.
 	if cfg.WAL.Enabled {
 		diags.Add(
diff --git a/internal/converter/internal/staticconvert/internal/build/builder_traces.go b/internal/converter/internal/staticconvert/internal/build/builder_traces.go
index 6762d8e580f2..d13a06e27ae0 100644
--- a/internal/converter/internal/staticconvert/internal/build/builder_traces.go
+++ b/internal/converter/internal/staticconvert/internal/build/builder_traces.go
@@ -7,9 +7,11 @@ import (
 	"github.com/grafana/agent/internal/converter/diag"
 	"github.com/grafana/agent/internal/converter/internal/otelcolconvert"
 	"github.com/grafana/agent/internal/static/traces"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
 	otel_component "go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/exporter/loggingexporter"
 	"go.opentelemetry.io/collector/otelcol"
+	"go.opentelemetry.io/collector/service/pipelines"
 )
 
 // List of component converters. This slice is appended to by init functions in
@@ -37,7 +39,17 @@ func (b *ConfigBuilder) appendTraces() {
 		// Remove the push receiver which is an implementation detail for static mode and unnecessary for the otel config.
 		removeReceiver(otelCfg, "traces", "push_receiver")
 
+		// Remove the service_graphs processor which is an implementation detail for static mode and unnecessary for the otel config.
+		if _, ok := otelCfg.Processors[otel_component.NewID("service_graphs")]; ok {
+			removeProcessor(otelCfg, "traces", "service_graphs")
+			b.diags.Add(diag.SeverityLevelError, "The service_graphs processor for traces has no direct flow equivalent. "+
+				"This configuration appends metrics to the /metrics endpoint of the agent which is not possible in flow. "+
+				"Alternatively, you can use the otelcol.connector.servicegraph component to build a pipeline which generates "+
+				"and forwards service graph metrics.")
+		}
+
 		b.translateAutomaticLogging(otelCfg, cfg)
+		b.translateSpanMetrics(otelCfg, cfg)
 
 		b.diags.AddAll(otelcolconvert.AppendConfig(b.f, otelCfg, labelPrefix, converters))
 	}
@@ -68,6 +80,74 @@ func (b *ConfigBuilder) translateAutomaticLogging(otelCfg *otelcol.Config, cfg t
 	removeProcessor(otelCfg, "traces", "automatic_logging")
 }
 
+func (b *ConfigBuilder) translateSpanMetrics(otelCfg *otelcol.Config, cfg traces.InstanceConfig) {
+	if _, ok := otelCfg.Processors[otel_component.NewID("spanmetrics")]; !ok {
+		return
+	}
+
+	// Remove the custom otel components and delete the custom metrics pipeline
+	removeProcessor(otelCfg, "traces", "spanmetrics")
+	removeReceiver(otelCfg, "metrics", "noop")
+	removeExporter(otelCfg, "metrics", "prometheus")
+	removePipeline(otelCfg, "metrics", "spanmetrics")
+
+	// If the spanmetrics configuration includes a handler_endpoint, we cannot convert it.
+	// This is intentionally after the section above which removes the custom spanmetrics processor
+	// so that the rest of the configuration can optionally be converted with the error.
+	if cfg.SpanMetrics.HandlerEndpoint != "" {
+		b.diags.Add(diag.SeverityLevelError, "Cannot convert using configuration including spanmetrics handler_endpoint. "+
+			"No equivalent exists for exposing a known /metrics endpoint. You can use metrics_instance instead to enabled conversion.")
+		return
+	}
+
+	// Add the spanmetrics connector to the otel config with the converted configuration
+	if otelCfg.Connectors == nil {
+		otelCfg.Connectors = map[otel_component.ID]otel_component.Config{}
+	}
+	otelCfg.Connectors[otel_component.NewID("spanmetrics")] = toSpanmetricsConnector(cfg.SpanMetrics)
+
+	// Add the spanmetrics connector to each traces pipelines as an exporter and create metrics pipelines.
+	// The processing ordering for the span metrics connector differs from the static pipelines since tail sampling
+	// in static mode processes after the custom span metrics processor. This is ok because the tail sampling
+	// processor is not processing metrics.
+	spanmetricsID := otel_component.NewID("spanmetrics")
+	remoteWriteID := otel_component.NewID("remote_write")
+	for ix, pipeline := range otelCfg.Service.Pipelines {
+		if ix.Type() == "traces" {
+			pipeline.Exporters = append(pipeline.Exporters, spanmetricsID)
+
+			metricsId := otel_component.NewIDWithName("metrics", ix.Name())
+			otelCfg.Service.Pipelines[metricsId] = &pipelines.PipelineConfig{}
+			otelCfg.Service.Pipelines[metricsId].Receivers = append(otelCfg.Service.Pipelines[metricsId].Receivers, spanmetricsID)
+			otelCfg.Service.Pipelines[metricsId].Exporters = append(otelCfg.Service.Pipelines[metricsId].Exporters, remoteWriteID)
+		}
+	}
+}
+
+func toSpanmetricsConnector(cfg *traces.SpanMetricsConfig) *spanmetricsconnector.Config {
+	smc := spanmetricsconnector.NewFactory().CreateDefaultConfig().(*spanmetricsconnector.Config)
+	for _, dim := range cfg.Dimensions {
+		smc.Dimensions = append(smc.Dimensions, spanmetricsconnector.Dimension{Name: dim.Name, Default: dim.Default})
+	}
+	if cfg.DimensionsCacheSize != 0 {
+		smc.DimensionsCacheSize = cfg.DimensionsCacheSize
+	}
+	if cfg.AggregationTemporality != "" {
+		smc.AggregationTemporality = cfg.AggregationTemporality
+	}
+	if len(cfg.LatencyHistogramBuckets) != 0 {
+		smc.Histogram.Explicit = &spanmetricsconnector.ExplicitHistogramConfig{Buckets: cfg.LatencyHistogramBuckets}
+	}
+	if cfg.MetricsFlushInterval != 0 {
+		smc.MetricsFlushInterval = cfg.MetricsFlushInterval
+	}
+	if cfg.Namespace != "" {
+		smc.Namespace = cfg.Namespace
+	}
+
+	return smc
+}
+
 // removeReceiver removes a receiver from the otel config for a specific pipeline type.
 func removeReceiver(otelCfg *otelcol.Config, pipelineType otel_component.Type, receiverType otel_component.Type) {
 	if _, ok := otelCfg.Receivers[otel_component.NewID(receiverType)]; !ok {
@@ -75,13 +155,19 @@ func removeReceiver(otelCfg *otelcol.Config, pipelineType otel_component.Type, r
 	}
 
 	delete(otelCfg.Receivers, otel_component.NewID(receiverType))
-	spr := make([]otel_component.ID, 0, len(otelCfg.Service.Pipelines[otel_component.NewID(pipelineType)].Receivers)-1)
-	for _, r := range otelCfg.Service.Pipelines[otel_component.NewID(pipelineType)].Receivers {
-		if r != otel_component.NewID(receiverType) {
-			spr = append(spr, r)
+	for ix, p := range otelCfg.Service.Pipelines {
+		if ix.Type() != pipelineType {
+			continue
+		}
+
+		spr := make([]otel_component.ID, 0)
+		for _, r := range p.Receivers {
+			if r.Type() != receiverType {
+				spr = append(spr, r)
+			}
 		}
+		otelCfg.Service.Pipelines[ix].Receivers = spr
 	}
-	otelCfg.Service.Pipelines[otel_component.NewID(pipelineType)].Receivers = spr
 }
 
 // removeProcessor removes a processor from the otel config for a specific pipeline type.
@@ -91,11 +177,44 @@ func removeProcessor(otelCfg *otelcol.Config, pipelineType otel_component.Type,
 	}
 
 	delete(otelCfg.Processors, otel_component.NewID(processorType))
-	spr := make([]otel_component.ID, 0, len(otelCfg.Service.Pipelines[otel_component.NewID(pipelineType)].Processors)-1)
-	for _, r := range otelCfg.Service.Pipelines[otel_component.NewID(pipelineType)].Processors {
-		if r != otel_component.NewID(processorType) {
-			spr = append(spr, r)
+	for ix, p := range otelCfg.Service.Pipelines {
+		if ix.Type() != pipelineType {
+			continue
+		}
+
+		spr := make([]otel_component.ID, 0)
+		for _, r := range p.Processors {
+			if r.Type() != processorType {
+				spr = append(spr, r)
+			}
+		}
+		otelCfg.Service.Pipelines[ix].Processors = spr
+	}
+}
+
+// removeExporter removes an exporter from the otel config for a specific pipeline type.
+func removeExporter(otelCfg *otelcol.Config, pipelineType otel_component.Type, exporterType otel_component.Type) {
+	if _, ok := otelCfg.Exporters[otel_component.NewID(exporterType)]; !ok {
+		return
+	}
+
+	delete(otelCfg.Exporters, otel_component.NewID(exporterType))
+	for ix, p := range otelCfg.Service.Pipelines {
+		if ix.Type() != pipelineType {
+			continue
+		}
+
+		spr := make([]otel_component.ID, 0)
+		for _, r := range p.Exporters {
+			if r.Type() != exporterType {
+				spr = append(spr, r)
+			}
 		}
+		otelCfg.Service.Pipelines[ix].Exporters = spr
 	}
-	otelCfg.Service.Pipelines[otel_component.NewID(pipelineType)].Processors = spr
+}
+
+// removePipeline removes a pipeline from the otel config for a specific pipeline type.
+func removePipeline(otelCfg *otelcol.Config, pipelineType otel_component.Type, pipelineName string) {
+	delete(otelCfg.Service.Pipelines, otel_component.NewIDWithName(pipelineType, pipelineName))
 }
diff --git a/internal/converter/internal/staticconvert/internal/build/converter_discoveryprocessor.go b/internal/converter/internal/staticconvert/internal/build/converter_discoveryprocessor.go
index 42142dc610e6..6739d13479f5 100644
--- a/internal/converter/internal/staticconvert/internal/build/converter_discoveryprocessor.go
+++ b/internal/converter/internal/staticconvert/internal/build/converter_discoveryprocessor.go
@@ -13,7 +13,6 @@ import (
 	"github.com/grafana/agent/internal/converter/internal/prometheusconvert/build"
 	prometheus_component "github.com/grafana/agent/internal/converter/internal/prometheusconvert/component"
 	"github.com/grafana/agent/internal/static/traces/promsdprocessor"
-	"github.com/grafana/river/scanner"
 	prom_config "github.com/prometheus/prometheus/config"
 	"go.opentelemetry.io/collector/component"
 	"gopkg.in/yaml.v3"
@@ -81,7 +80,7 @@ func toDiscoveryProcessor(state *otelcolconvert.State, id component.InstanceID,
 		if label != "" {
 			labelConcat = label + "_" + scrapeConfig.JobName
 		}
-		label, _ := scanner.SanitizeIdentifier(labelConcat)
+		label := common.SanitizeIdentifierPanics(labelConcat)
 		scrapeTargets := prometheusconvert.AppendServiceDiscoveryConfigs(pb, scrapeConfig.ServiceDiscoveryConfigs, label)
 		promDiscoveryRelabelExports := prometheus_component.AppendDiscoveryRelabel(pb, scrapeConfig.RelabelConfigs, scrapeTargets, label)
 		if promDiscoveryRelabelExports != nil {
diff --git a/internal/converter/internal/staticconvert/internal/build/converter_remotewriteexporter.go b/internal/converter/internal/staticconvert/internal/build/converter_remotewriteexporter.go
new file mode 100644
index 000000000000..7d17bcfa1d1c
--- /dev/null
+++ b/internal/converter/internal/staticconvert/internal/build/converter_remotewriteexporter.go
@@ -0,0 +1,102 @@
+package build
+
+import (
+	"fmt"
+	"sort"
+
+	flow_relabel "github.com/grafana/agent/internal/component/common/relabel"
+	"github.com/grafana/agent/internal/component/otelcol/exporter/prometheus"
+	"github.com/grafana/agent/internal/component/prometheus/relabel"
+	"github.com/grafana/agent/internal/converter/diag"
+	"github.com/grafana/agent/internal/converter/internal/common"
+	"github.com/grafana/agent/internal/converter/internal/otelcolconvert"
+	"github.com/grafana/agent/internal/converter/internal/prometheusconvert/build"
+	prometheus_component "github.com/grafana/agent/internal/converter/internal/prometheusconvert/component"
+	"github.com/grafana/agent/internal/static/traces/remotewriteexporter"
+	prom_relabel "github.com/prometheus/prometheus/model/relabel"
+	"github.com/prometheus/prometheus/storage"
+	"go.opentelemetry.io/collector/component"
+)
+
+func init() {
+	converters = append(converters, remoteWriteExporterConverter{})
+}
+
+type remoteWriteExporterConverter struct{}
+
+func (remoteWriteExporterConverter) Factory() component.Factory {
+	return remotewriteexporter.NewFactory()
+}
+
+func (remoteWriteExporterConverter) InputComponentName() string {
+	return "otelcol.exporter.prometheus"
+}
+
+func (remoteWriteExporterConverter) ConvertAndAppend(state *otelcolconvert.State, id component.InstanceID, cfg component.Config) diag.Diagnostics {
+	label := state.FlowComponentLabel()
+
+	// We overloaded the ServerConfig.Endpoint field to be the prometheus.remote_write label
+	rwLabel := "metrics_" + cfg.(*remotewriteexporter.Config).PromInstance
+	forwardTo := []storage.Appendable{common.ConvertAppendable{Expr: fmt.Sprintf("prometheus.remote_write.%s.receiver", rwLabel)}}
+	if len(cfg.(*remotewriteexporter.Config).ConstLabels) > 0 {
+		exports := includeRelabelConfig(label, cfg, state, forwardTo)
+		forwardTo = []storage.Appendable{exports.Receiver}
+	}
+
+	args := toremotewriteexporterConfig(cfg.(*remotewriteexporter.Config), forwardTo)
+	block := common.NewBlockWithOverride([]string{"otelcol", "exporter", "prometheus"}, label, args)
+
+	var diags diag.Diagnostics
+	diags.Add(
+		diag.SeverityLevelInfo,
+		fmt.Sprintf("Converted %s into %s", otelcolconvert.StringifyInstanceID(id), otelcolconvert.StringifyBlock(block)),
+	)
+
+	state.Body().AppendBlock(block)
+	return diags
+}
+
+func includeRelabelConfig(label string, cfg component.Config, state *otelcolconvert.State, forwardTo []storage.Appendable) *relabel.Exports {
+	pb := build.NewPrometheusBlocks()
+
+	defaultRelabelConfigs := &flow_relabel.Config{}
+	defaultRelabelConfigs.SetToDefault()
+	relabelConfigs := []*prom_relabel.Config{}
+
+	// sort they keys for consistency in map iteration
+	keys := make([]string, 0, len(cfg.(*remotewriteexporter.Config).ConstLabels))
+	for label := range cfg.(*remotewriteexporter.Config).ConstLabels {
+		keys = append(keys, label)
+	}
+	sort.Strings(keys)
+
+	for _, label := range keys {
+		relabelConfigs = append(relabelConfigs, &prom_relabel.Config{
+			Separator:   defaultRelabelConfigs.Separator,
+			Regex:       prom_relabel.Regexp(defaultRelabelConfigs.Regex),
+			Modulus:     defaultRelabelConfigs.Modulus,
+			TargetLabel: label,
+			Replacement: cfg.(*remotewriteexporter.Config).ConstLabels[label],
+			Action:      prom_relabel.Action(defaultRelabelConfigs.Action),
+		})
+	}
+
+	exports := prometheus_component.AppendPrometheusRelabel(pb, relabelConfigs, forwardTo, label)
+	pb.AppendToBody(state.Body())
+	return exports
+}
+
+func toremotewriteexporterConfig(cfg *remotewriteexporter.Config, forwardTo []storage.Appendable) *prometheus.Arguments {
+	defaultArgs := &prometheus.Arguments{}
+	defaultArgs.SetToDefault()
+
+	return &prometheus.Arguments{
+		IncludeTargetInfo:             defaultArgs.IncludeTargetInfo,
+		IncludeScopeInfo:              defaultArgs.IncludeScopeInfo,
+		IncludeScopeLabels:            defaultArgs.IncludeScopeLabels,
+		GCFrequency:                   cfg.StaleTime,
+		ForwardTo:                     forwardTo,
+		AddMetricSuffixes:             defaultArgs.AddMetricSuffixes,
+		ResourceToTelemetryConversion: defaultArgs.ResourceToTelemetryConversion,
+	}
+}
diff --git a/internal/converter/internal/staticconvert/internal/build/self_exporter.go b/internal/converter/internal/staticconvert/internal/build/self_exporter.go
index 31e7b50551e7..51c1049349d5 100644
--- a/internal/converter/internal/staticconvert/internal/build/self_exporter.go
+++ b/internal/converter/internal/staticconvert/internal/build/self_exporter.go
@@ -8,19 +8,19 @@ import (
 )
 
 func (b *ConfigBuilder) appendAgentExporter(config *agent_exporter.Config) discovery.Exports {
-	args := toAgentExporter(config)
+	args := toAgentExporter()
 	return b.appendExporterBlock(args, config.Name(), nil, "self")
 }
 
-func toAgentExporter(config *agent_exporter.Config) *self.Arguments {
+func toAgentExporter() *self.Arguments {
 	return &self.Arguments{}
 }
 
 func (b *ConfigBuilder) appendAgentExporterV2(config *agent_exporter_v2.Config) discovery.Exports {
-	args := toAgentExporterV2(config)
+	args := toAgentExporterV2()
 	return b.appendExporterBlock(args, config.Name(), config.Common.InstanceKey, "self")
 }
 
-func toAgentExporterV2(config *agent_exporter_v2.Config) *self.Arguments {
+func toAgentExporterV2() *self.Arguments {
 	return &self.Arguments{}
 }
diff --git a/internal/converter/internal/staticconvert/staticconvert_test.go b/internal/converter/internal/staticconvert/staticconvert_test.go
index a38de5d0184f..92c6b1e3eda8 100644
--- a/internal/converter/internal/staticconvert/staticconvert_test.go
+++ b/internal/converter/internal/staticconvert/staticconvert_test.go
@@ -1,7 +1,8 @@
+//go:build linux
+
 package staticconvert_test
 
 import (
-	"runtime"
 	"testing"
 
 	"github.com/grafana/agent/internal/converter/internal/staticconvert"
@@ -12,9 +13,5 @@ import (
 func TestConvert(t *testing.T) {
 	test_common.TestDirectory(t, "testdata", ".yaml", true, []string{"-config.expand-env"}, staticconvert.Convert)
 	test_common.TestDirectory(t, "testdata-v2", ".yaml", true, []string{"-enable-features", "integrations-next", "-config.expand-env"}, staticconvert.Convert)
-
-	if runtime.GOOS == "windows" {
-		test_common.TestDirectory(t, "testdata_windows", ".yaml", true, []string{}, staticconvert.Convert)
-		test_common.TestDirectory(t, "testdata-v2_windows", ".yaml", true, []string{"-enable-features", "integrations-next"}, staticconvert.Convert)
-	}
+	test_common.TestDirectory(t, "testdata_linux", ".yaml", true, []string{"-config.expand-env"}, staticconvert.Convert)
 }
diff --git a/internal/converter/internal/staticconvert/staticconvert_windows_test.go b/internal/converter/internal/staticconvert/staticconvert_windows_test.go
new file mode 100644
index 000000000000..5cf536d3c623
--- /dev/null
+++ b/internal/converter/internal/staticconvert/staticconvert_windows_test.go
@@ -0,0 +1,17 @@
+//go:build windows
+
+package staticconvert_test
+
+import (
+	"testing"
+
+	"github.com/grafana/agent/internal/converter/internal/staticconvert"
+	"github.com/grafana/agent/internal/converter/internal/test_common"
+	_ "github.com/grafana/agent/internal/static/metrics/instance" // Imported to override default values via the init function.
+)
+
+func TestConvert(t *testing.T) {
+	test_common.TestDirectory(t, "testdata", ".yaml", true, []string{"-config.expand-env"}, staticconvert.Convert)
+	test_common.TestDirectory(t, "testdata-v2_windows", ".yaml", true, []string{"-enable-features", "integrations-next"}, staticconvert.Convert)
+	test_common.TestDirectory(t, "testdata_windows", ".yaml", true, []string{"-config.expand-env"}, staticconvert.Convert)
+}
diff --git a/internal/converter/internal/staticconvert/testdata/traces.river b/internal/converter/internal/staticconvert/testdata/traces.river
index 716aefad0e3b..0e1684d924b1 100644
--- a/internal/converter/internal/staticconvert/testdata/traces.river
+++ b/internal/converter/internal/staticconvert/testdata/traces.river
@@ -1,4 +1,30 @@
-otelcol.receiver.otlp "default" {
+prometheus.remote_write "metrics_remote_write_name" {
+	endpoint {
+		name = "remote_write_name-149bbd"
+		url  = "http://localhost:9009/api/prom/push"
+
+		queue_config { }
+
+		metadata_config { }
+	}
+}
+
+otelcol.extension.jaeger_remote_sampling "default_0" {
+	grpc { }
+
+	http { }
+
+	source {
+		remote {
+			endpoint          = "jaeger-collector:14250"
+			compression       = ""
+			write_buffer_size = "0B"
+		}
+		reload_interval = "30s"
+	}
+}
+
+otelcol.receiver.otlp "_0_default" {
 	grpc {
 		include_metadata = true
 	}
@@ -10,11 +36,11 @@ otelcol.receiver.otlp "default" {
 	output {
 		metrics = []
 		logs    = []
-		traces  = [otelcol.processor.discovery.default.input]
+		traces  = [otelcol.processor.discovery._0_default.input]
 	}
 }
 
-discovery.azure "default_prometheus1" {
+discovery.azure "_0_default_prometheus1" {
 	subscription_id = "subscription1"
 
 	oauth {
@@ -28,17 +54,17 @@ discovery.azure "default_prometheus1" {
 	}
 }
 
-discovery.lightsail "default_prometheus1" {
+discovery.lightsail "_0_default_prometheus1" {
 	region     = "us-east-1"
 	access_key = "YOUR_ACCESS_KEY"
 	secret_key = "YOUR_SECRET_KEY"
 	port       = 8080
 }
 
-discovery.relabel "default_prometheus1" {
+discovery.relabel "_0_default_prometheus1" {
 	targets = concat(
-		discovery.azure.default_prometheus1.targets,
-		discovery.lightsail.default_prometheus1.targets,
+		discovery.azure._0_default_prometheus1.targets,
+		discovery.lightsail._0_default_prometheus1.targets,
 	)
 
 	rule {
@@ -52,18 +78,19 @@ discovery.relabel "default_prometheus1" {
 	}
 }
 
-otelcol.processor.discovery "default" {
-	targets          = discovery.relabel.default_prometheus1.output
-	pod_associations = []
+otelcol.processor.discovery "_0_default" {
+	targets          = discovery.relabel._0_default_prometheus1.output
+	operation_type   = "insert"
+	pod_associations = ["ip", "net.host.ip"]
 
 	output {
 		metrics = []
 		logs    = []
-		traces  = [otelcol.processor.attributes.default.input]
+		traces  = [otelcol.processor.attributes._0_default.input]
 	}
 }
 
-otelcol.processor.attributes "default" {
+otelcol.processor.attributes "_0_default" {
 	action {
 		key    = "db.table"
 		action = "delete"
@@ -72,11 +99,75 @@ otelcol.processor.attributes "default" {
 	output {
 		metrics = []
 		logs    = []
-		traces  = [otelcol.processor.tail_sampling.default.input]
+		traces  = [otelcol.exporter.loadbalancing._0_default.input, otelcol.exporter.logging._0_default.input, otelcol.connector.spanmetrics._0_default.input]
 	}
 }
 
-otelcol.processor.tail_sampling "default" {
+prometheus.relabel "_0_default" {
+	forward_to = [prometheus.remote_write.metrics_remote_write_name.receiver]
+
+	rule {
+		target_label = "fizz"
+		replacement  = "buzz"
+	}
+
+	rule {
+		target_label = "foo"
+		replacement  = "bar"
+	}
+}
+
+otelcol.exporter.prometheus "_0_default" {
+	gc_frequency = "0s"
+	forward_to   = [prometheus.relabel._0_default.receiver]
+}
+
+otelcol.exporter.loadbalancing "_0_default" {
+	protocol {
+		otlp {
+			retry {
+				max_elapsed_time = "1m0s"
+			}
+
+			client {
+				compression = "none"
+			}
+		}
+	}
+
+	resolver {
+		static {
+			hostnames = ["tempo1.example.com", "tempo2.example.com"]
+		}
+	}
+}
+
+otelcol.exporter.logging "_0_default" { }
+
+otelcol.connector.spanmetrics "_0_default" {
+	histogram {
+		explicit { }
+	}
+	namespace = "metrics_prefix"
+
+	output {
+		metrics = [otelcol.exporter.prometheus._0_default.input]
+	}
+}
+
+otelcol.receiver.otlp "_1_lb" {
+	grpc {
+		endpoint = "0.0.0.0:4318"
+	}
+
+	output {
+		metrics = []
+		logs    = []
+		traces  = [otelcol.processor.tail_sampling._1_default.input]
+	}
+}
+
+otelcol.processor.tail_sampling "_1_default" {
 	policy {
 		name = "test-policy-1"
 		type = "always_sample"
@@ -84,18 +175,64 @@ otelcol.processor.tail_sampling "default" {
 	decision_wait = "5s"
 
 	output {
-		traces = [otelcol.exporter.otlp.default_0.input, otelcol.exporter.logging.default.input]
+		traces = [otelcol.processor.batch._1_default.input]
+	}
+}
+
+otelcol.processor.batch "_1_default" {
+	timeout             = "5s"
+	send_batch_size     = 2048
+	send_batch_max_size = 4096
+
+	output {
+		metrics = []
+		logs    = []
+		traces  = [otelcol.exporter.otlp._1_0.input, otelcol.exporter.logging._1_default.input, otelcol.connector.spanmetrics._1_default.input]
+	}
+}
+
+prometheus.relabel "_1_default" {
+	forward_to = [prometheus.remote_write.metrics_remote_write_name.receiver]
+
+	rule {
+		target_label = "fizz"
+		replacement  = "buzz"
 	}
+
+	rule {
+		target_label = "foo"
+		replacement  = "bar"
+	}
+}
+
+otelcol.exporter.prometheus "_1_default" {
+	gc_frequency = "0s"
+	forward_to   = [prometheus.relabel._1_default.receiver]
 }
 
-otelcol.exporter.otlp "default_0" {
+otelcol.exporter.otlp "_1_0" {
 	retry_on_failure {
 		max_elapsed_time = "1m0s"
 	}
 
 	client {
-		endpoint = "http://localhost:1234/write"
+		endpoint = "tempo.example.com:14250"
+
+		tls {
+			insecure = true
+		}
 	}
 }
 
-otelcol.exporter.logging "default" { }
+otelcol.exporter.logging "_1_default" { }
+
+otelcol.connector.spanmetrics "_1_default" {
+	histogram {
+		explicit { }
+	}
+	namespace = "metrics_prefix"
+
+	output {
+		metrics = [otelcol.exporter.prometheus._1_default.input]
+	}
+}
diff --git a/internal/converter/internal/staticconvert/testdata/traces.yaml b/internal/converter/internal/staticconvert/testdata/traces.yaml
index 2553da25200a..c6e295294130 100644
--- a/internal/converter/internal/staticconvert/testdata/traces.yaml
+++ b/internal/converter/internal/staticconvert/testdata/traces.yaml
@@ -1,15 +1,24 @@
 traces:
   configs:
     - name: trace_config
+      attributes:
+        actions:
+          - key: db.table
+            action: delete
+      batch:
+        timeout: 5s
+        send_batch_size: 2048
+        send_batch_max_size: 4096
+      remote_write:
+        - endpoint: tempo.example.com:14250
+          insecure: true
+      automatic_logging:
+        backend: "stdout"
       receivers:
         otlp:
           protocols:
             grpc:
             http:
-      remote_write:
-        - endpoint: http://localhost:1234/write
-      automatic_logging:
-        backend: "stdout"
       scrape_configs:
         - job_name: "prometheus1"
           azure_sd_configs:
@@ -27,6 +36,16 @@ traces:
               target_label: __param_target1
             - source_labels: [__address2__]
               target_label: __param_target2
+      prom_sd_operation_type: "insert"
+      prom_sd_pod_associations:
+        - ip
+        - net.host.ip
+      spanmetrics:
+        metrics_instance: remote_write_name
+        namespace: metrics_prefix
+        const_labels:
+          foo: bar
+          fizz: buzz 
       tail_sampling:
         policies:
           [
@@ -35,7 +54,23 @@ traces:
               type: always_sample
             },
           ]
-      attributes:
-        actions:
-          - key: db.table
-            action: delete
\ No newline at end of file
+      load_balancing:
+        resolver:
+          static:
+            hostnames:
+              - tempo1.example.com
+              - tempo2.example.com
+      jaeger_remote_sampling:
+        - source:
+            reload_interval: 30s
+            remote:
+              endpoint: jaeger-collector:14250
+
+# This metrics config is needed when we enable spanmetrics for traces
+# 
+metrics:
+  global:
+    remote_write:
+      - url: http://localhost:9009/api/prom/push
+  configs:
+    - name: remote_write_name
\ No newline at end of file
diff --git a/internal/converter/internal/staticconvert/testdata/unsupported.diags b/internal/converter/internal/staticconvert/testdata/unsupported.diags
index 0958f0e79e69..5687193a097d 100644
--- a/internal/converter/internal/staticconvert/testdata/unsupported.diags
+++ b/internal/converter/internal/staticconvert/testdata/unsupported.diags
@@ -1,6 +1,8 @@
 (Error) The converter does not support handling integrations which are not being scraped: mssql.
 (Error) mapping_config is not supported in statsd_exporter integrations config
+(Error) The service_graphs processor for traces has no direct flow equivalent. This configuration appends metrics to the /metrics endpoint of the agent which is not possible in flow. Alternatively, you can use the otelcol.connector.servicegraph component to build a pipeline which generates and forwards service graph metrics.
 (Error) automatic_logging for traces has no direct flow equivalent. A best effort translation can be made which only outputs to stdout and not directly to loki by bypassing errors.
+(Error) Cannot convert using configuration including spanmetrics handler_endpoint. No equivalent exists for exposing a known /metrics endpoint. You can use metrics_instance instead to enabled conversion.
 (Warning) Please review your agent command line flags and ensure they are set in your Flow mode config file where necessary.
 (Error) The converter does not support converting the provided grpc_tls_config server config: flow mode does not have a gRPC server to configure.
 (Error) The converter does not support converting the provided prefer_server_cipher_suites server config.
diff --git a/internal/converter/internal/staticconvert/testdata/unsupported.yaml b/internal/converter/internal/staticconvert/testdata/unsupported.yaml
index 8dd14ab12531..bb34aaac4c8a 100644
--- a/internal/converter/internal/staticconvert/testdata/unsupported.yaml
+++ b/internal/converter/internal/staticconvert/testdata/unsupported.yaml
@@ -64,6 +64,10 @@ traces:
         - endpoint: http://localhost:1234/write
       automatic_logging:
         backend: "something else"
+      spanmetrics:
+        handler_endpoint: http://localhost:1234/write
+      service_graphs:
+        enabled: true
 
 agent_management:
   host: host_name
diff --git a/internal/converter/internal/staticconvert/testdata/promtail_prom.diags b/internal/converter/internal/staticconvert/testdata_linux/promtail_prom.diags
similarity index 100%
rename from internal/converter/internal/staticconvert/testdata/promtail_prom.diags
rename to internal/converter/internal/staticconvert/testdata_linux/promtail_prom.diags
diff --git a/internal/converter/internal/staticconvert/testdata/promtail_prom.river b/internal/converter/internal/staticconvert/testdata_linux/promtail_prom.river
similarity index 96%
rename from internal/converter/internal/staticconvert/testdata/promtail_prom.river
rename to internal/converter/internal/staticconvert/testdata_linux/promtail_prom.river
index 1744d37aee5c..a80fad7ba5e2 100644
--- a/internal/converter/internal/staticconvert/testdata/promtail_prom.river
+++ b/internal/converter/internal/staticconvert/testdata_linux/promtail_prom.river
@@ -69,6 +69,7 @@ loki.source.file "logs_name_jobName" {
 		min_poll_frequency = "1s"
 		max_poll_frequency = "5s"
 	}
+	legacy_positions_file = "/path/name.yml"
 }
 
 loki.write "logs_name" {
@@ -120,6 +121,7 @@ loki.source.file "logs_name2_jobName" {
 		min_poll_frequency = "1s"
 		max_poll_frequency = "5s"
 	}
+	legacy_positions_file = "/path/name2.yml"
 }
 
 loki.write "logs_name2" {
diff --git a/internal/converter/internal/staticconvert/testdata/promtail_prom.yaml b/internal/converter/internal/staticconvert/testdata_linux/promtail_prom.yaml
similarity index 100%
rename from internal/converter/internal/staticconvert/testdata/promtail_prom.yaml
rename to internal/converter/internal/staticconvert/testdata_linux/promtail_prom.yaml
diff --git a/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.diags b/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.diags
new file mode 100644
index 000000000000..a4a05d1a3b58
--- /dev/null
+++ b/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.diags
@@ -0,0 +1 @@
+(Warning) Please review your agent command line flags and ensure they are set in your Flow mode config file where necessary.
\ No newline at end of file
diff --git a/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.river b/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.river
new file mode 100644
index 000000000000..c0bd2f9e7657
--- /dev/null
+++ b/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.river
@@ -0,0 +1,132 @@
+discovery.consul "metrics_name_jobName" {
+	services = ["myapp"]
+}
+
+prometheus.scrape "metrics_name_jobName" {
+	targets = concat(
+		discovery.consul.metrics_name_jobName.targets,
+		[{
+			__address__ = "localhost:9099",
+		}],
+		[{
+			__address__ = "localhost:9101",
+		}],
+	)
+	forward_to = [prometheus.remote_write.metrics_name.receiver]
+	job_name   = "jobName"
+}
+
+prometheus.remote_write "metrics_name" {
+	endpoint {
+		name = "name-149bbd"
+		url  = "http://localhost:9009/api/prom/push"
+
+		queue_config { }
+
+		metadata_config { }
+	}
+}
+
+discovery.consul "logs_name_jobName" {
+	datacenter    = "bigdata"
+	tag_separator = ";"
+	scheme        = "sketchy"
+	username      = "toby"
+	password      = "this_password_is_safe_innit?"
+	allow_stale   = false
+	services      = ["myapp"]
+	tags          = ["better", "faster", "stronger"]
+	node_meta     = {
+		what  = "this",
+		where = "here",
+	}
+	refresh_interval = "10m0s"
+
+	basic_auth {
+		username = "toby"
+		password = "this_password_is_safe_innit?"
+	}
+}
+
+discovery.relabel "logs_name_jobName" {
+	targets = discovery.consul.logs_name_jobName.targets
+
+	rule {
+		source_labels = ["host"]
+		target_label  = "hostname"
+	}
+}
+
+local.file_match "logs_name_jobName" {
+	path_targets = discovery.relabel.logs_name_jobName.output
+}
+
+loki.source.file "logs_name_jobName" {
+	targets    = local.file_match.logs_name_jobName.targets
+	forward_to = [loki.write.logs_name.receiver]
+
+	file_watch {
+		min_poll_frequency = "1s"
+		max_poll_frequency = "5s"
+	}
+	legacy_positions_file = "\\path\\name.yml"
+}
+
+loki.write "logs_name" {
+	endpoint {
+		url = "http://localhost/loki/api/v1/push"
+	}
+	external_labels = {}
+}
+
+discovery.consul "logs_name2_jobName" {
+	datacenter    = "bigdata"
+	tag_separator = ";"
+	scheme        = "sketchy"
+	username      = "toby"
+	password      = "this_password_is_safe_innit?"
+	allow_stale   = false
+	services      = ["myapp"]
+	tags          = ["better", "faster", "stronger"]
+	node_meta     = {
+		what  = "this",
+		where = "here",
+	}
+	refresh_interval = "10m0s"
+
+	basic_auth {
+		username = "toby"
+		password = "this_password_is_safe_innit?"
+	}
+}
+
+discovery.relabel "logs_name2_jobName" {
+	targets = discovery.consul.logs_name2_jobName.targets
+
+	rule {
+		source_labels = ["host"]
+		target_label  = "hostname"
+	}
+}
+
+local.file_match "logs_name2_jobName" {
+	path_targets = discovery.relabel.logs_name2_jobName.output
+}
+
+loki.source.file "logs_name2_jobName" {
+	targets    = local.file_match.logs_name2_jobName.targets
+	forward_to = [loki.write.logs_name2.receiver]
+
+	file_watch {
+		min_poll_frequency = "1s"
+		max_poll_frequency = "5s"
+	}
+	legacy_positions_file = "\\path\\name2.yml"
+}
+
+loki.write "logs_name2" {
+	endpoint {
+		url = "http://localhost/loki/api/v1/push"
+	}
+	external_labels = {}
+}
diff --git a/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.yaml b/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.yaml
new file mode 100644
index 000000000000..34f29485ab3f
--- /dev/null
+++ b/internal/converter/internal/staticconvert/testdata_windows/promtail_prom.yaml
@@ -0,0 +1,76 @@
+metrics:
+  global:
+    remote_write:
+      - url: http://localhost:9009/api/prom/push
+  configs:
+    - name: name
+      host_filter: false
+      scrape_configs:
+        - job_name: 'jobName'
+          static_configs:
+            - targets: ['localhost:9099','localhost:9101']
+          consul_sd_configs:
+          - server: 'localhost:8500'
+            services: ['myapp']
+    
+logs:
+  global:
+    file_watch_config:
+      min_poll_frequency: 1s
+      max_poll_frequency: 5s
+  positions_directory: /path
+  configs:
+    - name: name
+      clients:
+        - url: http://localhost/loki/api/v1/push
+      scrape_configs:
+        - job_name: jobName
+          consul_sd_configs:
+            - server: 'localhost:8500'
+              datacenter: bigdata
+              scheme: sketchy
+              username: toby
+              password: this_password_is_safe_innit?
+              tags:
+                - better
+                - faster
+                - stronger
+              services: [ 'myapp' ]
+              node_meta:
+                where: here
+                what: this
+              tag_separator: ";"
+              allow_stale: false
+              refresh_interval: 10m
+
+          relabel_configs:
+            - source_labels:
+                - host
+              target_label: hostname
+    - name: name2
+      clients:
+        - url: http://localhost/loki/api/v1/push
+      scrape_configs:
+        - job_name: jobName
+          consul_sd_configs:
+            - server: 'localhost:8500'
+              datacenter: bigdata
+              scheme: sketchy
+              username: toby
+              password: this_password_is_safe_innit?
+              tags:
+                - better
+                - faster
+                - stronger
+              services: [ 'myapp' ]
+              node_meta:
+                where: here
+                what: this
+              tag_separator: ";"
+              allow_stale: false
+              refresh_interval: 10m
+
+          relabel_configs:
+            - source_labels:
+                - host
+              target_label: hostname
\ No newline at end of file
diff --git a/internal/flow/import_git_test.go b/internal/flow/import_git_test.go
index c2b4c4f9211c..12027c7cdfce 100644
--- a/internal/flow/import_git_test.go
+++ b/internal/flow/import_git_test.go
@@ -3,10 +3,13 @@
 package flow_test
 
 import (
+	"bufio"
+	"bytes"
 	"context"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -25,19 +28,77 @@ func TestPullUpdating(t *testing.T) {
 	// file based git repo then committing a file, running the component, then updating the file in the repo.
 	testRepo := t.TempDir()
 
-	contents := `declare "add" {
-    argument "a" {}
-    argument "b" {}
+	main := `
+import.git "testImport" {
+	repository = "` + testRepo + `"
+  	path = "math.river"
+    pull_frequency = "1s"
+}
+
+testImport.add "cc" {
+	a = 1
+    b = 1
+}
+`
+	// Create our git repository.
+	runGit(t, testRepo, "init", testRepo)
+
+	// Add the file we want.
+	math := filepath.Join(testRepo, "math.river")
+	err := os.WriteFile(math, []byte(contents), 0666)
+	require.NoError(t, err)
+
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test\"")
+
+	defer verifyNoGoroutineLeaks(t)
+	ctrl, f := setup(t, main)
+	err = ctrl.LoadSource(f, nil)
+	require.NoError(t, err)
+	ctx, cancel := context.WithCancel(context.Background())
+
+	var wg sync.WaitGroup
+	defer func() {
+		cancel()
+		wg.Wait()
+	}()
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		ctrl.Run(ctx)
+	}()
+
+	// Check for initial condition
+	require.Eventually(t, func() bool {
+		export := getExport[map[string]interface{}](t, ctrl, "", "testImport.add.cc")
+		return export["sum"] == 2
+	}, 5*time.Second, 100*time.Millisecond)
+
+	err = os.WriteFile(math, []byte(contentsMore), 0666)
+	require.NoError(t, err)
+
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test2\"")
+
+	// Check for final condition.
+	require.Eventually(t, func() bool {
+		export := getExport[map[string]interface{}](t, ctrl, "", "testImport.add.cc")
+		return export["sum"] == 3
+	}, 5*time.Second, 100*time.Millisecond)
+}
+
+func TestPullUpdatingFromBranch(t *testing.T) {
+	testRepo := t.TempDir()
 
-    export "sum" {
-        value = argument.a.value + argument.b.value
-    }
-}`
 	main := `
 import.git "testImport" {
 	repository = "` + testRepo + `"
   	path = "math.river"
-    pull_frequency = "5s"
+    pull_frequency = "1s"
+    revision = "testor"
 }
 
 testImport.add "cc" {
@@ -45,21 +106,99 @@ testImport.add "cc" {
     b = 1
 }
 `
-	init := exec.Command("git", "init", testRepo)
-	err := init.Run()
+	runGit(t, testRepo, "init", testRepo)
+
+	runGit(t, testRepo, "checkout", "-b", "testor")
+
+	math := filepath.Join(testRepo, "math.river")
+	err := os.WriteFile(math, []byte(contents), 0666)
+	require.NoError(t, err)
+
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test\"")
+
+	defer verifyNoGoroutineLeaks(t)
+	ctrl, f := setup(t, main)
+	err = ctrl.LoadSource(f, nil)
 	require.NoError(t, err)
+	ctx, cancel := context.WithCancel(context.Background())
+
+	var wg sync.WaitGroup
+	defer func() {
+		cancel()
+		wg.Wait()
+	}()
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		ctrl.Run(ctx)
+	}()
+
+	// Check for initial condition
+	require.Eventually(t, func() bool {
+		export := getExport[map[string]interface{}](t, ctrl, "", "testImport.add.cc")
+		return export["sum"] == 2
+	}, 5*time.Second, 100*time.Millisecond)
+
+	err = os.WriteFile(math, []byte(contentsMore), 0666)
+	require.NoError(t, err)
+
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test2\"")
+
+	// Check for final condition.
+	require.Eventually(t, func() bool {
+		export := getExport[map[string]interface{}](t, ctrl, "", "testImport.add.cc")
+		return export["sum"] == 3
+	}, 5*time.Second, 100*time.Millisecond)
+}
+
+func TestPullUpdatingFromHash(t *testing.T) {
+	testRepo := t.TempDir()
+
+	runGit(t, testRepo, "init", testRepo)
 	math := filepath.Join(testRepo, "math.river")
-	err = os.WriteFile(math, []byte(contents), 0666)
+	err := os.WriteFile(math, []byte(contents), 0666)
 	require.NoError(t, err)
-	add := exec.Command("git", "add", ".")
-	add.Dir = testRepo
-	err = add.Run()
+
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test\"")
+
+	getHead := exec.Command("git", "rev-parse", "HEAD")
+	var stdBuffer bytes.Buffer
+	getHead.Dir = testRepo
+	getHead.Stdout = bufio.NewWriter(&stdBuffer)
+	err = getHead.Run()
 	require.NoError(t, err)
-	commit := exec.Command("git", "commit", "-m \"test\"")
-	commit.Dir = testRepo
-	err = commit.Run()
+	hash := stdBuffer.String()
+	hash = strings.TrimSpace(hash)
+
+	main := `
+import.git "testImport" {
+	repository = "` + testRepo + `"
+  	path = "math.river"
+    pull_frequency = "1s"
+    revision = "` + hash + `"
+}
+
+testImport.add "cc" {
+	a = 1
+    b = 1
+}
+`
+
+	// After this update the sum should still be 2 and not 3 since it is pinned to the initial hash.
+	err = os.WriteFile(math, []byte(contentsMore), 0666)
 	require.NoError(t, err)
 
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test2\"")
+
 	defer verifyNoGoroutineLeaks(t)
 	ctrl, f := setup(t, main)
 	err = ctrl.LoadSource(f, nil)
@@ -78,33 +217,103 @@ testImport.add "cc" {
 		ctrl.Run(ctx)
 	}()
 
-	// Check for initial condition
+	// Check for final condition.
 	require.Eventually(t, func() bool {
 		export := getExport[map[string]interface{}](t, ctrl, "", "testImport.add.cc")
 		return export["sum"] == 2
-	}, 3*time.Second, 10*time.Millisecond)
+	}, 5*time.Second, 100*time.Millisecond)
+}
 
-	contentsMore := `declare "add" {
-    argument "a" {}
-    argument "b" {}
+func TestPullUpdatingFromTag(t *testing.T) {
+	testRepo := t.TempDir()
 
-    export "sum" {
-        value = argument.a.value + argument.b.value + 1
-    }
-}`
+	runGit(t, testRepo, "init", testRepo)
+
+	math := filepath.Join(testRepo, "math.river")
+	err := os.WriteFile(math, []byte(contents), 0666)
+	require.NoError(t, err)
+
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test\"")
+
+	runGit(t, testRepo, "tag", "-a", "tagtest", "-m", "testtag")
+
+	main := `
+import.git "testImport" {
+	repository = "` + testRepo + `"
+  	path = "math.river"
+    pull_frequency = "1s"
+    revision = "tagtest"
+}
+
+testImport.add "cc" {
+	a = 1
+    b = 1
+}
+`
+
+	// After this update the sum should still be 2 and not 3 since it is pinned to the tag.
 	err = os.WriteFile(math, []byte(contentsMore), 0666)
 	require.NoError(t, err)
-	add2 := exec.Command("git", "add", ".")
-	add2.Dir = testRepo
-	add2.Run()
 
-	commit2 := exec.Command("git", "commit", "-m \"test2\"")
-	commit2.Dir = testRepo
-	commit2.Run()
+	runGit(t, testRepo, "add", ".")
+
+	runGit(t, testRepo, "commit", "-m \"test2\"")
+
+	defer verifyNoGoroutineLeaks(t)
+
+	ctrl, f := setup(t, main)
+	err = ctrl.LoadSource(f, nil)
+	require.NoError(t, err)
+	ctx, cancel := context.WithCancel(context.Background())
+
+	var wg sync.WaitGroup
+	defer func() {
+		cancel()
+		wg.Wait()
+	}()
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		ctrl.Run(ctx)
+	}()
 
 	// Check for final condition.
 	require.Eventually(t, func() bool {
 		export := getExport[map[string]interface{}](t, ctrl, "", "testImport.add.cc")
-		return export["sum"] == 3
-	}, 20*time.Second, 1*time.Millisecond)
+		return export["sum"] == 2
+	}, 5*time.Second, 100*time.Millisecond)
+}
+
+func runGit(t *testing.T, dir string, args ...string) {
+	exe := exec.Command("git", args...)
+	var stdErr bytes.Buffer
+	exe.Stderr = bufio.NewWriter(&stdErr)
+	exe.Dir = dir
+	err := exe.Run()
+	errTxt := stdErr.String()
+	if err != nil {
+		t.Error(errTxt)
+	}
+	require.NoErrorf(t, err, "command git %v failed", args)
 }
+
+const contents = `declare "add" {
+    argument "a" {}
+    argument "b" {}
+
+    export "sum" {
+        value = argument.a.value + argument.b.value
+    }
+}`
+
+const contentsMore = `declare "add" {
+    argument "a" {}
+    argument "b" {}
+
+    export "sum" {
+        value = argument.a.value + argument.b.value + 1
+    }
+}`
diff --git a/internal/flow/internal/controller/loader.go b/internal/flow/internal/controller/loader.go
index 8921d5ff1859..2514d9f4c873 100644
--- a/internal/flow/internal/controller/loader.go
+++ b/internal/flow/internal/controller/loader.go
@@ -37,21 +37,21 @@ type Loader struct {
 	// pool for evaluation in EvaluateDependants, because the queue is full. This is an unlikely scenario, but when
 	// it happens we should avoid retrying too often to give other goroutines a chance to progress. Having a backoff
 	// also prevents log spamming with errors.
-	backoffConfig        backoff.Config
+	backoffConfig backoff.Config
+
+	mut                  sync.RWMutex
+	graph                *dag.Graph
+	originalGraph        *dag.Graph
+	componentNodes       []ComponentNode
+	declareNodes         map[string]*DeclareNode
+	importConfigNodes    map[string]*ImportConfigNode
+	serviceNodes         []*ServiceNode
+	cache                *valueCache
+	blocks               []*ast.BlockStmt // Most recently loaded blocks, used for writing
+	cm                   *controllerMetrics
+	cc                   *controllerCollector
+	moduleExportIndex    int
 	componentNodeManager *ComponentNodeManager
-
-	mut               sync.RWMutex
-	graph             *dag.Graph
-	originalGraph     *dag.Graph
-	componentNodes    []ComponentNode
-	declareNodes      map[string]*DeclareNode
-	importConfigNodes map[string]*ImportConfigNode
-	serviceNodes      []*ServiceNode
-	cache             *valueCache
-	blocks            []*ast.BlockStmt // Most recently loaded blocks, used for writing
-	cm                *controllerMetrics
-	cc                *controllerCollector
-	moduleExportIndex int
 }
 
 // LoaderOptions holds options for creating a Loader.
@@ -75,12 +75,14 @@ func NewLoader(opts LoaderOptions) *Loader {
 		reg      = opts.ComponentRegistry
 	)
 
+	parent, id := splitPath(globals.ControllerID)
+
 	if reg == nil {
 		reg = NewDefaultComponentRegistry(opts.ComponentGlobals.MinStability)
 	}
 
 	l := &Loader{
-		log:        log.With(globals.Logger, "controller_id", globals.ControllerID),
+		log:        log.With(globals.Logger, "controller_path", parent, "controller_id", id),
 		tracer:     tracing.WrapTracerForLoader(globals.TraceProvider, globals.ControllerID),
 		globals:    globals,
 		services:   services,
@@ -99,9 +101,9 @@ func NewLoader(opts LoaderOptions) *Loader {
 		graph:         &dag.Graph{},
 		originalGraph: &dag.Graph{},
 		cache:         newValueCache(),
-		cm:            newControllerMetrics(globals.ControllerID),
+		cm:            newControllerMetrics(parent, id),
 	}
-	l.cc = newControllerCollector(l, globals.ControllerID)
+	l.cc = newControllerCollector(l, parent, id)
 
 	if globals.Registerer != nil {
 		globals.Registerer.MustRegister(l.cc)
@@ -787,10 +789,11 @@ func (l *Loader) concurrentEvalFn(n dag.Node, spanCtx context.Context, tracer tr
 	switch n := n.(type) {
 	case BlockNode:
 		ectx := l.cache.BuildContext()
-		evalErr := n.Evaluate(ectx)
 
-		// Only obtain loader lock after we have evaluated the node, allowing for concurrent evaluation.
+		// RLock before evaluate to prevent Evaluating while the config is being reloaded
 		l.mut.RLock()
+		evalErr := n.Evaluate(ectx)
+
 		err = l.postEvaluate(l.log, n, evalErr)
 
 		// Additional post-evaluation steps necessary for module exports.
@@ -908,3 +911,9 @@ func (l *Loader) collectCustomComponentReferences(stmts ast.Body, uniqueReferenc
 		}
 	}
 }
+
+func splitPath(id string) (string, string) {
+	parent, id := path.Split(id)
+	parent, _ = strings.CutSuffix(parent, "/")
+	return "/" + parent, id
+}
diff --git a/internal/flow/internal/controller/metrics.go b/internal/flow/internal/controller/metrics.go
index e60d8a51e391..f640f11b3253 100644
--- a/internal/flow/internal/controller/metrics.go
+++ b/internal/flow/internal/controller/metrics.go
@@ -18,7 +18,7 @@ type controllerMetrics struct {
 }
 
 // newControllerMetrics inits the metrics for the components controller
-func newControllerMetrics(id string) *controllerMetrics {
+func newControllerMetrics(parent, id string) *controllerMetrics {
 	cm := &controllerMetrics{
 		slowComponentThreshold: 1 * time.Minute,
 	}
@@ -31,14 +31,14 @@ func newControllerMetrics(id string) *controllerMetrics {
 	cm.controllerEvaluation = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:        "agent_component_controller_evaluating",
 		Help:        "Tracks if the controller is currently in the middle of a graph evaluation",
-		ConstLabels: map[string]string{"controller_id": id},
+		ConstLabels: map[string]string{"controller_path": parent, "controller_id": id},
 	})
 
 	cm.componentEvaluationTime = prometheus.NewHistogram(
 		prometheus.HistogramOpts{
 			Name:                            "agent_component_evaluation_seconds",
 			Help:                            "Time spent performing component evaluation",
-			ConstLabels:                     map[string]string{"controller_id": id},
+			ConstLabels:                     map[string]string{"controller_path": parent, "controller_id": id},
 			Buckets:                         evaluationTimesBuckets,
 			NativeHistogramBucketFactor:     1.1,
 			NativeHistogramMaxBucketNumber:  100,
@@ -49,7 +49,7 @@ func newControllerMetrics(id string) *controllerMetrics {
 		prometheus.HistogramOpts{
 			Name:                            "agent_component_dependencies_wait_seconds",
 			Help:                            "Time spent by components waiting to be evaluated after their dependency is updated.",
-			ConstLabels:                     map[string]string{"controller_id": id},
+			ConstLabels:                     map[string]string{"controller_path": parent, "controller_id": id},
 			Buckets:                         evaluationTimesBuckets,
 			NativeHistogramBucketFactor:     1.1,
 			NativeHistogramMaxBucketNumber:  100,
@@ -60,13 +60,13 @@ func newControllerMetrics(id string) *controllerMetrics {
 	cm.evaluationQueueSize = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:        "agent_component_evaluation_queue_size",
 		Help:        "Tracks the number of components waiting to be evaluated in the worker pool",
-		ConstLabels: map[string]string{"controller_id": id},
+		ConstLabels: map[string]string{"controller_path": parent, "controller_id": id},
 	})
 
 	cm.slowComponentEvaluationTime = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name:        "agent_component_evaluation_slow_seconds",
 		Help:        fmt.Sprintf("Number of seconds spent evaluating components that take longer than %v to evaluate", cm.slowComponentThreshold),
-		ConstLabels: map[string]string{"controller_id": id},
+		ConstLabels: map[string]string{"controller_path": parent, "controller_id": id},
 	}, []string{"component_id"})
 
 	return cm
@@ -100,14 +100,14 @@ type controllerCollector struct {
 	runningComponentsTotal *prometheus.Desc
 }
 
-func newControllerCollector(l *Loader, id string) *controllerCollector {
+func newControllerCollector(l *Loader, parent, id string) *controllerCollector {
 	return &controllerCollector{
 		l: l,
 		runningComponentsTotal: prometheus.NewDesc(
 			"agent_component_controller_running_components",
 			"Total number of running components.",
 			[]string{"health_type"},
-			map[string]string{"controller_id": id},
+			map[string]string{"controller_path": parent, "controller_id": id},
 		),
 	}
 }
diff --git a/internal/flow/internal/controller/node_builtin_component.go b/internal/flow/internal/controller/node_builtin_component.go
index 028ca2362777..6bf5c6bf36e5 100644
--- a/internal/flow/internal/controller/node_builtin_component.go
+++ b/internal/flow/internal/controller/node_builtin_component.go
@@ -165,11 +165,13 @@ func NewBuiltinComponentNode(globals ComponentGlobals, reg component.Registratio
 
 func getManagedOptions(globals ComponentGlobals, cn *BuiltinComponentNode) component.Options {
 	cn.registry = prometheus.NewRegistry()
+	parent, id := splitPath(cn.globalID)
 	return component.Options{
 		ID:     cn.globalID,
-		Logger: log.With(globals.Logger, "component", cn.globalID),
+		Logger: log.With(globals.Logger, "component_path", parent, "component_id", id),
 		Registerer: prometheus.WrapRegistererWith(prometheus.Labels{
-			"component_id": cn.globalID,
+			"component_path": parent,
+			"component_id":   id,
 		}, cn.registry),
 		Tracer: tracing.WrapTracer(globals.TraceProvider, cn.globalID),
 
diff --git a/internal/flow/internal/controller/node_builtin_component_test.go b/internal/flow/internal/controller/node_builtin_component_test.go
index 3be8307dd828..9e777490cd7f 100644
--- a/internal/flow/internal/controller/node_builtin_component_test.go
+++ b/internal/flow/internal/controller/node_builtin_component_test.go
@@ -37,3 +37,28 @@ func TestLocalID(t *testing.T) {
 	})
 	require.Equal(t, "/data/local.id", filepath.ToSlash(mo.DataPath))
 }
+
+func TestSplitPath(t *testing.T) {
+	var testcases = []struct {
+		input string
+		path  string
+		id    string
+	}{
+		{"", "/", ""},
+		{"remotecfg", "/", "remotecfg"},
+		{"prometheus.remote_write", "/", "prometheus.remote_write"},
+		{"custom_component.default/prometheus.remote_write", "/custom_component.default", "prometheus.remote_write"},
+
+		{"local.file.default", "/", "local.file.default"},
+		{"a_namespace.a.default/local.file.default", "/a_namespace.a.default", "local.file.default"},
+		{"a_namespace.a.default/b_namespace.b.default/local.file.default", "/a_namespace.a.default/b_namespace.b.default", "local.file.default"},
+
+		{"a_namespace.a.default/b_namespace.b.default/c_namespace.c.default", "/a_namespace.a.default/b_namespace.b.default", "c_namespace.c.default"},
+	}
+
+	for _, tt := range testcases {
+		path, id := splitPath(tt.input)
+		require.Equal(t, tt.path, path)
+		require.Equal(t, tt.id, id)
+	}
+}
diff --git a/internal/flow/internal/controller/node_config_import.go b/internal/flow/internal/controller/node_config_import.go
index 7cc95bdb4d1f..e87a1223cc5b 100644
--- a/internal/flow/internal/controller/node_config_import.go
+++ b/internal/flow/internal/controller/node_config_import.go
@@ -90,11 +90,13 @@ func NewImportConfigNode(block *ast.BlockStmt, globals ComponentGlobals, sourceT
 
 func getImportManagedOptions(globals ComponentGlobals, cn *ImportConfigNode) component.Options {
 	cn.registry = prometheus.NewRegistry()
+	parent, id := splitPath(cn.globalID)
 	return component.Options{
 		ID:     cn.globalID,
-		Logger: log.With(globals.Logger, "config", cn.globalID),
+		Logger: log.With(globals.Logger, "config_path", parent, "config_id", id),
 		Registerer: prometheus.WrapRegistererWith(prometheus.Labels{
-			"config_id": cn.globalID,
+			"config_path": parent,
+			"config_id":   id,
 		}, cn.registry),
 		Tracer:   tracing.WrapTracer(globals.TraceProvider, cn.globalID),
 		DataPath: filepath.Join(globals.DataPath, cn.globalID),
diff --git a/internal/flow/internal/controller/node_custom_component.go b/internal/flow/internal/controller/node_custom_component.go
index 8b3e05a74e89..d0d53d804e5c 100644
--- a/internal/flow/internal/controller/node_custom_component.go
+++ b/internal/flow/internal/controller/node_custom_component.go
@@ -104,6 +104,7 @@ func NewCustomComponentNode(globals ComponentGlobals, b *ast.BlockStmt, getConfi
 
 	componentName := b.GetBlockName()
 	importNamespace, customComponentName := ExtractImportAndDeclare(componentName)
+	parent, node := splitPath(globalID)
 
 	cn := &CustomComponentNode{
 		id:                  id,
@@ -115,7 +116,7 @@ func NewCustomComponentNode(globals ComponentGlobals, b *ast.BlockStmt, getConfi
 		customComponentName: customComponentName,
 		moduleController:    globals.NewModuleController(globalID),
 		OnBlockNodeUpdate:   globals.OnBlockNodeUpdate,
-		logger:              log.With(globals.Logger, "component", globalID),
+		logger:              log.With(globals.Logger, "component_path", parent, "component_id", node),
 		getConfig:           getConfig,
 
 		block: b,
diff --git a/internal/flow/testdata/import_file/import_file_17.txtar b/internal/flow/testdata/import_file/import_file_17.txtar
new file mode 100644
index 000000000000..8313fa642d33
--- /dev/null
+++ b/internal/flow/testdata/import_file/import_file_17.txtar
@@ -0,0 +1,65 @@
+This is a simple test with several levels of nesting.
+This test would often panic when re-evaluation could run concurrently with a config reload.
+Now that it is protected with mutex, this test should always pass.
+
+-- main.river --
+import.file "a_namespace" {
+	filename = "module.river"
+}
+
+a_namespace.a "default" {
+	a_argument = 47
+}
+
+testcomponents.summation "sum" {
+	input = 10
+}
+
+-- module.river --
+declare "a" {
+	import.file "b_namespace" {
+		filename = "nested_module.river"
+	}
+
+	argument "a_argument" {
+		comment = "Where to send collected metrics."
+	}
+
+	b_namespace.b "default" {
+		b_argument = 147
+	}
+
+	export "a_export" {
+		value = argument.a_argument.value + b_namespace.b.default.b_export + 1
+	}
+}
+
+-- nested_module.river --
+declare "b" {
+	import.file "c_namespace" {
+		filename = "other_nested_module.river"
+	}
+
+	argument "b_argument" {
+		optional = false
+	}
+
+	c_namespace.c "default" {
+		c_argument = 101
+	}
+
+	export "b_export" {
+		value = argument.b_argument.value + c_namespace.c.default.c_export + 1
+	}
+}
+
+-- other_nested_module.river --
+declare "c" {
+	argument "c_argument" {
+		optional = false
+	}
+
+	export "c_export" {
+		value = argument.c_argument.value + 1
+	}
+}
\ No newline at end of file
diff --git a/internal/flowmode/cmd_run.go b/internal/flowmode/cmd_run.go
index 3bbd9889a32c..15ed6384503c 100644
--- a/internal/flowmode/cmd_run.go
+++ b/internal/flowmode/cmd_run.go
@@ -136,7 +136,6 @@ depending on the nature of the reload error.
 	cmd.Flags().
 		BoolVar(&r.disableReporting, "disable-reporting", r.disableReporting, "Disable reporting of enabled components to Grafana.")
 	cmd.Flags().StringVar(&r.storagePath, "storage.path", r.storagePath, "Base directory where components can store data")
-	cmd.Flags().Var(&r.minStability, "stability.level", fmt.Sprintf("Minimum stability level of features to enable. Supported values: %s", strings.Join(featuregate.AllowedValues(), ", ")))
 	return cmd
 }
 
diff --git a/internal/static/integrations/azure_exporter/azure_exporter.go b/internal/static/integrations/azure_exporter/azure_exporter.go
index dd8e6b267790..1f18e240e744 100644
--- a/internal/static/integrations/azure_exporter/azure_exporter.go
+++ b/internal/static/integrations/azure_exporter/azure_exporter.go
@@ -81,7 +81,7 @@ func (e Exporter) MetricsHandler() (http.Handler, error) {
 		//  "RunOnSubscriptionScope" uses a different API, https://github.com/Azure/azure-rest-api-specs/blob/main/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-05-01/metrics_API.json#L40,
 		//  which can get metric data for all resources in a single API call reducing overhead/likelihood of being rate limited.
 		// Limiting to specific resources requires 1 API call per resource to get metrics which can easily lead to rate limiting
-		if len(settings.Regions) > 1 {
+		if len(settings.Regions) > 0 {
 			prober.RunOnSubscriptionScope()
 		} else {
 			err = prober.ServiceDiscovery.FindResourceGraph(ctx, settings.Subscriptions, settings.ResourceType, settings.Filter)
diff --git a/internal/static/integrations/postgres_exporter/postgres_exporter.go b/internal/static/integrations/postgres_exporter/postgres_exporter.go
index aa375be8c41f..d1384cc46633 100644
--- a/internal/static/integrations/postgres_exporter/postgres_exporter.go
+++ b/internal/static/integrations/postgres_exporter/postgres_exporter.go
@@ -6,14 +6,14 @@ import (
 	"os"
 	"strings"
 
-	config_util "github.com/prometheus/common/config"
-
 	"github.com/go-kit/log"
 	"github.com/grafana/agent/internal/static/integrations"
 	integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2"
 	"github.com/grafana/agent/internal/static/integrations/v2/metricsutils"
 	"github.com/lib/pq"
-	"github.com/prometheus-community/postgres_exporter/exporter"
+	"github.com/prometheus-community/postgres_exporter/cmd/postgres_exporter"
+	"github.com/prometheus-community/postgres_exporter/collector"
+	config_util "github.com/prometheus/common/config"
 )
 
 // Config controls the postgres_exporter integration.
@@ -27,6 +27,16 @@ type Config struct {
 	IncludeDatabases       []string `yaml:"include_databases,omitempty"`
 	DisableDefaultMetrics  bool     `yaml:"disable_default_metrics,omitempty"`
 	QueryPath              string   `yaml:"query_path,omitempty"`
+
+	//-- The fields below are only used in flow mode and not (yet) exposed in the static mode.--
+
+	// Instance is used by the flow mode to specify the instance name manually. This is only used when there are multiple
+	// DSNs provided.
+	Instance string
+	// EnabledCollectors is a list of additional collectors to enable. NOTE: Due to limitations of the postgres_exporter,
+	// this is only used for the first DSN provided and only some collectors can be enabled/disabled this way. See the
+	// user-facing docs for more information.
+	EnabledCollectors []string
 }
 
 // Name returns the name of the integration this config is for.
@@ -47,6 +57,10 @@ func (c *Config) InstanceKey(_ string) (string, error) {
 		return "", err
 	}
 	if len(dsn) != 1 {
+		if c.Instance != "" {
+			return c.Instance, nil
+		}
+		// This should not be possible in the flow mode, because `c.Instance` is always set.
 		return "", fmt.Errorf("can't automatically determine a value for `instance` with %d DSN. either use 1 DSN or manually assign a value for `instance` in the integration config", len(dsn))
 	}
 
@@ -128,23 +142,37 @@ func init() {
 
 // New creates a new postgres_exporter integration. The integration scrapes
 // metrics from a postgres process.
-func New(log log.Logger, c *Config) (integrations.Integration, error) {
-	dsn, err := c.getDataSourceNames()
+func New(log log.Logger, cfg *Config) (integrations.Integration, error) {
+	dsns, err := cfg.getDataSourceNames()
 	if err != nil {
 		return nil, err
 	}
 
-	e := exporter.NewExporter(
-		dsn,
-		log,
-		exporter.DisableDefaultMetrics(c.DisableDefaultMetrics),
-		exporter.WithUserQueriesPath(c.QueryPath),
-		exporter.DisableSettingsMetrics(c.DisableSettingsMetrics),
-		exporter.AutoDiscoverDatabases(c.AutodiscoverDatabases),
-		exporter.ExcludeDatabases(strings.Join(c.ExcludeDatabases, ",")),
-		exporter.IncludeDatabases(strings.Join(c.IncludeDatabases, ",")),
-		exporter.MetricPrefix("pg"),
+	e := postgres_exporter.NewExporter(
+		dsns,
+		postgres_exporter.DisableDefaultMetrics(cfg.DisableDefaultMetrics),
+		postgres_exporter.WithUserQueriesPath(cfg.QueryPath),
+		postgres_exporter.DisableSettingsMetrics(cfg.DisableSettingsMetrics),
+		postgres_exporter.AutoDiscoverDatabases(cfg.AutodiscoverDatabases),
+		postgres_exporter.ExcludeDatabases(cfg.ExcludeDatabases),
+		postgres_exporter.IncludeDatabases(strings.Join(cfg.IncludeDatabases, ",")),
+		postgres_exporter.WithLogger(log),
+		postgres_exporter.WithMetricPrefix("pg"),
 	)
 
-	return integrations.NewCollectorIntegration(c.Name(), integrations.WithCollectors(e)), nil
+	if cfg.DisableDefaultMetrics {
+		// Don't include the collector metrics if the default metrics are disabled.
+		return integrations.NewCollectorIntegration(cfg.Name(), integrations.WithCollectors(e)), nil
+	}
+
+	// On top of the exporter's metrics, the postgres exporter also has metrics exposed via collector package.
+	// However, these can only work for the first DSN provided. This matches the current implementation of the exporter.
+	// TODO: Once https://github.com/prometheus-community/postgres_exporter/issues/999 is addressed, update the exporter
+	// and change this.
+	c, err := collector.NewPostgresCollector(log, cfg.ExcludeDatabases, dsns[0], cfg.EnabledCollectors)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create postgres_exporter collector: %w", err)
+	}
+
+	return integrations.NewCollectorIntegration(cfg.Name(), integrations.WithCollectors(e, c)), nil
 }
diff --git a/internal/vcs/git.go b/internal/vcs/git.go
index 788c1029f785..41bd20949070 100644
--- a/internal/vcs/git.go
+++ b/internal/vcs/git.go
@@ -86,28 +86,18 @@ func NewGitRepo(ctx context.Context, storagePath string, opts GitRepoOptions) (*
 			}
 	}
 
-	// Finally, hard reset to our requested revision.
-	hash, err := findRevision(opts.Revision, repo)
-	if err != nil {
-		return nil, InvalidRevisionError{Revision: opts.Revision}
-	}
-
-	workTree, err := repo.Worktree()
-	if err != nil {
-		return nil, err
-	}
-	err = workTree.Reset(&git.ResetOptions{
-		Commit: hash,
-		Mode:   git.HardReset,
-	})
-	if err != nil {
-		return nil, err
+	checkoutErr := checkout(opts.Revision, repo)
+	if checkoutErr != nil {
+		return nil, UpdateFailedError{
+			Repository: opts.Repository,
+			Inner:      checkoutErr,
+		}
 	}
 
 	return &GitRepo{
 		opts:     opts,
 		repo:     repo,
-		workTree: workTree,
+		workTree: wt,
 	}, err
 }
 
@@ -119,7 +109,6 @@ func isRepoCloned(dir string) bool {
 // Update updates the repository by pulling new content and re-checking out to
 // latest version of Revision.
 func (repo *GitRepo) Update(ctx context.Context) error {
-	var err error
 	pullRepoErr := repo.workTree.PullContext(ctx, &git.PullOptions{
 		RemoteName: "origin",
 		Force:      true,
@@ -132,17 +121,12 @@ func (repo *GitRepo) Update(ctx context.Context) error {
 		}
 	}
 
-	// Find the latest revision being requested and hard-reset to it.
-	hash, err := findRevision(repo.opts.Revision, repo.repo)
-	if err != nil {
-		return InvalidRevisionError{Revision: repo.opts.Revision}
-	}
-	err = repo.workTree.Reset(&git.ResetOptions{
-		Commit: hash,
-		Mode:   git.HardReset,
-	})
-	if err != nil {
-		return err
+	checkoutErr := checkout(repo.opts.Revision, repo.repo)
+	if checkoutErr != nil {
+		return UpdateFailedError{
+			Repository: repo.opts.Repository,
+			Inner:      checkoutErr,
+		}
 	}
 
 	return nil
@@ -186,24 +170,41 @@ func (repo *GitRepo) CurrentRevision() (string, error) {
 	return ref.Hash().String(), nil
 }
 
-func findRevision(rev string, repo *git.Repository) (plumbing.Hash, error) {
+// Depending on the type of revision we need to handle checkout differently.
+// Tags are checked out as branches
+// Branches as branches
+// Commits are commits
+func checkout(rev string, repo *git.Repository) error {
 	// Try looking for the revision in the following order:
 	//
 	// 1. Search by tag name.
 	// 2. Search by remote ref name.
 	// 3. Try to resolve the revision directly.
+	wt, err := repo.Worktree()
+	if err != nil {
+		return err
+	}
 
 	if tagRef, err := repo.Tag(rev); err == nil {
-		return tagRef.Hash(), nil
+		return wt.Checkout(&git.CheckoutOptions{
+			Branch: tagRef.Name(),
+			Force:  true,
+		})
 	}
 
 	if remoteRef, err := repo.Reference(plumbing.NewRemoteReferenceName("origin", rev), true); err == nil {
-		return remoteRef.Hash(), nil
+		return wt.Checkout(&git.CheckoutOptions{
+			Branch: remoteRef.Name(),
+			Force:  true,
+		})
 	}
 
 	if hash, err := repo.ResolveRevision(plumbing.Revision(rev)); err == nil {
-		return *hash, nil
+		return wt.Checkout(&git.CheckoutOptions{
+			Hash:  *hash,
+			Force: true,
+		})
 	}
 
-	return plumbing.ZeroHash, plumbing.ErrReferenceNotFound
+	return plumbing.ErrReferenceNotFound
 }
diff --git a/operations/agent-flow-mixin/alerts.libsonnet b/operations/agent-flow-mixin/alerts.libsonnet
index d1473e605ed4..d8e247fb1326 100644
--- a/operations/agent-flow-mixin/alerts.libsonnet
+++ b/operations/agent-flow-mixin/alerts.libsonnet
@@ -3,6 +3,7 @@
     groups+: [
       (import './alerts/clustering.libsonnet'),
       (import './alerts/controller.libsonnet'),
+      (import './alerts/opentelemetry.libsonnet'),
     ],
   },
 }
diff --git a/operations/agent-flow-mixin/alerts/controller.libsonnet b/operations/agent-flow-mixin/alerts/controller.libsonnet
index 3aeb5eabbb10..5e3454ecb2c8 100644
--- a/operations/agent-flow-mixin/alerts/controller.libsonnet
+++ b/operations/agent-flow-mixin/alerts/controller.libsonnet
@@ -6,7 +6,7 @@ alert.newGroup(
     // Component evaluations are taking too long, which can lead to e.g. stale targets.
     alert.newRule(
       'SlowComponentEvaluations',
-      'sum by (cluster, namespace, component_id) (rate(agent_component_evaluation_slow_seconds[10m])) > 0',
+      'sum by (cluster, namespace, component_path, component_id) (rate(agent_component_evaluation_slow_seconds[10m])) > 0',
       'Flow component evaluations are taking too long.',
       '15m',
     ),
diff --git a/operations/agent-flow-mixin/dashboards/controller.libsonnet b/operations/agent-flow-mixin/dashboards/controller.libsonnet
index ec059de98189..e58aa00e2a47 100644
--- a/operations/agent-flow-mixin/dashboards/controller.libsonnet
+++ b/operations/agent-flow-mixin/dashboards/controller.libsonnet
@@ -264,10 +264,10 @@ local filename = 'agent-flow-controller.json';
         panel.withQueries([
           panel.newQuery(
             expr=|||
-              sum by (component_id) (rate(agent_component_evaluation_slow_seconds{cluster="$cluster", namespace="$namespace"}[$__rate_interval]))
+              sum by (component_path, component_id) (rate(agent_component_evaluation_slow_seconds{cluster="$cluster", namespace="$namespace"}[$__rate_interval]))
               / scalar(sum(rate(agent_component_evaluation_seconds_sum{cluster="$cluster", namespace="$namespace"}[$__rate_interval])))
             |||,
-            legendFormat='{{component_id}}',
+            legendFormat='{{component path}} {{component_id}}',
           ),
         ])
       ),
diff --git a/operations/agent-flow-mixin/dashboards/prometheus.libsonnet b/operations/agent-flow-mixin/dashboards/prometheus.libsonnet
index 21ae79f3b063..d88f41e82662 100644
--- a/operations/agent-flow-mixin/dashboards/prometheus.libsonnet
+++ b/operations/agent-flow-mixin/dashboards/prometheus.libsonnet
@@ -105,13 +105,13 @@ local remoteWritePanels(y_offset) = [
     panel.withQueries([
       panel.newQuery(
         expr=|||
-          sum by (instance, component_id) (
-            prometheus_remote_storage_highest_timestamp_in_seconds{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component"}
+          sum by (instance, component_path, component_id) (
+            prometheus_remote_storage_highest_timestamp_in_seconds{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component"}
             - ignoring(url, remote_name) group_right(instance)
-            prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}
+            prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}
           )
         |||,
-        legendFormat='{{instance}} / {{component_id}}',
+        legendFormat='{{instance}} / {{component_path}} {{component_id}}',
       ),
     ])
   ),
@@ -130,11 +130,11 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           sum without (remote_name, url) (
-              rate(prometheus_remote_storage_bytes_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}[$__rate_interval]) +
-              rate(prometheus_remote_storage_metadata_bytes_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}[$__rate_interval])
+              rate(prometheus_remote_storage_bytes_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}[$__rate_interval]) +
+              rate(prometheus_remote_storage_metadata_bytes_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}[$__rate_interval])
           )
         |||,
-        legendFormat='{{instance}} / {{component_id}}',
+        legendFormat='{{instance}} / {{component_path}} {{component_id}}',
       ),
     ])
   ),
@@ -152,7 +152,7 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           histogram_quantile(0.99, sum by (le) (
-            rate(prometheus_remote_storage_sent_batch_duration_seconds_bucket{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_id=~"$component", url=~"$url"}[$__rate_interval])
+            rate(prometheus_remote_storage_sent_batch_duration_seconds_bucket{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}[$__rate_interval])
           ))
         |||,
         legendFormat='99th percentile',
@@ -160,15 +160,15 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           histogram_quantile(0.50, sum by (le) (
-            rate(prometheus_remote_storage_sent_batch_duration_seconds_bucket{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_id=~"$component", url=~"$url"}[$__rate_interval])
+            rate(prometheus_remote_storage_sent_batch_duration_seconds_bucket{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}[$__rate_interval])
           ))
         |||,
         legendFormat='50th percentile',
       ),
       panel.newQuery(
         expr=|||
-          sum(rate(prometheus_remote_storage_sent_batch_duration_seconds_sum{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_id=~"$component"}[$__rate_interval])) /
-          sum(rate(prometheus_remote_storage_sent_batch_duration_seconds_count{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_id=~"$component"}[$__rate_interval]))
+          sum(rate(prometheus_remote_storage_sent_batch_duration_seconds_sum{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_path=~"$component_path", component_id=~"$component"}[$__rate_interval])) /
+          sum(rate(prometheus_remote_storage_sent_batch_duration_seconds_count{cluster="$cluster",namespace="$namespace",instance=~"$instance", component_path=~"$component_path", component_id=~"$component"}[$__rate_interval]))
         |||,
         legendFormat='Average',
       ),
@@ -223,15 +223,15 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           sum without (remote_name, url) (
-              prometheus_remote_storage_shards{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}
+              prometheus_remote_storage_shards{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}
           )
         |||,
-        legendFormat='{{instance}} / {{component_id}}',
+        legendFormat='{{instance}} / {{component_path}} {{component_id}}',
       ),
       panel.newQuery(
         expr=|||
           min (
-              prometheus_remote_storage_shards_min{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}
+              prometheus_remote_storage_shards_min{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}
           )
         |||,
         legendFormat='Minimum',
@@ -239,7 +239,7 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           max (
-              prometheus_remote_storage_shards_max{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}
+              prometheus_remote_storage_shards_max{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}
           )
         |||,
         legendFormat='Maximum',
@@ -260,10 +260,10 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           sum without (url, remote_name) (
-            rate(prometheus_remote_storage_samples_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}[$__rate_interval])
+            rate(prometheus_remote_storage_samples_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}[$__rate_interval])
           )
         |||,
-        legendFormat='{{instance}} / {{component_id}}',
+        legendFormat='{{instance}} / {{component_path}} {{component_id}}',
       ),
     ])
   ),
@@ -282,10 +282,10 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           sum without (url,remote_name) (
-            rate(prometheus_remote_storage_samples_failed_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}[$__rate_interval])
+            rate(prometheus_remote_storage_samples_failed_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}[$__rate_interval])
           )
         |||,
-        legendFormat='{{instance}} / {{component_id}}',
+        legendFormat='{{instance}} / {{component_path}} {{component_id}}',
       ),
     ])
   ),
@@ -304,10 +304,10 @@ local remoteWritePanels(y_offset) = [
       panel.newQuery(
         expr=|||
           sum without (url,remote_name) (
-            rate(prometheus_remote_storage_samples_retried_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"}[$__rate_interval])
+            rate(prometheus_remote_storage_samples_retried_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"}[$__rate_interval])
           )
         |||,
-        legendFormat='{{instance}} / {{component_id}}',
+        legendFormat='{{instance}} / {{component_path}} {{component_id}}',
       ),
     ])
   ),
@@ -333,7 +333,7 @@ local remoteWritePanels(y_offset) = [
     panel.withQueries([
       panel.newQuery(
         expr=|||
-          sum(agent_wal_storage_active_series{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"$component", url=~"$url"})
+          sum(agent_wal_storage_active_series{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_path=~"$component_path", component_id=~"$component", url=~"$url"})
         |||,
         legendFormat='Series',
       ),
@@ -356,9 +356,9 @@ local remoteWritePanels(y_offset) = [
     panel.withQueries([
       panel.newQuery(
         expr=|||
-          agent_wal_storage_active_series{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id!="", component_id=~"$component", url=~"$url"}
+          agent_wal_storage_active_series{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id!="", component_path=~"$component_path", component_id=~"$component", url=~"$url"}
         |||,
-        legendFormat='{{instance}} / {{component_id}}',
+        legendFormat='{{instance}} / {{component_path}} {{component_id}}',
       ),
     ])
   ),
@@ -379,9 +379,9 @@ local remoteWritePanels(y_offset) = [
     panel.withQueries([
       panel.newQuery(
         expr=|||
-          sum by (component_id) (agent_wal_storage_active_series{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id!="", component_id=~"$component", url=~"$url"})
+          sum by (component_path, component_id) (agent_wal_storage_active_series{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id!="", component_path=~"$component_path", component_id=~"$component", url=~"$url"})
         |||,
-        legendFormat='{{component_id}}',
+        legendFormat='{{component_path}} {{component_id}}',
       ),
     ])
   ),
@@ -406,6 +406,9 @@ local remoteWritePanels(y_offset) = [
       dashboard.newMultiTemplateVariable('instance', |||
         label_values(agent_component_controller_running_components{cluster="$cluster", namespace="$namespace"}, instance)
       |||),
+      dashboard.newMultiTemplateVariable('component_path', |||
+        label_values(agent_wal_samples_appended_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"prometheus\\.remote_write\\..*", component_path=~".*"}, component_path)
+      |||),
       dashboard.newMultiTemplateVariable('component', |||
         label_values(agent_wal_samples_appended_total{cluster="$cluster", namespace="$namespace", instance=~"$instance", component_id=~"prometheus\\.remote_write\\..*"}, component_id)
       |||),
diff --git a/operations/helm/charts/grafana-agent/ci/nonroot-values.yaml b/operations/helm/charts/grafana-agent/ci/nonroot-values.yaml
new file mode 100644
index 000000000000..be6b79d0dd2d
--- /dev/null
+++ b/operations/helm/charts/grafana-agent/ci/nonroot-values.yaml
@@ -0,0 +1,7 @@
+global:
+  podSecurityContext:
+    fsGroup: 473
+agent:
+  securityContext:
+    runAsUser: 473
+    runAsGroup: 473
diff --git a/operations/helm/tests/nonroot/grafana-agent/templates/configmap.yaml b/operations/helm/tests/nonroot/grafana-agent/templates/configmap.yaml
new file mode 100644
index 000000000000..2fdc6f011777
--- /dev/null
+++ b/operations/helm/tests/nonroot/grafana-agent/templates/configmap.yaml
@@ -0,0 +1,42 @@
+---
+# Source: grafana-agent/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: grafana-agent
+  labels:
+    helm.sh/chart: grafana-agent
+    app.kubernetes.io/name: grafana-agent
+    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/version: "vX.Y.Z"
+    app.kubernetes.io/managed-by: Helm
+data:
+  config.river: |-
+    logging {
+    	level  = "info"
+    	format = "logfmt"
+    }
+    
+    discovery.kubernetes "pods" {
+    	role = "pod"
+    }
+    
+    discovery.kubernetes "nodes" {
+    	role = "node"
+    }
+    
+    discovery.kubernetes "services" {
+    	role = "service"
+    }
+    
+    discovery.kubernetes "endpoints" {
+    	role = "endpoints"
+    }
+    
+    discovery.kubernetes "endpointslices" {
+    	role = "endpointslice"
+    }
+    
+    discovery.kubernetes "ingresses" {
+    	role = "ingress"
+    }
diff --git a/operations/helm/tests/nonroot/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/nonroot/grafana-agent/templates/controllers/daemonset.yaml
new file mode 100644
index 000000000000..561529b57548
--- /dev/null
+++ b/operations/helm/tests/nonroot/grafana-agent/templates/controllers/daemonset.yaml
@@ -0,0 +1,81 @@
+---
+# Source: grafana-agent/templates/controllers/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: grafana-agent
+  labels:
+    helm.sh/chart: grafana-agent
+    app.kubernetes.io/name: grafana-agent
+    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/version: "vX.Y.Z"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  minReadySeconds: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: grafana-agent
+      app.kubernetes.io/instance: grafana-agent
+  template:
+    metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: grafana-agent
+      labels:
+        app.kubernetes.io/name: grafana-agent
+        app.kubernetes.io/instance: grafana-agent
+    spec:
+      securityContext:
+        fsGroup: 473
+      serviceAccountName: grafana-agent
+      containers:
+        - name: grafana-agent
+          image: docker.io/grafana/agent:v0.40.3
+          imagePullPolicy: IfNotPresent
+          args:
+            - run
+            - /etc/agent/config.river
+            - --storage.path=/tmp/agent
+            - --server.http.listen-addr=0.0.0.0:80
+            - --server.http.ui-path-prefix=/
+          env:
+            - name: AGENT_MODE
+              value: flow
+            - name: AGENT_DEPLOY_MODE
+              value: "helm"
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          ports:
+            - containerPort: 80
+              name: http-metrics
+          readinessProbe:
+            httpGet:
+              path: /-/ready
+              port: 80
+              scheme: HTTP
+            initialDelaySeconds: 10
+            timeoutSeconds: 1
+          securityContext:
+            runAsGroup: 473
+            runAsUser: 473
+          volumeMounts:
+            - name: config
+              mountPath: /etc/agent
+        - name: config-reloader
+          image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
+          args:
+            - --volume-dir=/etc/agent
+            - --webhook-url=http://localhost:80/-/reload
+          volumeMounts:
+            - name: config
+              mountPath: /etc/agent
+          resources:
+            requests:
+              cpu: 1m
+              memory: 5Mi
+      dnsPolicy: ClusterFirst
+      volumes:
+        - name: config
+          configMap:
+            name: grafana-agent
diff --git a/operations/helm/tests/nonroot/grafana-agent/templates/rbac.yaml b/operations/helm/tests/nonroot/grafana-agent/templates/rbac.yaml
new file mode 100644
index 000000000000..3765583fb64f
--- /dev/null
+++ b/operations/helm/tests/nonroot/grafana-agent/templates/rbac.yaml
@@ -0,0 +1,117 @@
+---
+# Source: grafana-agent/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: grafana-agent
+  labels:
+    helm.sh/chart: grafana-agent
+    app.kubernetes.io/name: grafana-agent
+    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/version: "vX.Y.Z"
+    app.kubernetes.io/managed-by: Helm
+rules:
+  # Rules which allow discovery.kubernetes to function.
+  - apiGroups:
+      - ""
+      - "discovery.k8s.io"
+      - "networking.k8s.io"
+    resources:
+      - endpoints
+      - endpointslices
+      - ingresses
+      - nodes
+      - nodes/proxy
+      - nodes/metrics
+      - pods
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  # Rules which allow loki.source.kubernetes and loki.source.podlogs to work.
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+      - pods/log
+      - namespaces
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "monitoring.grafana.com"
+    resources:
+      - podlogs
+    verbs:
+      - get
+      - list
+      - watch
+  # Rules which allow mimir.rules.kubernetes to work.
+  - apiGroups: ["monitoring.coreos.com"]
+    resources:
+      - prometheusrules
+    verbs:
+      - get
+      - list
+      - watch
+  - nonResourceURLs:
+      - /metrics
+    verbs:
+      - get
+  # Rules for prometheus.kubernetes.*
+  - apiGroups: ["monitoring.coreos.com"]
+    resources:
+      - podmonitors
+      - servicemonitors
+      - probes
+    verbs:
+      - get
+      - list
+      - watch
+  # Rules which allow eventhandler to work.
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - get
+      - list
+      - watch
+  # needed for remote.kubernetes.*
+  - apiGroups: [""]
+    resources:
+      - "configmaps"
+      - "secrets"
+    verbs:
+      - get
+      - list
+      - watch
+  # needed for otelcol.processor.k8sattributes
+  - apiGroups: ["apps"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["extensions"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
+---
+# Source: grafana-agent/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: grafana-agent
+  labels:
+    helm.sh/chart: grafana-agent
+    app.kubernetes.io/name: grafana-agent
+    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/version: "vX.Y.Z"
+    app.kubernetes.io/managed-by: Helm
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: grafana-agent
+subjects:
+  - kind: ServiceAccount
+    name: grafana-agent
+    namespace: default
diff --git a/operations/helm/tests/nonroot/grafana-agent/templates/service.yaml b/operations/helm/tests/nonroot/grafana-agent/templates/service.yaml
new file mode 100644
index 000000000000..c98f79428b29
--- /dev/null
+++ b/operations/helm/tests/nonroot/grafana-agent/templates/service.yaml
@@ -0,0 +1,23 @@
+---
+# Source: grafana-agent/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: grafana-agent
+  labels:
+    helm.sh/chart: grafana-agent
+    app.kubernetes.io/name: grafana-agent
+    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/version: "vX.Y.Z"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  type: ClusterIP
+  selector:
+    app.kubernetes.io/name: grafana-agent
+    app.kubernetes.io/instance: grafana-agent
+  internalTrafficPolicy: Cluster
+  ports:
+    - name: http-metrics
+      port: 80
+      targetPort: 80
+      protocol: "TCP"
diff --git a/operations/helm/tests/nonroot/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/nonroot/grafana-agent/templates/serviceaccount.yaml
new file mode 100644
index 000000000000..65d7e0df383f
--- /dev/null
+++ b/operations/helm/tests/nonroot/grafana-agent/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: grafana-agent/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: grafana-agent
+  namespace: default
+  labels:
+    helm.sh/chart: grafana-agent
+    app.kubernetes.io/name: grafana-agent
+    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/version: "vX.Y.Z"
+    app.kubernetes.io/managed-by: Helm