Skip to content

Commit 3d4a06b

Browse files
ptodevptodev
committed
update exporter, increase timeout
1 parent dc7e391 commit 3d4a06b

File tree

8 files changed

+26
-32
lines changed

8 files changed

+26
-32
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
version: "2"
2-
# Match Makefile defaults (see GO_TAGS): Oracle collector symbols are behind godror; gore2regex is required elsewhere.
2+
# Match Makefile defaults (see GO_TAGS): gore2regex is required for loki.secretfilter (go-re2).
33
run:
44
build-tags:
55
- gore2regex
6-
- godror
76
linters:
87
enable:
98
- depguard # Allow/denylist specific imports

‎Makefile‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@ ifeq ($(filter gore2regex,$(GO_TAGS)),)
132132
override GO_TAGS := $(strip gore2regex $(GO_TAGS))
133133
endif
134134

135-
# oracle-db-appdev-monitoring/collector gates connect() behind //go:build goora or godror.
136-
# Default godror matches historical Agent/static behavior (Oracle Instant Client via ODPI-C).
137-
# TODO: Use go-ora instead. It is pure-Go and has no external dependencies.
138-
ifeq ($(filter goora godror,$(GO_TAGS)),)
139-
override GO_TAGS := $(strip godror $(GO_TAGS))
140-
endif
141-
142135
# GOFLAGS is split on spaces; each token must be a full flag. Use commas inside -tags=...
143136
# (same meaning as "go build -tags \"a b\"") so multiple tags are not parsed as extra GOFLAGS.
144137
empty :=

‎collector/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module github.com/grafana/alloy/otel_engine
44

5-
go 1.25.9
5+
go 1.26.2
66

77
require (
88
github.com/grafana/alloy v0.0.0-00010101000000-000000000000
@@ -575,7 +575,7 @@ require (
575575
github.com/hashicorp/memberlist v0.5.3 // indirect
576576
github.com/hashicorp/nomad/api v0.0.0-20260106084653-e8f2200c7039 // indirect
577577
github.com/hashicorp/serf v0.10.2 // indirect
578-
github.com/hashicorp/vault/api v1.22.0 // indirect
578+
github.com/hashicorp/vault/api v1.23.0 // indirect
579579
github.com/hashicorp/vault/api/auth/approle v0.2.0 // indirect
580580
github.com/hashicorp/vault/api/auth/aws v0.2.0 // indirect
581581
github.com/hashicorp/vault/api/auth/azure v0.2.0 // indirect
@@ -766,8 +766,8 @@ require (
766766
github.com/opentracing-contrib/go-stdlib v1.1.0 // indirect
767767
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
768768
github.com/openzipkin/zipkin-go v0.4.3 // indirect
769-
github.com/oracle/oci-go-sdk/v65 v65.108.3 // indirect
770-
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260323143131-1e9bbcecf9eb // indirect
769+
github.com/oracle/oci-go-sdk/v65 v65.109.3 // indirect
770+
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260413171504-7b49f3dca8a2 // indirect
771771
github.com/oschwald/geoip2-golang v1.13.0 // indirect
772772
github.com/oschwald/maxminddb-golang v1.13.1 // indirect
773773
github.com/outcaste-io/ristretto v0.2.3 // indirect

‎collector/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,8 +1351,8 @@ github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpT
13511351
github.com/hashicorp/serf v0.10.2 h1:m5IORhuNSjaxeljg5DeQVDlQyVkhRIjJDimbkCa8aAc=
13521352
github.com/hashicorp/serf v0.10.2/go.mod h1:T1CmSGfSeGfnfNy/w0odXQUR1rfECGd2Qdsp84DjOiY=
13531353
github.com/hashicorp/vault/api v1.7.2/go.mod h1:xbfA+1AvxFseDzxxdWaL0uO99n1+tndus4GCrtouy0M=
1354-
github.com/hashicorp/vault/api v1.22.0 h1:+HYFquE35/B74fHoIeXlZIP2YADVboaPjaSicHEZiH0=
1355-
github.com/hashicorp/vault/api v1.22.0/go.mod h1:IUZA2cDvr4Ok3+NtK2Oq/r+lJeXkeCrHRmqdyWfpmGM=
1354+
github.com/hashicorp/vault/api v1.23.0 h1:gXgluBsSECfRWTSW9niY2jwg2e9mMJc4WoHNv4g3h6A=
1355+
github.com/hashicorp/vault/api v1.23.0/go.mod h1:zransKiB9ftp+kgY8ydjnvCU7Wk8i9L0DYWpXeMj9ko=
13561356
github.com/hashicorp/vault/api/auth/approle v0.2.0 h1:mdNYwDRp+tqvJmyfbkaHLLePGYDY27mOFtBZBb7va/I=
13571357
github.com/hashicorp/vault/api/auth/approle v0.2.0/go.mod h1:w4PwYaLJmGq0cMss0ZAV9b49vcrpB6SKxMMLUp4voR8=
13581358
github.com/hashicorp/vault/api/auth/azure v0.2.0 h1:C8dr30RoSC2zSqm1Tzow1xwlSUmAOkrP0R7ubu9nvvU=
@@ -2054,10 +2054,10 @@ github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:Ff
20542054
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
20552055
github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=
20562056
github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c=
2057-
github.com/oracle/oci-go-sdk/v65 v65.108.3 h1:n2G4QwGoRNhtLE8r24/+Ny+WpEMdc9ggGpnPvVYM2Yk=
2058-
github.com/oracle/oci-go-sdk/v65 v65.108.3/go.mod h1:8ZzvzuEG/cFLFZhxg/Mg1w19KqyXBKO3c17QIc5PkGs=
2059-
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260323143131-1e9bbcecf9eb h1:TbI1NIWsdic2QXMn3hb1+8+61PKcfxQTIxA0gH5QU9o=
2060-
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260323143131-1e9bbcecf9eb/go.mod h1:rkImCmOnNucvMbN6/mRLiR9fy8hVJ8uXBHUWyDmzOxw=
2057+
github.com/oracle/oci-go-sdk/v65 v65.109.3 h1:skGlnuS7aOUEEaNDuDqeXCp7iBcFXvc697UKg25CtMI=
2058+
github.com/oracle/oci-go-sdk/v65 v65.109.3/go.mod h1:8ZzvzuEG/cFLFZhxg/Mg1w19KqyXBKO3c17QIc5PkGs=
2059+
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260413171504-7b49f3dca8a2 h1:90LGtsldfmejEMitPVQY+eLhv0Wv9kn0c5EzJAcWTaM=
2060+
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260413171504-7b49f3dca8a2/go.mod h1:UbuT8hGiBBdrum1O+CAlyi9ySrleLNG46JWsXi2laKo=
20612061
github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI=
20622062
github.com/oschwald/geoip2-golang v1.13.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=
20632063
github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/grafana/alloy
22

3-
go 1.25.9
3+
go 1.26.2
44

55
// This local replace is required for local development and testing of the syntax submodule.
66
// It is intentionally kept outside the generated block to avoid being overwritten by dependency management tools.
@@ -90,7 +90,7 @@ require (
9090
github.com/hashicorp/go-multierror v1.1.1
9191
github.com/hashicorp/golang-lru v1.0.2
9292
github.com/hashicorp/golang-lru/v2 v2.0.7
93-
github.com/hashicorp/vault/api v1.22.0
93+
github.com/hashicorp/vault/api v1.23.0
9494
github.com/hashicorp/vault/api/auth/approle v0.2.0
9595
github.com/hashicorp/vault/api/auth/aws v0.2.0
9696
github.com/hashicorp/vault/api/auth/azure v0.2.0
@@ -179,7 +179,7 @@ require (
179179
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.147.0
180180
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.147.0
181181
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.147.0
182-
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260323143131-1e9bbcecf9eb
182+
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260413171504-7b49f3dca8a2
183183
github.com/ory/dockertest/v3 v3.12.0
184184
github.com/oschwald/geoip2-golang v1.13.0
185185
github.com/oschwald/maxminddb-golang v1.13.1
@@ -805,7 +805,7 @@ require (
805805
github.com/opentracing-contrib/go-stdlib v1.1.0 // indirect
806806
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
807807
github.com/openzipkin/zipkin-go v0.4.3 // indirect
808-
github.com/oracle/oci-go-sdk/v65 v65.108.3 // indirect
808+
github.com/oracle/oci-go-sdk/v65 v65.109.3 // indirect
809809
github.com/outcaste-io/ristretto v0.2.3 // indirect
810810
github.com/ovh/go-ovh v1.9.0 // indirect
811811
github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,8 +1387,8 @@ github.com/hashicorp/serf v0.10.2 h1:m5IORhuNSjaxeljg5DeQVDlQyVkhRIjJDimbkCa8aAc
13871387
github.com/hashicorp/serf v0.10.2/go.mod h1:T1CmSGfSeGfnfNy/w0odXQUR1rfECGd2Qdsp84DjOiY=
13881388
github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q=
13891389
github.com/hashicorp/vault/api v1.7.2/go.mod h1:xbfA+1AvxFseDzxxdWaL0uO99n1+tndus4GCrtouy0M=
1390-
github.com/hashicorp/vault/api v1.22.0 h1:+HYFquE35/B74fHoIeXlZIP2YADVboaPjaSicHEZiH0=
1391-
github.com/hashicorp/vault/api v1.22.0/go.mod h1:IUZA2cDvr4Ok3+NtK2Oq/r+lJeXkeCrHRmqdyWfpmGM=
1390+
github.com/hashicorp/vault/api v1.23.0 h1:gXgluBsSECfRWTSW9niY2jwg2e9mMJc4WoHNv4g3h6A=
1391+
github.com/hashicorp/vault/api v1.23.0/go.mod h1:zransKiB9ftp+kgY8ydjnvCU7Wk8i9L0DYWpXeMj9ko=
13921392
github.com/hashicorp/vault/api/auth/approle v0.2.0 h1:mdNYwDRp+tqvJmyfbkaHLLePGYDY27mOFtBZBb7va/I=
13931393
github.com/hashicorp/vault/api/auth/approle v0.2.0/go.mod h1:w4PwYaLJmGq0cMss0ZAV9b49vcrpB6SKxMMLUp4voR8=
13941394
github.com/hashicorp/vault/api/auth/azure v0.2.0 h1:C8dr30RoSC2zSqm1Tzow1xwlSUmAOkrP0R7ubu9nvvU=
@@ -2062,10 +2062,10 @@ github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:Ff
20622062
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
20632063
github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=
20642064
github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c=
2065-
github.com/oracle/oci-go-sdk/v65 v65.108.3 h1:n2G4QwGoRNhtLE8r24/+Ny+WpEMdc9ggGpnPvVYM2Yk=
2066-
github.com/oracle/oci-go-sdk/v65 v65.108.3/go.mod h1:8ZzvzuEG/cFLFZhxg/Mg1w19KqyXBKO3c17QIc5PkGs=
2067-
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260323143131-1e9bbcecf9eb h1:TbI1NIWsdic2QXMn3hb1+8+61PKcfxQTIxA0gH5QU9o=
2068-
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260323143131-1e9bbcecf9eb/go.mod h1:rkImCmOnNucvMbN6/mRLiR9fy8hVJ8uXBHUWyDmzOxw=
2065+
github.com/oracle/oci-go-sdk/v65 v65.109.3 h1:skGlnuS7aOUEEaNDuDqeXCp7iBcFXvc697UKg25CtMI=
2066+
github.com/oracle/oci-go-sdk/v65 v65.109.3/go.mod h1:8ZzvzuEG/cFLFZhxg/Mg1w19KqyXBKO3c17QIc5PkGs=
2067+
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260413171504-7b49f3dca8a2 h1:90LGtsldfmejEMitPVQY+eLhv0Wv9kn0c5EzJAcWTaM=
2068+
github.com/oracle/oracle-db-appdev-monitoring v0.0.0-20260413171504-7b49f3dca8a2/go.mod h1:UbuT8hGiBBdrum1O+CAlyi9ySrleLNG46JWsXi2laKo=
20692069
github.com/ory/dockertest/v3 v3.12.0 h1:3oV9d0sDzlSQfHtIaB5k6ghUCVMVLpAY8hwrqoCyRCw=
20702070
github.com/ory/dockertest/v3 v3.12.0/go.mod h1:aKNDTva3cp8dwOWwb9cWuX84aH5akkxXRvO7KCwWVjE=
20712071
github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI=

‎integration-tests/docker/tests/oracledb/test.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
test_timeout: "10m"
2+
13
alloy_container:
24
dockerfile: Dockerfile.alloy
35

‎internal/component/prometheus/exporter/oracledb/oracledb_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// Tests for this package require the same build tags as a normal Alloy build: godror (Oracle
2-
// collector) and gore2regex (see Makefile). Use go test flags, not GO_TAGS:
1+
// Tests for this package should use the same build tags as a normal Alloy build (see Makefile),
2+
// at least gore2regex. Example:
33
//
4-
// go test -tags='gore2regex godror' .
4+
// go test -tags='gore2regex' .
55
package oracledb
66

77
import (

0 commit comments

Comments
 (0)