Skip to content

Commit c72e967

Browse files
markxnelsonmarkxnelson
authored
Minor updates (#75)
* update deps, fix typos, etc. --------- Signed-off-by: Mark Nelson <mark.x.nelson@oracle.com>
1 parent 2536329 commit c72e967

File tree

5 files changed

+50
-24
lines changed

5 files changed

+50
-24
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ OS_TYPE ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
33
ARCH_TYPE ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(ARCH)))
44
GOOS ?= $(shell go env GOOS)
55
GOARCH ?= $(shell go env GOARCH)
6-
VERSION ?= 1.2.0
6+
VERSION ?= 1.2.1
77
LDFLAGS := -X main.Version=$(VERSION)
88
GOFLAGS := -ldflags "$(LDFLAGS) -s -w"
99
BUILD_ARGS = --build-arg VERSION=$(VERSION)
@@ -83,7 +83,7 @@ push-images:
8383
@make --no-print-directory push-oraclelinux-image
8484

8585
docker:
86-
docker build --progress=plain $(BUILD_ARGS) -t "$(IMAGE_ID)" --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) .
86+
docker build --no-cache --progress=plain $(BUILD_ARGS) -t "$(IMAGE_ID)" --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) .
8787

8888
push-oraclelinux-image:
8989
docker push $(IMAGE_ID)

‎README.md‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ Contributions are welcome - please see [contributing](CONTRIBUTING.md).
2727

2828
## Release Notes
2929

30+
### Version 1.2.1, April 16, 2024
31+
32+
This release includes the following changes:
33+
34+
- Accept max idle and open connections settings as parameters.
35+
- Updated some third-party dependencies.
36+
3037
### Version 1.2.0, January 17, 2024
3138

3239
This release includes the following changes:
@@ -196,7 +203,7 @@ docker run -it --rm \
196203
-e DB_PASSWORD=Welcome12345 \
197204
-e DB_CONNECT_STRING=free23c:1521/freepdb \
198205
-p 9161:9161 \
199-
container-registry.oracle.com/database/observability-exporter:1.2.0
206+
container-registry.oracle.com/database/observability-exporter:1.2.1
200207
```
201208

202209
##### Using a wallet
@@ -223,7 +230,7 @@ docker run -it --rm \
223230
-e DB_CONNECT_STRING=devdb_tp \
224231
-v ./wallet:/wallet \
225232
-p 9161:9161 \
226-
container-registry.oracle.com/database/observability-exporter:1.2.0
233+
container-registry.oracle.com/database/observability-exporter:1.2.1
227234
```
228235

229236

@@ -315,7 +322,7 @@ Create a Kubernetes service to allow access to the exporter pod(s). A sample Ku
315322
Once you have made any necessary udpates, apply the file to your cluster using this command:
316323

317324
```bash
318-
kubectl aspply -f metrics-exporter-service.yaml
325+
kubectl apply -f metrics-exporter-service.yaml
319326
```
320327

321328
#### Create a Kubernetes service monitor
@@ -325,7 +332,7 @@ Create a Kubernetes service monitor to tell Prometheus (for example) to collect
325332
Once you have made any necessary udpates, apply the file to your cluster using this command:
326333

327334
```bash
328-
kubectl aspply -f metrics-service-monitor.yaml
335+
kubectl apply -f metrics-service-monitor.yaml
329336
```
330337

331338
#### Configure a Prometheus target (optional)
@@ -486,7 +493,7 @@ An exmaple of [custom metrics for Transacational Event Queues](./custom-metrics-
486493
If you run the exporter as a container image and want to include your custom metrics in the image itself, you can use the following example `Dockerfile` to create a new image:
487494

488495
```Dockerfile
489-
FROM container-registry.oracle.com/database/observability-exporter:1.2.0
496+
FROM container-registry.oracle.com/database/observability-exporter:1.2.1
490497
COPY custom-metrics.toml /
491498
ENTRYPOINT ["/oracledb_exporter", "--custom.metrics", "/custom-metrics.toml"]
492499
```

‎collector/collector.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -350,14 +350,13 @@ func (e *Exporter) connect() error {
350350

351351
level.Debug(e.logger).Log("msg", "connection properties: "+fmt.Sprint(P))
352352

353+
// note that this just configures the connection, it does not acutally connect until later
354+
// when we call db.Ping()
353355
db := sql.OpenDB(godror.NewConnector(P))
354-
// if err != nil {
355-
// level.Error(e.logger).Log("Error while connecting to", e.dsn)
356-
// return err
357-
// }
358-
level.Debug(e.logger).Log("msg", "disable go connection pooling, to allow use of oracle's instead")
359-
db.SetMaxIdleConns(0)
360-
db.SetMaxOpenConns(0)
356+
level.Debug(e.logger).Log("set max idle connections to ", e.config.MaxIdleConns)
357+
db.SetMaxIdleConns(e.config.MaxIdleConns)
358+
level.Debug(e.logger).Log("set max open connections to ", e.config.MaxOpenConns)
359+
db.SetMaxOpenConns(e.config.MaxOpenConns)
361360
db.SetConnMaxLifetime(0)
362361
level.Debug(e.logger).Log("msg", "Successfully configured connection to "+maskDsn(e.connectString))
363362
e.db = db

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require (
88
github.com/BurntSushi/toml v1.3.2
99
github.com/alecthomas/kingpin/v2 v2.4.0
1010
github.com/go-kit/log v0.2.1
11-
github.com/godror/godror v0.41.0
12-
github.com/oracle/oci-go-sdk/v65 v65.53.0
13-
github.com/prometheus/client_golang v1.18.0
14-
github.com/prometheus/common v0.45.0
11+
github.com/godror/godror v0.41.1
12+
github.com/oracle/oci-go-sdk/v65 v65.60.0
13+
github.com/prometheus/client_golang v1.19.0
14+
github.com/prometheus/common v0.49.0
1515
github.com/prometheus/exporter-toolkit v0.11.0
1616
)
1717

@@ -27,18 +27,18 @@ require (
2727
github.com/jpillora/backoff v1.0.0 // indirect
2828
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
2929
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
30-
github.com/prometheus/client_model v0.5.0 // indirect
30+
github.com/prometheus/client_model v0.6.0 // indirect
3131
github.com/prometheus/procfs v0.12.0 // indirect
3232
github.com/sony/gobreaker v0.5.0 // indirect
3333
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
34-
golang.org/x/crypto v0.17.0 // indirect
34+
golang.org/x/crypto v0.19.0 // indirect
3535
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
36-
golang.org/x/net v0.17.0 // indirect
37-
golang.org/x/oauth2 v0.12.0 // indirect
36+
golang.org/x/net v0.21.0 // indirect
37+
golang.org/x/oauth2 v0.17.0 // indirect
3838
golang.org/x/sync v0.5.0 // indirect
39-
golang.org/x/sys v0.15.0 // indirect
39+
golang.org/x/sys v0.17.0 // indirect
4040
golang.org/x/text v0.14.0 // indirect
4141
google.golang.org/appengine v1.6.7 // indirect
42-
google.golang.org/protobuf v1.31.0 // indirect
42+
google.golang.org/protobuf v1.32.0 // indirect
4343
gopkg.in/yaml.v2 v2.4.0 // indirect
4444
)

‎go.sum‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KE
2020
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
2121
github.com/godror/godror v0.41.0 h1:LVwpbfYmGrxIy7nBmv9w7VJxKlmRei6he4lyHgKCEF0=
2222
github.com/godror/godror v0.41.0/go.mod h1:i8YtVTHUJKfFT3wTat4A9UoqScUtZXiYB9Rf3SVARgc=
23+
github.com/godror/godror v0.41.1 h1:W4cLk0SOy3PYpzfRkEgdEa1TRZt2fRZTzgMP901SX80=
24+
github.com/godror/godror v0.41.1/go.mod h1:i8YtVTHUJKfFT3wTat4A9UoqScUtZXiYB9Rf3SVARgc=
2325
github.com/godror/knownpb v0.1.1 h1:A4J7jdx7jWBhJm18NntafzSC//iZDHkDi1+juwQ5pTI=
2426
github.com/godror/knownpb v0.1.1/go.mod h1:4nRFbQo1dDuwKnblRXDxrfCFYeT4hjg3GjMqef58eRE=
2527
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
@@ -43,14 +45,22 @@ github.com/oracle/oci-go-sdk/v65 v65.53.0 h1:/h+rzaRw7W1eSTeDLhSMTRnyXg1oj5NTPeB
4345
github.com/oracle/oci-go-sdk/v65 v65.53.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
4446
github.com/oracle/oci-go-sdk/v65 v65.55.1 h1:82j4YHtqeJJiOPyLKxP4/x3Oi8tv2o1etKMziY7yM7o=
4547
github.com/oracle/oci-go-sdk/v65 v65.55.1/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
48+
github.com/oracle/oci-go-sdk/v65 v65.60.0 h1:r0fFFGc7PFbj9MAAJkUY/SU+IWS7HVx7NiiPj9gKzCU=
49+
github.com/oracle/oci-go-sdk/v65 v65.60.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
4650
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4751
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4852
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
4953
github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
54+
github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
55+
github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
5056
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
5157
github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
58+
github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
59+
github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
5260
github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
5361
github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
62+
github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI=
63+
github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE=
5464
github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
5565
github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q=
5666
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
@@ -73,19 +83,27 @@ github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtX
7383
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
7484
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
7585
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
86+
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
87+
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
7688
golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
7789
golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
7890
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
7991
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
8092
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
93+
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
94+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
8195
golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
8296
golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
97+
golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
98+
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
8399
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
84100
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
85101
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
86102
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
87103
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
88104
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
105+
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
106+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
89107
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
90108
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
91109
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -98,6 +116,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
98116
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
99117
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
100118
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
119+
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
120+
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
101121
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
102122
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
103123
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 commit comments

Comments
 (0)