Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[receiver/prometheus] feat: add Prometheus API server #33875

Merged
merged 44 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
f4a4e9a
initial changes
gracewehner Apr 11, 2024
f31b2ac
cleanup
gracewehner Apr 23, 2024
505ec93
more cleanup
gracewehner Apr 23, 2024
e9cf2b4
go fmt
gracewehner Apr 23, 2024
1e32b64
use otel standard server config
gracewehner May 7, 2024
e941d0d
cleanup and doc updates
gracewehner May 7, 2024
052b722
Merge remote-tracking branch 'origin/main' into api_extension
gracewehner Jul 2, 2024
c77db70
Merge remote-tracking branch 'upstream/main' into api_extension
gracewehner Jul 2, 2024
c487415
server in metrics_receiver
gracewehner Jul 2, 2024
d76a070
add changelog
gracewehner Jul 2, 2024
e349ddf
cleanup
gracewehner Jul 3, 2024
c5d92c9
address feedback
gracewehner Jul 26, 2024
26a7ba4
use registry
gracewehner Sep 23, 2024
7e54a90
Merge branch 'main' into api_extension
gracewehner Jan 10, 2025
376aa1d
more changes for merging from main
gracewehner Jan 10, 2025
f932c6d
fixes, additional test, and extra support for otel serverconfig compa…
gracewehner Jan 10, 2025
3c7b475
more tests and config validation
gracewehner Jan 10, 2025
d5e5491
cleanup
gracewehner Jan 10, 2025
d870be3
Merge branch 'main' into api_extension
dashpole Jan 13, 2025
a5daee4
Merge branch 'main' into api_extension
gracewehner Jan 29, 2025
fad308e
go mod tidy
gracewehner Jan 29, 2025
080bb27
fix prometheus version
gracewehner Jan 29, 2025
729d3a9
cleanup unecessary go mod changes
gracewehner Jan 29, 2025
3eb08f6
Merge branch 'main' into api_extension
gracewehner Jan 29, 2025
014a91d
merge from main again
gracewehner Jan 29, 2025
0004a50
fix other dependent package
gracewehner Jan 29, 2025
99a23d8
Merge remote-tracking branch 'origin/main' into api_extension
gracewehner Feb 13, 2025
ae63e94
work with prometheus 3.0
gracewehner Feb 13, 2025
6c73635
fix tests
gracewehner Feb 13, 2025
a5ccad6
fix one more test
gracewehner Feb 13, 2025
ac1a103
go mod tidy
gracewehner Feb 13, 2025
b50b8c1
lint fix
gracewehner Feb 13, 2025
bba77ec
Merge branch 'main' into api_extension
gracewehner Feb 13, 2025
8da47c3
feedback
gracewehner Feb 14, 2025
814f39b
Merge branch 'api_extension' of https://github.com/gracewehner/opente…
gracewehner Feb 14, 2025
d698ff6
Merge remote-tracking branch 'origin/main' into api_extension
gracewehner Feb 21, 2025
dc067b1
make gotidy
gracewehner Feb 21, 2025
eda1c2b
Merge remote-tracking branch 'origin/main' into api_extension
gracewehner Feb 21, 2025
8197887
make gotidy
gracewehner Feb 21, 2025
8c286dc
Merge remote-tracking branch 'origin/main' into api_extension
gracewehner Feb 24, 2025
c2a08fd
make gotidy
gracewehner Feb 25, 2025
f6e4359
Merge remote-tracking branch 'origin/main' into api_extension
gracewehner Mar 11, 2025
5733a21
fix new function arguments
gracewehner Mar 12, 2025
ad1e872
make gotidy
gracewehner Mar 12, 2025
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/prometheusreceiverapiserver.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. filelogreceiver)
component: receiver/prometheus

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Adds the Prometheus API server to more easily debug the Prometheus config, service discovery, and targets.

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

# (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, api]
51 changes: 45 additions & 6 deletions connector/datadogconnector/go.sum

Large diffs are not rendered by default.

26 changes: 23 additions & 3 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,11 @@ require (
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Showmax/go-fqdn v1.0.0 // indirect
github.com/alecthomas/participle/v2 v2.1.1 // indirect
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
github.com/antchfx/xmlquery v1.4.4 // indirect
github.com/antchfx/xpath v1.3.3 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.29.9 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.62 // indirect
Expand All @@ -196,6 +197,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
github.com/aws/smithy-go v1.22.2 // indirect
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
Expand All @@ -216,12 +218,14 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/ebitengine/purego v0.8.2 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/elastic/go-grok v0.3.1 // indirect
github.com/elastic/lunes v0.1.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
github.com/expr-lang/expr v1.16.9 // indirect
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
Expand All @@ -231,10 +235,16 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/analysis v0.22.2 // indirect
github.com/go-openapi/errors v0.22.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/loads v0.21.5 // indirect
github.com/go-openapi/spec v0.20.14 // indirect
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-resty/resty/v2 v2.13.1 // indirect
github.com/go-openapi/validate v0.23.0 // indirect
github.com/go-resty/resty/v2 v2.15.3 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/go-zookeeper/zk v1.0.4 // indirect
github.com/gobwas/glob v0.2.3 // indirect
Expand Down Expand Up @@ -271,7 +281,7 @@ require (
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3 // indirect
github.com/hashicorp/nomad/api v0.0.0-20241218080744-e3ac00f30eec // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
github.com/hetznercloud/hcloud-go/v2 v2.13.1 // indirect
Expand All @@ -283,6 +293,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/klauspost/compress v1.18.0 // indirect
Expand All @@ -300,6 +311,8 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mdlayher/socket v0.4.1 // indirect
github.com/mdlayher/vsock v1.2.1 // indirect
github.com/miekg/dns v1.1.62 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand All @@ -313,6 +326,7 @@ require (
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.121.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.121.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.121.0 // indirect
Expand Down Expand Up @@ -341,10 +355,13 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus-community/windows_exporter v0.27.2 // indirect
github.com/prometheus/alertmanager v0.27.0 // indirect
github.com/prometheus/client_golang v1.21.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/common/assets v0.2.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/exporter-toolkit v0.13.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/prometheus v0.300.1 // indirect
github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect
Expand All @@ -354,6 +371,7 @@ require (
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shirou/gopsutil/v4 v4.25.2 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/spf13/cobra v1.9.1 // indirect
Expand All @@ -371,6 +389,7 @@ require (
github.com/vultr/govultr/v2 v2.17.2 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector v0.121.1-0.20250307194215-7d3e03e500b0 // indirect
Expand Down Expand Up @@ -415,6 +434,7 @@ require (
go.opentelemetry.io/collector/service/hostcapabilities v0.121.1-0.20250307194215-7d3e03e500b0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.15.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
Expand Down
Loading