Merge branch 'main' of github.com:grafana/alloy into secret-filter-fuzz-testing

Author: kelnage

.drone/drone.yml

@@ -530,7 +530,7 @@ depends_on:
 - Publish Linux alloy-devel container
 - Publish Linux alloy-devel-boringcrypto container
 image_pull_secrets:
-- dockerconfigjson
+- dockerconfigjson_gar
 kind: pipeline
 name: Deploy to deployment_tools
 platform:
@@ -543,7 +543,7 @@ steps:
   - echo "grafana/alloy-dev:$(bash ./tools/image-tag-docker)" > .image-tag
   image: alpine
   name: Create .image-tag
-- image: us.gcr.io/kubernetes-dev/drone/plugins/updater
+- image: us-docker.pkg.dev/grafanalabs-global/docker-deployment-tools-prod/updater
   name: Update deployment_tools
   settings:
     config_json: |
@@ -685,6 +685,12 @@ get:
 kind: secret
 name: dockerconfigjson
 ---
+get:
+  name: .dockerconfigjson
+  path: secret/data/common/gar
+kind: secret
+name: dockerconfigjson_gar
+---
 get:
   name: .dockerconfigjson
   path: infra/data/ci/gcr-admin

.drone/pipelines/publish.jsonnet

@@ -183,7 +183,7 @@ linux_containers_jobs + windows_containers_jobs + [
     trigger: {
       ref: ['refs/heads/main'],
     },
-    image_pull_secrets: ['dockerconfigjson'],
+    image_pull_secrets: ['dockerconfigjson_gar'],
     steps: [
       {
         name: 'Create .image-tag',
@@ -196,7 +196,7 @@ linux_containers_jobs + windows_containers_jobs + [
       },
       {
         name: 'Update deployment_tools',
-        image: 'us.gcr.io/kubernetes-dev/drone/plugins/updater',
+        image: 'us-docker.pkg.dev/grafanalabs-global/docker-deployment-tools-prod/updater',
         settings: {
           config_json: |||
             {

.drone/util/secrets.jsonnet

@@ -11,6 +11,7 @@ local newSecret(name) = {
 
 {
   dockerconfigjson: newSecret('dockerconfigjson').getFrom(path='secret/data/common/gcr', name='.dockerconfigjson'),
+  dockerconfigjson_gar: newSecret('dockerconfigjson_gar').getFrom(path='secret/data/common/gar', name='.dockerconfigjson'),
   gcr_admin: newSecret('gcr_admin').getFrom(path='infra/data/ci/gcr-admin', name='.dockerconfigjson'),
 
   // Agent Github App

.github/workflows/create_build_image.yml

@@ -30,7 +30,7 @@ jobs:
       run: echo "image_tag=${FULL_TAG##*/}" >> $GITHUB_OUTPUT
 
     - name: Login to DockerHub (from vault)
-      uses: grafana/shared-workflows/actions/[email protected].0
+      uses: grafana/shared-workflows/actions/[email protected].1
 
     - run: |
        docker run --rm --privileged multiarch/qemu-user-static --reset -p yes     
@@ -58,7 +58,7 @@ jobs:
       run: echo "image_tag=${FULL_TAG##*/}-boringcrypto" >> $GITHUB_OUTPUT
 
     - name: Login to DockerHub (from vault)
-      uses: grafana/shared-workflows/actions/[email protected].0
+      uses: grafana/shared-workflows/actions/[email protected].1
 
     - run: |
        docker run --rm --privileged multiarch/qemu-user-static --reset -p yes     

CHANGELOG.md

@@ -20,6 +20,8 @@ Main (unreleased)
 
 - Add `go_table_fallback` arg to `pyroscope.ebpf` (@korniltsev)
 
+- Memory optimizations in `pyroscope.scrape` (@korniltsev)
+
 - Add the possibility to export span events as logs in `otelcol.connector.spanlogs`. (@steve-hb)
 
 - Add json format support for log export via faro receiver (@ravishankar15)
@@ -34,6 +36,7 @@ Main (unreleased)
   - Better error handling for components (@cristiangreco)
   - Add namespace to `connection_info` metric (@cristiangreco)
   - Added table columns parsing (@cristiagreco)
+  - Add enable/disable collector configurability to `database_observability.mysql`. This removes the `query_samples_enabled` argument, now configurable via enable/disable collector. (@fridgepoet)
 
 ### Bugfixes
 
@@ -49,15 +52,10 @@ Main (unreleased)
 
 - Add support for pushv1.PusherService Connect API in `pyroscope.receive_http`. (@simonswine)
 
-- Add support for path prefixes in `pyroscope.scrape` to allow scraping targets behind a proxy or with custom URL paths. (@korniltsev)
-
-- Fixes godeltaprof hiding (renaming `godeltaprof_*` profile names to regular ones). (@korniltsev)
-
-- Change profile handling in `pyroscope.receive_http` and `pyroscope.write` components to use in-memory processing instead of pipes. (@marcsanmi)
+- Fixed an issue where `loki.process` would sometimes output live debugging entries out-of-order (@thampiotr)
 
 - (_Experimental_) Fixed several out-of-memory bugs in `loki.secretfilter`. (@kelnage)
 
-
 v1.6.1
 -----------------
 
@@ -239,6 +237,8 @@ v1.5.1
 
 - For sharding targets during clustering, `loki.source.podlogs` now only takes into account some labels. (@ptodev)
 
+- Improve instrumentation of `pyroscope.relabel` component. (@marcsanmi)
+
 ### Bugfixes
 
 - Fixed an issue in the `pyroscope.write` component to prevent TLS connection churn to Pyroscope when the `pyroscope.receive_http` clients don't request keepalive (@madaraszg-tulip)

CODEOWNERS

@@ -23,4 +23,4 @@
 # Components:
 /internal/component/pyroscope/              @grafana/grafana-alloy-profiling-maintainers
 /internal/component/beyla/                  @grafana/beyla
-/internal/component/database_observability/ @cristiangreco @matthewnolf
+/internal/component/database_observability/ @cristiangreco @matthewnolf @fridgepoet

docs/sources/reference/components/database_observability/database_observability.mysql.md

@@ -23,12 +23,20 @@ database_observability.mysql "<LABEL>" {
 
 You can use the following arguments with `database_observability.mysql`:
 
-Name                    | Type                 | Description                                              | Default | Required
-------------------------|----------------------|----------------------------------------------------------|---------|---------
-`data_source_name`      | `secret`             | [Data Source Name][] for the MySQL server to connect to. |         | yes
-`forward_to`            | `list(LogsReceiver)` | Where to forward log entries after processing.           |         | yes
-`collect_interval`      | `duration`           | How frequently to collect information from database.     | `"1m"`  | no
-`query_samples_enabled` | `bool`               | Whether to enable collection of query samples.           | `true`  | no
+ Name                 | Type                 | Description                                               | Default | Required 
+----------------------|----------------------|-----------------------------------------------------------|---------|----------
+ `data_source_name`   | `secret`             | [Data Source Name][] for the MySQL server to connect to.  |         | yes      
+ `forward_to`         | `list(LogsReceiver)` | Where to forward log entries after processing.            |         | yes      
+ `collect_interval`   | `duration`           | How frequently to collect information from database.      | `"1m"`  | no       
+ `disable_collectors` | `list(string)`       | A list of collectors to disable from the default set.     |         | no       
+ `enable_collectors`  | `list(string)`       | A list of collectors to enable on top of the default set. |         | no       
+
+The following collectors are enabled by default:
+
+ Name           | Description                                           
+----------------|-------------------------------------------------------
+ `query_sample` | Collect query samples.                                
+ `schema_table` | Collect schemas and tables from `information_schema`. 
 
 ## Blocks
 

internal/component/database_observability/mysql/collector/connection_info.go

@@ -11,6 +11,8 @@ import (
 	"go.uber.org/atomic"
 )
 
+const ConnectionInfoName = "connection_info"
+
 var rdsRegex = regexp.MustCompile(`(?P<identifier>[^\.]+)\.([^\.]+)\.(?P<region>[^\.]+)\.rds\.amazonaws\.com`)
 
 type ConnectionInfoArguments struct {
@@ -44,7 +46,7 @@ func NewConnectionInfo(args ConnectionInfoArguments) (*ConnectionInfo, error) {
 }
 
 func (c *ConnectionInfo) Name() string {
-	return "ConnectionInfo"
+	return ConnectionInfoName
 }
 
 func (c *ConnectionInfo) Start(ctx context.Context) error {

internal/component/database_observability/mysql/collector/query_sample.go

@@ -21,6 +21,7 @@ import (
 const (
 	OP_QUERY_SAMPLE            = "query_sample"
 	OP_QUERY_PARSED_TABLE_NAME = "query_parsed_table_name"
+	QuerySampleName            = "query_sample"
 )
 
 const selectQuerySamples = `
@@ -67,7 +68,7 @@ func NewQuerySample(args QuerySampleArguments) (*QuerySample, error) {
 }
 
 func (c *QuerySample) Name() string {
-	return "QuerySample"
+	return QuerySampleName
 }
 
 func (c *QuerySample) Start(ctx context.Context) error {

internal/component/database_observability/mysql/collector/schema_table.go

@@ -24,6 +24,7 @@ const (
 	OP_SCHEMA_DETECTION = "schema_detection"
 	OP_TABLE_DETECTION  = "table_detection"
 	OP_CREATE_STATEMENT = "create_statement"
+	SchemaTableName     = "schema_table"
 )
 
 const (
@@ -127,7 +128,7 @@ func NewSchemaTable(args SchemaTableArguments) (*SchemaTable, error) {
 }
 
 func (c *SchemaTable) Name() string {
-	return "SchemaTable"
+	return SchemaTableName
 }
 
 func (c *SchemaTable) Start(ctx context.Context) error {