Merge pull request #37 from instana/informix_r4

Informix DB Release 4 metrics

rdb/scripts/informix/active_session_count.sh

@@ -5,9 +5,9 @@
 result=$(cd $1 &&
   export INFORMIXDIR=$2 &&
   export ONCONFIG=$3 &&
-  export INFO RMIXSERVER=$4 &&
+  export INFORMIXSERVER=$4 &&
   export PATH=$INFORMIXDIR/bin:$PATH &&
   export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
-  ./onstat -g ses active | awk 'BEGIN {RS=""; FS="\n"} NR==2 {linecount = NF -2; if (linecount>0) print linecount; else print 0}')
+  ./onstat -g ses active | awk 'NR==2 {linecount = NF -2; if (linecount>0) print linecount; else print 0}')
 
 echo $result

rdb/scripts/informix/cache_read_ratio.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#  (c) Copyright IBM Corp. 2024
+#  (c) Copyright Instana Inc.
+
+result=$(cd $1 &&
+  export INFORMIXDIR=$2 &&
+  export ONCONFIG=$3 &&
+  export INFORMIXSERVER=$4 &&
+  export PATH=$INFORMIXDIR/bin:$PATH &&
+  export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
+  ./onstat -p |head -n 8| awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $4}')
+
+echo $result|cut -d'.' -f 1

rdb/scripts/informix/cache_write_ratio.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#  (c) Copyright IBM Corp. 2024
+#  (c) Copyright Instana Inc.
+
+result=$(cd $1 &&
+  export INFORMIXDIR=$2 &&
+  export ONCONFIG=$3 &&
+  export INFORMIXSERVER=$4 &&
+  export PATH=$INFORMIXDIR/bin:$PATH &&
+  export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
+  ./onstat -p |head -n 8| awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $8}')
+
+echo $result|cut -d'.' -f 1

rdb/scripts/informix/disk_read.sh

@@ -1,11 +1,11 @@
-!/bin/bash
+#!/bin/bash
 #  (c) Copyright IBM Corp. 2024
 #  (c) Copyright Instana Inc.
 
 result=$(cd $1 &&
   export INFORMIXDIR=$2 &&
   export ONCONFIG=$3 &&
-  export INFO RMIXSERVER=$4 &&
+  export INFORMIXSERVER=$4 &&
   export PATH=$INFORMIXDIR/bin:$PATH &&
   export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
   ./onstat -p | awk 'NR==7 {print $1}')

rdb/scripts/informix/disk_write.sh

@@ -1,11 +1,11 @@
-!/bin/bash
+#!/bin/bash
 #  (c) Copyright IBM Corp. 2024
 #  (c) Copyright Instana Inc.
 
 result=$(cd $1 &&
   export INFORMIXDIR=$2 &&
   export ONCONFIG=$3 &&
-  export INFO RMIXSERVER=$4 &&
+  export INFORMIXSERVER=$4 &&
   export PATH=$INFORMIXDIR/bin:$PATH &&
   export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
   ./onstat -p | awk 'NR==7 {print $5}')

rdb/scripts/informix/lock_count.sh

@@ -5,9 +5,9 @@
 result=$(cd $1 &&
   export INFORMIXDIR=$2 &&
   export ONCONFIG=$3 &&
-  export INFO RMIXSERVER=$4 &&
+  export INFORMIXSERVER=$4 &&
   export PATH=$INFORMIXDIR/bin:$PATH &&
   export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
-  ./onstat -k  |  head -n 14| tail -n 1|awk '{print $1}')
+  ./onstat -k  | awk '{a[NR]=$0} END{print a[NR-1]}' |awk '{print $1}')
 
 echo $result

rdb/scripts/informix/lock_waits.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#  (c) Copyright IBM Corp. 2024
+#  (c) Copyright Instana Inc.
+
+result=$(cd $1 &&
+  export INFORMIXDIR=$2 &&
+  export ONCONFIG=$3 &&
+  export INFORMIXSERVER=$4 &&
+  export PATH=$INFORMIXDIR/bin:$PATH &&
+  export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
+  ./onstat -p |head -n 20| awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $2}')
+
+echo $result

rdb/scripts/informix/lru_writes.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#  (c) Copyright IBM Corp. 2024
+#  (c) Copyright Instana Inc.
+
+result=$(cd $1 &&
+  export INFORMIXDIR=$2 &&
+  export ONCONFIG=$3 &&
+  export INFORMIXSERVER=$4 &&
+  export PATH=$INFORMIXDIR/bin:$PATH &&
+  export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
+  ./onstat -F| head -n 8| awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $2}')
+
+echo $result

rdb/scripts/informix/overflow_lock_count.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#  (c) Copyright IBM Corp. 2024
+#  (c) Copyright Instana Inc.
+
+result=$(cd $1 &&
+  export INFORMIXDIR=$2 &&
+  export ONCONFIG=$3 &&
+  export INFORMIXSERVER=$4 &&
+  export PATH=$INFORMIXDIR/bin:$PATH &&
+  export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
+  ./onstat -p |head -n 17| awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $1}')
+
+echo $result

rdb/scripts/informix/overflow_transaction_count.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#  (c) Copyright IBM Corp. 2024
+#  (c) Copyright Instana Inc.
+
+result=$(cd $1 &&
+  export INFORMIXDIR=$2 &&
+  export ONCONFIG=$3 &&
+  export INFORMIXSERVER=$4 &&
+  export PATH=$INFORMIXDIR/bin:$PATH &&
+  export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
+  ./onstat -p |head -n 17| awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $3}')
+
+echo $result

rdb/scripts/informix/overflow_user_count.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#  (c) Copyright IBM Corp. 2024
+#  (c) Copyright Instana Inc.
+
+result=$(cd $1 &&
+  export INFORMIXDIR=$2 &&
+  export ONCONFIG=$3 &&
+  export INFORMIXSERVER=$4 &&
+  export PATH=$INFORMIXDIR/bin:$PATH &&
+  export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
+  ./onstat -p |head -n 17| awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $2}')
+
+echo $result

rdb/scripts/informix/session_count.sh

@@ -8,6 +8,6 @@ result=$(cd $1 &&
   export INFO RMIXSERVER=$4 &&
   export PATH=$INFORMIXDIR/bin:$PATH &&
   export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
-  ./onstat -g ses | awk 'BEGIN {RS=""; FS="\n"} NR==2 {linecount = NF -2; if (linecount>0) print linecount; else print 0}')
+  ./onstat -g ses | awk 'NR==2 {linecount = NF -2; if (linecount>0) print linecount; else print 0}')
 
 echo $result

rdb/scripts/informix/sql_count.sh

@@ -8,6 +8,6 @@ result=$(cd $1 &&
   export INFO RMIXSERVER=$4 &&
   export PATH=$INFORMIXDIR/bin:$PATH &&
   export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
-  ./onstat -g his 1 | head -n 10 | tail -n 1 | awk '{print $4}')
+  ./onstat -g his 1 | head -n 10 | awk '{a[NR]=$0} END{print a[NR-1]}' | awk '{print $4}')
 
 echo $result

rdb/scripts/informix/transaction_count.sh

@@ -5,9 +5,9 @@
 result=$(cd $1 &&
   export INFORMIXDIR=$2 &&
   export ONCONFIG=$3 &&
-  export INFO RMIXSERVER=$4 &&
+  export INFORMIXSERVER=$4 &&
   export PATH=$INFORMIXDIR/bin:$PATH &&
   export INFORMIXSQLHOSTS=$INFORMIXDIR/etc/$5 &&
-  ./onstat -x | awk '{print $1}' | tail -n 2 | head -n 1)
+ ./onstat -x | awk '{a[NR]=$0} END{print a[NR-1]}'| awk '{print $1}')
 
 echo $result

rdb/src/main/java/com/instana/agent/sensorsdk/semconv/SemanticAttributes.java

@@ -76,5 +76,8 @@ private SemanticAttributes() {
   public static final AttributeKey<String> DB_SEQ_SCAN_COUNT = AttributeKey.stringKey("db.seq.scan.count");
   public static final AttributeKey<Long> DB_SEQ_SCAN_TABLE_COUNT = AttributeKey.longKey("db.seq.scan.table.count");
   public static final AttributeKey<String> TABLE_NAME = AttributeKey.stringKey("table_name");
-
+  public static final AttributeKey<Long> DB_LOCK_WAITS = AttributeKey.longKey("db.lock.waits");
+  public static final AttributeKey<Long> DB_CACHE_READ_RATIO = AttributeKey.longKey("db.cache.read.ratio");
+  public static final AttributeKey<Long> DB_CACHE_WRITE_RATIO = AttributeKey.longKey("db.cache.write.ratio");
+  public static final AttributeKey<Long> DB_LRU_WRITES = AttributeKey.longKey("db.lru.writes");
 }

rdb/src/main/java/com/instana/dc/rdb/DbDcUtil.java

@@ -209,7 +209,21 @@ private DbDcUtil() {
     public static final String DB_SEQ_SCAN_TABLE_DESC = "Number of tables which is having sequential scan.";
     public static final String DB_SEQ_SCAN_TABLE_UNIT = "{tableScan}";
 
+    public static final String DB_LOCK_WAITS_NAME = DB_LOCK_WAITS.getKey();
+    public static final String DB_LOCK_WAITS_DESC = "Number of threads waiting for lock.";
+    public static final String DB_LOCK_WAITS_UNIT = "{lockWaits}";
 
+    public static final String DB_CACHE_READ_RATIO_NAME = DB_CACHE_READ_RATIO.getKey();
+    public static final String DB_CACHE_READ_RATIO_DESC = "Percentage of page reads for this buffer pool that were satisfied by a cached page image";
+    public static final String DB_CACHE_READ_RATIO_UNIT = "1";
+
+    public static final String DB_CACHE_WRITE_RATIO_NAME = DB_CACHE_WRITE_RATIO.getKey();
+    public static final String DB_CACHE_WRITE_RATIO_DESC = "Percentage of page Writes for this buffer pool that were satisfied by a cached page image";
+    public static final String DB_CACHE_WRITE_RATIO_UNIT = "1";
+
+    public static final String DB_LRU_WRITES_NAME = DB_LRU_WRITES.getKey();
+    public static final String DB_LRU_WRITES_DESC = "Number of LRU (Least Recently Used) Writes.";
+    public static final String DB_LRU_WRITES_UNIT = "{lruWrites}";
 
     /* Utilities:
      **/

rdb/src/main/java/com/instana/dc/rdb/DbRawMetricRegistry.java

@@ -61,6 +61,10 @@ public class DbRawMetricRegistry {
         put(DB_USER_OVERFLOW_NAME, new RawMetric(UPDOWN_COUNTER, DB_USER_OVERFLOW_NAME, DB_USER_OVERFLOW_DESC, DB_USER_OVERFLOW_UNIT, true, null));
         put(DB_SEQ_SCAN_NAME, new RawMetric(UPDOWN_COUNTER, DB_SEQ_SCAN_NAME, DB_SEQ_SCAN_DESC, UNIT_BY, true, DB_SEQ_SCAN_KEY));
         put(DB_SEQ_SCAN_TABLE_NAME, new RawMetric(GAUGE, DB_SEQ_SCAN_TABLE_NAME, DB_SEQ_SCAN_TABLE_DESC, DB_SEQ_SCAN_TABLE_UNIT, true, null));
+        put(DB_LOCK_WAITS_NAME, new RawMetric(UPDOWN_COUNTER, DB_LOCK_WAITS_NAME, DB_LOCK_WAITS_DESC, DB_LOCK_WAITS_UNIT, true, null));
+        put(DB_CACHE_READ_RATIO_NAME, new RawMetric(GAUGE, DB_CACHE_READ_RATIO_NAME, DB_CACHE_READ_RATIO_DESC, DB_CACHE_READ_RATIO_UNIT, true, null));
+        put(DB_CACHE_WRITE_RATIO_NAME, new RawMetric(GAUGE, DB_CACHE_WRITE_RATIO_NAME, DB_CACHE_WRITE_RATIO_DESC, DB_CACHE_WRITE_RATIO_UNIT, true, null));
+        put(DB_LRU_WRITES_NAME, new RawMetric(UPDOWN_COUNTER, DB_LRU_WRITES_NAME, DB_LRU_WRITES_DESC, DB_LRU_WRITES_UNIT, true, null));
     }};
 
     public Map<String, RawMetric> getMap() {

rdb/src/main/java/com/instana/dc/rdb/impl/Constants.java

@@ -24,6 +24,13 @@ public class Constants {
     public static final String TASK_WAIT_COUNT_SCRIPT = "task_wait_count.sh";
     public static final String TOTAL_SESSION_COUNT_SCRIPT = "session_count.sh";
     public static final String ACTIVE_SESSION_COUNT_SCRIPT = "active_session_count.sh";
+    public static final String OVERFLOW_LOCK_COUNT_SCRIPT = "overflow_lock_count.sh";
+    public static final String OVERFLOW_USER_COUNT_SCRIPT = "overflow_user_count.sh";
+    public static final String OVERFLOW_TRANSACTION_COUNT_SCRIPT = "overflow_transaction_count.sh";
+    public static final String CACHE_READ_RATIO_SCRIPT = "cache_read_ratio.sh";
+    public static final String CACHE_WRITE_RATIO_SCRIPT = "cache_write_ratio.sh";
+    public static final String LOCK_WAITS_SCRIPT = "lock_waits.sh";
+    public static final String LRU_WRITES_SCRIPT = "lru_writes.sh";
 
     private Constants() {
         //Private constructor

rdb/src/main/java/com/instana/dc/rdb/impl/informix/InformixDc.java

@@ -13,7 +13,6 @@
 import com.instana.dc.rdb.impl.informix.metric.collection.*;
 import com.instana.dc.rdb.impl.informix.metric.collection.strategy.MetricsCollector;
 import org.apache.commons.dbcp2.BasicDataSource;
-
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -26,7 +25,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import static com.instana.dc.rdb.DbDcUtil.*;
 import static com.instana.dc.rdb.impl.Constants.ACTIVE_SESSION_COUNT_SCRIPT;
 import static com.instana.dc.rdb.impl.Constants.DISK_READ_SCRIPT;
@@ -41,6 +39,13 @@
 import static com.instana.dc.rdb.impl.Constants.DISK_READ_SCRIPT;
 import static com.instana.dc.rdb.impl.Constants.DISK_WRITE_SCRIPT;
 import static com.instana.dc.rdb.impl.Constants.LOCK_COUNT_SCRIPT;
+import static com.instana.dc.rdb.impl.Constants.OVERFLOW_LOCK_COUNT_SCRIPT;
+import static com.instana.dc.rdb.impl.Constants.OVERFLOW_USER_COUNT_SCRIPT;
+import static com.instana.dc.rdb.impl.Constants.OVERFLOW_TRANSACTION_COUNT_SCRIPT;
+import static com.instana.dc.rdb.impl.Constants.CACHE_READ_RATIO_SCRIPT;
+import static com.instana.dc.rdb.impl.Constants.CACHE_WRITE_RATIO_SCRIPT;
+import static com.instana.dc.rdb.impl.Constants.LOCK_WAITS_SCRIPT;
+import static com.instana.dc.rdb.impl.Constants.LRU_WRITES_SCRIPT;
 import static com.instana.dc.rdb.impl.informix.InformixUtil.DB_HOST_AND_VERSION_SQL;
 
 
@@ -118,13 +123,6 @@ private void registerMetricsMetadata() {
                 new MetricDataConfig(InformixUtil.DB_DATABASE_NLS_ENABLED_SQL, MetricCollectionMode.SQL, List.class, DB_DATABASE_NLS_ENABLED_KEY));
         MetricsDataConfigRegister.subscribeMetricDataConfig(DB_DATABASE_CASE_INCENSITIVE_NAME,
                 new MetricDataConfig(InformixUtil.DB_DATABASE_CASE_INCENSITIVE_SQL, MetricCollectionMode.SQL, List.class, DB_DATABASE_CASE_INCENSITIVE_KEY));
-        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_LOCK_TABLE_OVERFLOW_NAME,
-                new MetricDataConfig(InformixUtil.LOCK_OVF_SQL, MetricCollectionMode.SQL, Number.class));
-        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_TRANSACTION_OVERFLOW_NAME,
-                new MetricDataConfig(InformixUtil.TRANSACTION_OVF_SQL, MetricCollectionMode.SQL, Number.class));
-        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_USER_OVERFLOW_NAME,
-                new MetricDataConfig(InformixUtil.USER_OVF_SQL, MetricCollectionMode.SQL, Number.class));
-
         MetricsDataConfigRegister.subscribeMetricDataConfig(DB_SEQ_SCAN_NAME,
                 new MetricDataConfig(sequentialScanQuery, MetricCollectionMode.SQL, List.class, DB_SEQ_SCAN_KEY));
         MetricsDataConfigRegister.subscribeMetricDataConfig(DB_SEQ_SCAN_TABLE_NAME,
@@ -157,6 +155,22 @@ private void registerMetricsMetadata() {
                 new MetricDataConfig(DB_LOCK_COUNT_NAME, LOCK_COUNT_SCRIPT, MetricCollectionMode.CMD, Number.class));
         MetricsDataConfigRegister.subscribeMetricDataConfig(DB_TASK_WAIT_COUNT_NAME,
                 new MetricDataConfig(DB_TASK_WAIT_COUNT_NAME, TASK_WAIT_COUNT_SCRIPT, MetricCollectionMode.CMD, Number.class));
+        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_LOCK_WAITS_NAME,
+                new MetricDataConfig(DB_LOCK_WAITS_NAME, LOCK_WAITS_SCRIPT, MetricCollectionMode.CMD, Number.class));
+        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_CACHE_READ_RATIO_NAME,
+                new MetricDataConfig(DB_CACHE_READ_RATIO_NAME, CACHE_READ_RATIO_SCRIPT, MetricCollectionMode.CMD, Number.class));
+        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_CACHE_WRITE_RATIO_NAME,
+                new MetricDataConfig(DB_CACHE_WRITE_RATIO_NAME, CACHE_WRITE_RATIO_SCRIPT, MetricCollectionMode.CMD, Number.class));
+        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_LRU_WRITES_NAME,
+                new MetricDataConfig(DB_LRU_WRITES_NAME, LRU_WRITES_SCRIPT, MetricCollectionMode.CMD, Number.class));
+        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_LOCK_TABLE_OVERFLOW_NAME,
+                new MetricDataConfig(DB_LOCK_TABLE_OVERFLOW_NAME, OVERFLOW_LOCK_COUNT_SCRIPT, MetricCollectionMode.CMD, Number.class));
+        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_TRANSACTION_OVERFLOW_NAME,
+                new MetricDataConfig(DB_TRANSACTION_OVERFLOW_NAME, OVERFLOW_TRANSACTION_COUNT_SCRIPT, MetricCollectionMode.CMD, Number.class));
+        MetricsDataConfigRegister.subscribeMetricDataConfig(DB_USER_OVERFLOW_NAME,
+                new MetricDataConfig(DB_USER_OVERFLOW_NAME, OVERFLOW_USER_COUNT_SCRIPT, MetricCollectionMode.CMD, Number.class));
+
+
     }
 
     /**
@@ -280,7 +294,6 @@ private void mediumPollingInterval() {
         getRawMetric(DB_TRANSACTION_COUNT_NAME).setValue((Number) metricCollector.collectMetrics(DB_TRANSACTION_COUNT_NAME));
         getRawMetric(DB_TRANSACTION_RATE_NAME).setValue((Number) metricCollector.collectMetrics(DB_TRANSACTION_COUNT_NAME));
         getRawMetric(DB_SQL_ELAPSED_TIME_NAME).setValue((List<SimpleQueryResult>) metricCollector.collectMetrics(DB_SQL_ELAPSED_TIME_NAME));
-
     }
 
     private void shortPollingInterval() {
@@ -297,9 +310,12 @@ private void shortPollingInterval() {
         getRawMetric(DB_IO_READ_RATE_NAME).setValue((Number) metricCollector.collectMetrics(DB_IO_READ_RATE_NAME));
         getRawMetric(DB_IO_WRITE_RATE_NAME).setValue((Number) metricCollector.collectMetrics(DB_IO_WRITE_RATE_NAME));
         getRawMetric(DB_MEM_UTILIZATION_NAME).setValue((Number) metricCollector.collectMetrics(DB_MEM_UTILIZATION_NAME));
-
         getRawMetric(DB_DISK_WRITE_COUNT_NAME).setValue((Number) metricCollector.collectMetrics(DB_DISK_WRITE_COUNT_NAME));
         getRawMetric(DB_DISK_READ_COUNT_NAME).setValue((Number) metricCollector.collectMetrics(DB_DISK_READ_COUNT_NAME));
+        getRawMetric(DB_LOCK_WAITS_NAME).setValue((Number) metricCollector.collectMetrics(DB_LOCK_WAITS_NAME));
+        getRawMetric(DB_CACHE_READ_RATIO_NAME).setValue((Number) metricCollector.collectMetrics(DB_CACHE_READ_RATIO_NAME));
+        getRawMetric(DB_CACHE_WRITE_RATIO_NAME).setValue((Number) metricCollector.collectMetrics(DB_CACHE_WRITE_RATIO_NAME));
+        getRawMetric(DB_LRU_WRITES_NAME).setValue((Number) metricCollector.collectMetrics(DB_LRU_WRITES_NAME));
     }
 
     @SuppressWarnings("unchecked")