Skip to content

Commit f8e91c5

Browse files
blewis12blewis12
authored
Merge branch 'main' into expose-otel-subcommand-and-add-documentation
2 parents b515796 + d9a7e87 commit f8e91c5

File tree

98 files changed

+1962
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1962
-522
lines changed

‎.github/ISSUE_TEMPLATE/blank.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ body:
154154
- prometheus.exporter.catchpoint
155155
- prometheus.exporter.cloudwatch
156156
- prometheus.exporter.consul
157+
- prometheus.exporter.databricks
157158
- prometheus.exporter.dnsmasq
158159
- prometheus.exporter.elasticsearch
159160
- prometheus.exporter.gcp

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ body:
154154
- prometheus.exporter.catchpoint
155155
- prometheus.exporter.cloudwatch
156156
- prometheus.exporter.consul
157+
- prometheus.exporter.databricks
157158
- prometheus.exporter.dnsmasq
158159
- prometheus.exporter.elasticsearch
159160
- prometheus.exporter.gcp

‎.github/ISSUE_TEMPLATE/docs.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ body:
157157
- prometheus.exporter.catchpoint
158158
- prometheus.exporter.cloudwatch
159159
- prometheus.exporter.consul
160+
- prometheus.exporter.databricks
160161
- prometheus.exporter.dnsmasq
161162
- prometheus.exporter.elasticsearch
162163
- prometheus.exporter.gcp

‎.github/ISSUE_TEMPLATE/feature_request.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ body:
154154
- prometheus.exporter.catchpoint
155155
- prometheus.exporter.cloudwatch
156156
- prometheus.exporter.consul
157+
- prometheus.exporter.databricks
157158
- prometheus.exporter.dnsmasq
158159
- prometheus.exporter.elasticsearch
159160
- prometheus.exporter.gcp

‎.github/ISSUE_TEMPLATE/proposal.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ body:
154154
- prometheus.exporter.catchpoint
155155
- prometheus.exporter.cloudwatch
156156
- prometheus.exporter.consul
157+
- prometheus.exporter.databricks
157158
- prometheus.exporter.dnsmasq
158159
- prometheus.exporter.elasticsearch
159160
- prometheus.exporter.gcp

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ generate-otel-collector-distro:
273273
ifeq ($(USE_CONTAINER),1)
274274
$(RERUN_IN_CONTAINER)
275275
else
276+
@if [ -f ./collector/go.mod ]; then \
277+
cd ./collector && go mod tidy; \
278+
fi
276279
# Here we clear the GOOS and GOARCH env variables so we're not accidentally cross compiling the builder tool within generate
277280
cd ./collector && GOOS= GOARCH= BUILDER_VERSION=$(BUILDER_VERSION) go generate
278281
endif

‎collector/go.mod‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require (
4343
go.opentelemetry.io/collector/receiver v1.45.0
4444
go.opentelemetry.io/collector/receiver/otlpreceiver v0.139.0
4545
go.opentelemetry.io/collector/service v0.139.0
46-
golang.org/x/sys v0.38.0
46+
golang.org/x/sys v0.39.0
4747
)
4848

4949
require (
@@ -223,6 +223,7 @@ require (
223223
github.com/antchfx/xmlquery v1.5.0 // indirect
224224
github.com/antchfx/xpath v1.3.5 // indirect
225225
github.com/apache/arrow-go/v18 v18.4.0 // indirect
226+
github.com/apache/arrow/go/v12 v12.0.1 // indirect
226227
github.com/apache/thrift v0.22.0 // indirect
227228
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
228229
github.com/armon/go-metrics v0.4.1 // indirect
@@ -270,6 +271,7 @@ require (
270271
github.com/beevik/ntp v1.3.0 // indirect
271272
github.com/benbjohnson/clock v1.3.5 // indirect
272273
github.com/beorn7/perks v1.0.1 // indirect
274+
github.com/bitfield/gotestdox v0.2.2 // indirect
273275
github.com/blang/semver/v4 v4.0.0 // indirect
274276
github.com/bmatcuk/doublestar v1.3.4 // indirect
275277
github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
@@ -295,10 +297,12 @@ require (
295297
github.com/containerd/log v0.1.0 // indirect
296298
github.com/containerd/ttrpc v1.2.7 // indirect
297299
github.com/containers/common v0.64.2 // indirect
300+
github.com/coreos/go-oidc/v3 v3.17.0 // indirect
298301
github.com/coreos/go-semver v0.3.1 // indirect
299302
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
300303
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
301304
github.com/danieljoos/wincred v1.2.2 // indirect
305+
github.com/databricks/databricks-sql-go v1.9.0 // indirect
302306
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
303307
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
304308
github.com/deneonet/benc v1.1.7 // indirect
@@ -311,6 +315,7 @@ require (
311315
github.com/digitalocean/godo v1.168.0 // indirect
312316
github.com/dimchansky/utfbom v1.1.1 // indirect
313317
github.com/distribution/reference v0.6.0 // indirect
318+
github.com/dnephin/pflag v1.0.7 // indirect
314319
github.com/docker/docker v28.5.2+incompatible // indirect
315320
github.com/docker/go-connections v0.6.0 // indirect
316321
github.com/docker/go-units v0.5.0 // indirect
@@ -351,7 +356,7 @@ require (
351356
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
352357
github.com/go-git/go-billy/v5 v5.6.2 // indirect
353358
github.com/go-git/go-git/v5 v5.16.2 // indirect
354-
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
359+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
355360
github.com/go-kit/kit v0.13.0 // indirect
356361
github.com/go-kit/log v0.2.1 // indirect
357362
github.com/go-logfmt/logfmt v0.6.1 // indirect
@@ -406,14 +411,15 @@ require (
406411
github.com/google/btree v1.1.3 // indirect
407412
github.com/google/cadvisor v0.47.0 // indirect
408413
github.com/google/dnsmasq_exporter v0.2.1-0.20230620100026-44b14480804a // indirect
409-
github.com/google/flatbuffers v25.2.10+incompatible // indirect
414+
github.com/google/flatbuffers v25.9.23+incompatible // indirect
410415
github.com/google/gnostic-models v0.7.0 // indirect
411416
github.com/google/go-cmp v0.7.0 // indirect
412417
github.com/google/go-querystring v1.1.0 // indirect
413418
github.com/google/go-tpm v0.9.6 // indirect
414419
github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8 // indirect
415420
github.com/google/renameio/v2 v2.0.0 // indirect
416421
github.com/google/s2a-go v0.1.9 // indirect
422+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
417423
github.com/google/uuid v1.6.0 // indirect
418424
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
419425
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
@@ -428,6 +434,7 @@ require (
428434
github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 // indirect
429435
github.com/grafana/ckit v0.0.0-20251024151910-87043f5a3cf7 // indirect
430436
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 // indirect
437+
github.com/grafana/databricks-prometheus-exporter v0.0.0-20251219150331-5730cb38c831 // indirect
431438
github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb // indirect
432439
github.com/grafana/faro/pkg/go v0.0.0-20250314155512-06a06da3b8bc // indirect
433440
github.com/grafana/go-gelf/v2 v2.0.1 // indirect
@@ -464,7 +471,7 @@ require (
464471
github.com/hashicorp/go-metrics v0.5.4 // indirect
465472
github.com/hashicorp/go-msgpack v1.1.5 // indirect
466473
github.com/hashicorp/go-multierror v1.1.1 // indirect
467-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
474+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
468475
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
469476
github.com/hashicorp/go-secure-stdlib/awsutil v0.3.0 // indirect
470477
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
@@ -534,7 +541,7 @@ require (
534541
github.com/kevinburke/ssh_config v1.2.0 // indirect
535542
github.com/klauspost/asmfmt v1.3.2 // indirect
536543
github.com/klauspost/compress v1.18.2 // indirect
537-
github.com/klauspost/cpuid/v2 v2.2.11 // indirect
544+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
538545
github.com/klauspost/pgzip v1.2.6 // indirect
539546
github.com/knadh/koanf/maps v0.1.2 // indirect
540547
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
@@ -759,6 +766,7 @@ require (
759766
github.com/rivo/uniseg v0.4.7 // indirect
760767
github.com/rogpeppe/go-internal v1.14.1 // indirect
761768
github.com/rs/cors v1.11.1 // indirect
769+
github.com/rs/zerolog v1.34.0 // indirect
762770
github.com/ryanuber/go-glob v1.0.0 // indirect
763771
github.com/safchain/ethtool v0.5.10 // indirect
764772
github.com/samber/lo v1.51.0 // indirect
@@ -949,18 +957,18 @@ require (
949957
go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
950958
golang.design/x/chann v0.1.2 // indirect
951959
golang.org/x/arch v0.22.0 // indirect
952-
golang.org/x/crypto v0.45.0 // indirect
960+
golang.org/x/crypto v0.46.0 // indirect
953961
golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91 // indirect
954962
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
955-
golang.org/x/mod v0.29.0 // indirect
956-
golang.org/x/net v0.47.0 // indirect
957-
golang.org/x/oauth2 v0.32.0 // indirect
958-
golang.org/x/sync v0.18.0 // indirect
959-
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
960-
golang.org/x/term v0.37.0 // indirect
961-
golang.org/x/text v0.31.0 // indirect
963+
golang.org/x/mod v0.31.0 // indirect
964+
golang.org/x/net v0.48.0 // indirect
965+
golang.org/x/oauth2 v0.34.0 // indirect
966+
golang.org/x/sync v0.19.0 // indirect
967+
golang.org/x/telemetry v0.0.0-20251215142616-e75fd47794af // indirect
968+
golang.org/x/term v0.38.0 // indirect
969+
golang.org/x/text v0.32.0 // indirect
962970
golang.org/x/time v0.14.0 // indirect
963-
golang.org/x/tools v0.38.0 // indirect
971+
golang.org/x/tools v0.40.0 // indirect
964972
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
965973
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
966974
gonum.org/v1/gonum v0.16.0 // indirect
@@ -978,6 +986,7 @@ require (
978986
gopkg.in/warnings.v0 v0.1.2 // indirect
979987
gopkg.in/yaml.v2 v2.4.0 // indirect
980988
gopkg.in/yaml.v3 v3.0.1 // indirect
989+
gotest.tools/gotestsum v1.13.0 // indirect
981990
howett.net/plist v1.0.0 // indirect
982991
k8s.io/api v0.34.1 // indirect
983992
k8s.io/apiextensions-apiserver v0.34.1 // indirect

0 commit comments

Comments
 (0)