Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/bump-prometheus.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
component: receiver/prometheus

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Support JWT Profile for Authorization Grant (RFC 7523 3.1)

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [44381]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
2 changes: 1 addition & 1 deletion cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.3 // indirect
github.com/prometheus/common v0.67.4 // indirect
github.com/prometheus/otlptranslator v1.0.0 // indirect
github.com/prometheus/procfs v0.17.0 // indirect
github.com/rs/cors v1.11.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/opampsupervisor/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/integrationtest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.3 // indirect
github.com/prometheus/common v0.67.4 // indirect
github.com/prometheus/otlptranslator v1.0.0 // indirect
github.com/prometheus/procfs v0.17.0 // indirect
github.com/rs/cors v1.11.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/elasticsearchexporter/integrationtest/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/prometheusexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.140.1
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/client_model v0.6.2
github.com/prometheus/common v0.67.3
github.com/prometheus/common v0.67.4
github.com/prometheus/otlptranslator v1.0.0
github.com/prometheus/prometheus v0.307.3
github.com/stretchr/testify v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions exporter/prometheusexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/datadog/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ require (
github.com/prometheus/alertmanager v0.28.1 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.3 // indirect
github.com/prometheus/common v0.67.4 // indirect
github.com/prometheus/common/assets v0.2.0 // indirect
github.com/prometheus/exporter-toolkit v0.15.0 // indirect
github.com/prometheus/otlptranslator v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions internal/datadog/e2e/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions receiver/prometheusreceiver/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,53 @@ scrape_configs:
assert.Equal(t, "Bearer", scrapeConfig.HTTPClientConfig.Authorization.Type)
},
},
{
name: "oauth2 client credentials secret preservation",
configYAML: `
scrape_configs:
- job_name: "test-client-secredentialscret-auth"
oauth2:
client_id: "id-1"
client_secret: "mySuperSecretClientSecret"
token_url: "https://auth.example.com/token"
static_configs:
- targets: ["localhost:8080"]
`,
checkFn: func(t *testing.T, dst *PromConfig) {
require.Len(t, dst.ScrapeConfigs, 1)
scrapeConfig := dst.ScrapeConfigs[0]
assert.Equal(t, "test-client-secredentialscret-auth", scrapeConfig.JobName)

// The critical check: ensure the client_secret is not "<secret>"
require.NotNil(t, scrapeConfig.HTTPClientConfig.OAuth2, "basic auth should be configured")
secret := string(scrapeConfig.HTTPClientConfig.OAuth2.ClientSecret)
assert.Equal(t, "mySuperSecretClientSecret", secret, "client_secret should preserve original value")
},
},
{
name: "oauth2 jwt-bearer certificate preservation",
configYAML: `
scrape_configs:
- job_name: "test-jwt-bearer-auth"
oauth2:
client_id: "id-1"
client_certificate_key: "mySuperSecretCertificateKey"
token_url: "https://auth.example.com/token"
grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer"
static_configs:
- targets: ["localhost:8080"]
`,
checkFn: func(t *testing.T, dst *PromConfig) {
require.Len(t, dst.ScrapeConfigs, 1)
scrapeConfig := dst.ScrapeConfigs[0]
assert.Equal(t, "test-jwt-bearer-auth", scrapeConfig.JobName)

// The critical check: ensure the client_certificate_key is not "<secret>"
require.NotNil(t, scrapeConfig.HTTPClientConfig.OAuth2, "basic auth should be configured")
key := string(scrapeConfig.HTTPClientConfig.OAuth2.ClientCertificateKey)
assert.Equal(t, "mySuperSecretCertificateKey", key, "client_certificate_key should preserve original value")
},
},
}

for _, tt := range tests {
Expand Down
2 changes: 1 addition & 1 deletion receiver/prometheusreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.140.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.140.1
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/common v0.67.3
github.com/prometheus/common v0.67.4
github.com/prometheus/exporter-toolkit v0.15.0
github.com/prometheus/prometheus v0.307.3
github.com/stretchr/testify v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions receiver/prometheusreceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/purefareceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.24.0
require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.140.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.140.1
github.com/prometheus/common v0.67.3
github.com/prometheus/common v0.67.4
github.com/prometheus/prometheus v0.307.3
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/collector/component v1.46.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/purefareceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/purefbreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.24.0
require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.140.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.140.1
github.com/prometheus/common v0.67.3
github.com/prometheus/common v0.67.4
github.com/prometheus/prometheus v0.307.3
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/collector/component v1.46.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/purefbreceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/simpleprometheusreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.0

require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.140.1
github.com/prometheus/common v0.67.3
github.com/prometheus/common v0.67.4
github.com/prometheus/prometheus v0.307.3
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/collector/component v1.46.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/simpleprometheusreceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion testbed/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.140.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.140.1
github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatasenders/mockdatadogagentexporter v0.140.1
github.com/prometheus/common v0.67.3
github.com/prometheus/common v0.67.4
github.com/prometheus/prometheus v0.307.3
github.com/shirou/gopsutil/v4 v4.25.10
github.com/stretchr/testify v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions testbed/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.