preparing for 1.5.3 release

LICENSE.txt

@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --
 
-Copyright (c) 2021, 2024, Oracle and/or its affiliates.
+Copyright (c) 2021, 2025, Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 

README.md

@@ -27,6 +27,23 @@ Contributions are welcome - please see [contributing](CONTRIBUTING.md).
 
 ## Release Notes
 
+### Version 1.5.3, January 28, 2025
+
+Our current priorities are support for RAC and mutliple databases (inculding #84 and #89), and intermittent connection issues
+with ADB-S when exporter is run in a container (including #169).  We expect to address these in an upcoming release.
+
+This release includes the following changes:
+
+- Fix over-zealous supression of errors when `ignorezeroresult = true` (#168).
+- When `scrapeinterval` is set, do first scrape immediately, not after the interval (#166).
+- Updated some third-party dependencies.
+
+Thank you to the following people for their suggestions and contributions:
+
+- [@redelang](https://github.com/redelang)
+
+In this release, we also started some minor code refactoring.  
+
 ### Version 1.5.2, December 2, 2024
 
 This release includes the following changes:
@@ -442,7 +459,7 @@ docker run --name free23ai \
     -d \
     -p 1521:1521 \
     -e ORACLE_PASSWORD=Welcome12345 \
-    gvenzl/oracle-free:23.5-slim-faststart
+    gvenzl/oracle-free:23.6-slim-faststart
 ```
 
 This will pull the image and start up the database with a listener on port 1521. It will also create a pluggable database (a database container) called "FREEPDB1" and will set the admin passwords to the password you specified on this command.
@@ -489,7 +506,7 @@ docker run -it --rm \
     -e DB_PASSWORD=Welcome12345 \
     -e DB_CONNECT_STRING=free23ai:1521/freepdb \
     -p 9161:9161 \
-    container-registry.oracle.com/database/observability-exporter:1.5.2
+    container-registry.oracle.com/database/observability-exporter:1.5.3
 ```
 
 ##### Using a wallet
@@ -535,7 +552,7 @@ docker run -it --rm \
     -e DB_CONNECT_STRING=devdb_tp \
     -v ./wallet:/wallet \
     -p 9161:9161 \
-    container-registry.oracle.com/database/observability-exporter:1.5.2
+    container-registry.oracle.com/database/observability-exporter:1.5.3
 ```
 > **Note:** If you are using `podman` you must specify the `:z` suffix on the volume mount so that the container will be able to access the files in the volume.  For example: `-v ./wallet:/wallet:z`
 
@@ -825,7 +842,7 @@ An exmaple of [custom metrics for Transacational Event Queues](./custom-metrics-
 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:
 
 ```Dockerfile
-FROM container-registry.oracle.com/database/observability-exporter:1.5.1
+FROM container-registry.oracle.com/database/observability-exporter:1.5.3
 COPY custom-metrics.toml /
 ENTRYPOINT ["/oracledb_exporter", "--custom.metrics", "/custom-metrics.toml"]
 ```
@@ -1010,7 +1027,7 @@ Please consult the [security guide](./SECURITY.md) for our responsible security
 
 ## License
 
-Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 
 Released under the Universal Permissive License v1.0 as shown at
 <https://oss.oracle.com/licenses/upl/>

THIRD_PARTY_LICENSES.txt

@@ -6,7 +6,8 @@ UPL-1.0
 
 ---------------------------------- Copyright -----------------------------------
 Copyright (c) 2016 Seth Miller <seth@sethmiller.me>
-Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+Copyright (c) 2016, 2025, Oracle and/or its affiliates.
+
 
 -------------------------- Fourth Party Dependencies ---------------------------
 
@@ -388,7 +389,7 @@ SOFTWARE.
 
 
 ============================================================
-github.com/google/go-cmp 
+github.com/google/go-cmp v0.4.0
 ============================================================
 Copyright (c) 2017 The Go Authors. All rights reserved.
 
@@ -454,11 +455,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 == Copyright
 Copyright (c) 2015 go-logfmt
-Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+Copyright (c) 2016, 2024 Oracle and/or its affiliates.
 Copyright (c) 2017 The Go Authors. All rights reserved.
-Copyright 2020 Tamás Gulácsi
-Copyright 2022, 2023 Tamás Gulácsi. All rights reserved.
-Copyright 2024 The Godror Authors
+Copyright 2016, 2023 Tamás Gulácsi
+Copyright 2017, 2024 The Godror Authors
 
 --------------------------------- (separator) ----------------------------------
 
@@ -512,6 +512,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Copyright (c) 2015-2020, Tim Heckman
 Copyright 2018 The Go Authors. All rights reserved.
 Copyright 2018 The Gofrs. All rights reserved.
+Copyright 2019 Tim Heckman. All rights reserved. Use of this source code is
 
 --------------------------------- (separator) ----------------------------------
 
@@ -567,9 +568,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ------------------
 
 Files: gzhttp/*
-
-Apache License Version 2.0
-SPDX:Apache-2.0
+SPDX: Apache-2.0
 
 ------------------
 
@@ -646,7 +645,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 == Copyright
 Copyright (c) 2013, Yann Collet, released under BSD License.
 Copyright (c) 2015, Pierre Curto
-Copyright (c) 2016 Caleb Spare.
+Copyright (c) 2016 Caleb Spare
 Copyright (c) 2016 Evan Huus
 Copyright (c) 2024+ Klaus Post. All rights reserved.
 Copyright 2016 The Snappy-Go Authors. All rights reserved.
@@ -783,14 +782,18 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-Apache License Version 2.0
-SPDX:Apache-2.0
+
+The Apache Software License, Version 2.0
+Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+
+SPDX: Apache-2.0
+
 
 == Copyright
-Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates.  All rights reserved.
+Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 
 == Notices
-Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
+Copyright (c) 2016, 2014, Oracle and/or its affiliates.
 
 --------------------------------- (separator) ----------------------------------
 
@@ -837,7 +840,6 @@ SPDX:Apache-2.0
 
 == Copyright
 Copyright 2012-2015 The Prometheus Authors
-Copyright 2013 Prometheus Team
 
 == Notices
 Data model artifacts for Prometheus.
@@ -856,7 +858,6 @@ github.com/prometheus/common
 SPDX:Apache-2.0
 
 == Copyright
-Copyright 2020 The Prometheus-operator Authors
 Copyright 2024 The Prometheus Authors
 
 == Notices
@@ -888,14 +889,14 @@ github.com/prometheus/procfs
 SPDX:Apache-2.0
 
 == Copyright
-Copyright 2023 Prometheus Team
-Copyright 2023 The Prometheus Authors
+Copyright 2014-2023 The Prometheus Authors
+Copyright 2017-2023 Prometheus Team
 
 == Notices
 procfs provides functions to retrieve system, kernel and process
 metrics from the pseudo-filesystem proc.
 
-Copyright 2014-2015 The Prometheus Authors
+Copyright 2014-2023 The Prometheus Authors
 
 This product includes software developed at
 SoundCloud Ltd. (http://soundcloud.com/).
@@ -921,6 +922,7 @@ github.com/xhit/go-str2duration/v2
 SPDX:BSD-3-Clause--modified-by-Google
 
 == Copyright
+Copyright (c) 2009 The Go Authors. All rights reserved.
 Copyright 2010 The Go Authors. All rights reserved.
 
 --------------------------------- (separator) ----------------------------------
@@ -1297,7 +1299,6 @@ google.golang.org/protobuf
 SPDX:BSD-3-Clause--modified-by-Google
 
 == Copyright
-Copyright 2023 Google Inc.  All rights reserved.
 Copyright 2024 The Go Authors. All rights reserved.
 
 == Patents
@@ -1354,8 +1355,10 @@ limitations under the License.
 
 
 ----------------------------------- Licenses -----------------------------------
-Apache License Version 2.0
-SPDX:Apache-2.0
+
+--------------------------------- (separator) ----------------------------------
+== SPDX:Apache-2.0
+
 
 --------------------------------- (separator) ----------------------------------
 == SPDX:BSD-3-Clause--modified-by-Google
@@ -1411,4 +1414,4 @@ SOFTWARE.
 
 === ATTRIBUTION-HELPER-GENERATED:
 === Attribution helper version: {Major:0 Minor:11 GitVersion:0.10.0-114-g3747dab9 GitCommit:3747dab92eb29c0dbe6409ffbb824b9ae3a04b87 GitTreeState:clean BuildDate:2024-05-31T13:48:06Z GoVersion:go1.21.4 Compiler:gc Platform:linux/amd64}
-=== License file based on go.mod with md5 sum:  86b1d6df6baa8b032896be53c4274d92
+=== License file based on go.mod with md5 sum:  9703204c5fd5c441310d943839abdc4b

docker-compose/compose.yaml

@@ -27,7 +27,7 @@ services:
       - ./grafana/dashboards:/var/lib/grafana/dashboards
 
   free23ai:
-    image: gvenzl/oracle-free:23.5-slim-faststart
+    image: gvenzl/oracle-free:23.6-slim-faststart
     container_name: free23ai
     ports:
       - 1521:1521
@@ -43,7 +43,7 @@ services:
       start_period: 30s
 
   exporter:
-    image: container-registry.oracle.com/database/observability-exporter:1.5.2
+    image: container-registry.oracle.com/database/observability-exporter:1.5.3
     container_name: exporter
     ports:
       - 9161:9161

kubernetes/metrics-exporter-deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: metrics-exporter
-        image: container-registry.oracle.com/database/observability-exporter:1.5.2
+        image: container-registry.oracle.com/database/observability-exporter:1.5.3
         imagePullPolicy: Always
         env:
           # uncomment and customize the next item if you want to provide custom metrics definitions