Oracledb discovery

cmd/otelcol/config/collector/config.d.linux/receivers/oracledb.discovery.yaml

@@ -0,0 +1,72 @@
+#####################################################################################
+# This file is generated by the Splunk Distribution of the OpenTelemetry Collector. #
+#                                                                                   #
+# It reflects the default configuration bundled in the Collector executable for use #
+# in discovery mode (--discovery) and is provided for reference or customization.   #
+# Please note that any changes made to this file will need to be reconciled during  #
+# upgrades of the Collector.                                                        #
+#####################################################################################
+# oracledb:
+#   enabled: true
+#   rule:
+#     docker_observer: type == "container" and any([name, image, command], {# matches "(?i)oracle"}) and not (command matches "splunk.discovery")
+#     host_observer: type == "hostport" and command matches "(?i)oracle" and not (command matches "splunk.discovery")
+#     k8s_observer: type == "port" and pod.name matches "(?i)oracle"
+#   config:
+#     default:
+#       endpoint: splunk.discovery.default
+#       username: splunk.discovery.default
+#       password: splunk.discovery.default
+#       service: splunk.discovery.default
+#   status:
+#     metrics:
+#       successful:
+#         - strict: oracledb.cpu_time
+#           first_only: true
+#           log_record:
+#             severity_text: info
+#             body: oracledb receiver is working!
+#     statements:
+#       failed:
+#         - regexp: "connection refused"
+#           first_only: true
+#           log_record:
+#             severity_text: info
+#             append_pattern: true
+#             body: The container is not serving http connections.
+#         - regexp: "received goaway and there are no active streams"
+#           first_only: true
+#           log_record:
+#             severity_text: info
+#             append_pattern: true
+#             body: Unable to connect and scrape metrics.
+#       partial:
+#         - regexp: "listener does not currently know of service requested"
+#           first_only: true
+#           log_record:
+#             severity_text: info
+#             append_pattern: true
+#             body: >-
+#               Make sure your oracledb service is correctly specified using the
+#               `--set splunk.discovery.receivers.oracledb.config.service="<service>"` command or the
+#               `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_service="<service>"` environment variable. 
+#         - regexp: "dial tcp: lookup"
+#           first_only: true
+#           log_record:
+#             severity_text: info
+#             append_pattern: true
+#             body: >-
+#               Make sure your oracledb endpoint is correctly specified using the
+#               `--set splunk.discovery.receivers.oracledb.config.endpoint="<endpoint>"` command or the
+#               `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_endpoint="<endpoint>"` environment variable.    
+#         - regexp: 'invalid username/password'
+#           first_only: true
+#           log_record:
+#             severity_text: info
+#             append_pattern: true
+#             body: >-
+#               Make sure your user credentials are correctly specified using the
+#               `--set splunk.discovery.receivers.oracledb.config.username="<username>"` and
+#               `--set splunk.discovery.receivers.oracledb.config.password="<password>"` command or the
+#               `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_username="<username>"` and
+#               `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_password="<password>"` environment variables.

internal/confmapprovider/discovery/bundle/bundle.d/receivers/oracledb.discovery.yaml

@@ -0,0 +1,68 @@
+#####################################################################################
+#                               Do not edit manually!                               #
+# All changes must be made to associated .tmpl file before running 'make bundle.d'. #
+#####################################################################################
+oracledb:
+  enabled: true
+  rule:
+    docker_observer: type == "container" and any([name, image, command], {# matches "(?i)oracle"}) and not (command matches "splunk.discovery")
+    host_observer: type == "hostport" and command matches "(?i)oracle" and not (command matches "splunk.discovery")
+    k8s_observer: type == "port" and pod.name matches "(?i)oracle"
+  config:
+    default:
+      endpoint: splunk.discovery.default
+      username: splunk.discovery.default
+      password: splunk.discovery.default
+      service: splunk.discovery.default
+  status:
+    metrics:
+      successful:
+        - strict: oracledb.cpu_time
+          first_only: true
+          log_record:
+            severity_text: info
+            body: oracledb receiver is working!
+    statements:
+      failed:
+        - regexp: "connection refused"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: The container is not serving http connections.
+        - regexp: "received goaway and there are no active streams"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: Unable to connect and scrape metrics.
+      partial:
+        - regexp: "listener does not currently know of service requested"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: >-
+              Make sure your oracledb service is correctly specified using the
+              `--set splunk.discovery.receivers.oracledb.config.service="<service>"` command or the
+              `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_service="<service>"` environment variable. 
+        - regexp: "dial tcp: lookup"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: >-
+              Make sure your oracledb endpoint is correctly specified using the
+              `--set splunk.discovery.receivers.oracledb.config.endpoint="<endpoint>"` command or the
+              `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_endpoint="<endpoint>"` environment variable.    
+        - regexp: 'invalid username/password'
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: >-
+              Make sure your user credentials are correctly specified using the
+              `--set splunk.discovery.receivers.oracledb.config.username="<username>"` and
+              `--set splunk.discovery.receivers.oracledb.config.password="<password>"` command or the
+              `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_username="<username>"` and
+              `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_password="<password>"` environment variables.

internal/confmapprovider/discovery/bundle/bundle.d/receivers/oracledb.discovery.yaml.tmpl

@@ -0,0 +1,64 @@
+{{ receiver "oracledb" }}:
+  enabled: true
+  rule:
+    docker_observer: type == "container" and any([name, image, command], {# matches "(?i)oracle"}) and not (command matches "splunk.discovery")
+    host_observer: type == "hostport" and command matches "(?i)oracle" and not (command matches "splunk.discovery")
+    k8s_observer: type == "port" and pod.name matches "(?i)oracle"
+  config:
+    default:
+      endpoint: {{ defaultValue }}
+      username: {{ defaultValue }}
+      password: {{ defaultValue }}
+      service: {{ defaultValue }}
+  status:
+    metrics:
+      successful:
+        - strict: oracledb.cpu_time
+          first_only: true
+          log_record:
+            severity_text: info
+            body: oracledb receiver is working!
+    statements:
+      failed:
+        - regexp: "connection refused"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: The container is not serving http connections.
+        - regexp: "received goaway and there are no active streams"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: Unable to connect and scrape metrics.
+      partial:
+        - regexp: "listener does not currently know of service requested"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: >-
+              Make sure your oracledb service is correctly specified using the
+              `--set {{ configProperty "service" "<service>" }}` command or the
+              `{{ configPropertyEnvVar "service" "<service>" }}` environment variable. 
+        - regexp: "dial tcp: lookup"
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: >-
+              Make sure your oracledb endpoint is correctly specified using the
+              `--set {{ configProperty "endpoint" "<endpoint>" }}` command or the
+              `{{ configPropertyEnvVar "endpoint" "<endpoint>" }}` environment variable.    
+        - regexp: 'invalid username/password'
+          first_only: true
+          log_record:
+            severity_text: info
+            append_pattern: true
+            body: >-
+              Make sure your user credentials are correctly specified using the
+              `--set {{ configProperty "username" "<username>" }}` and
+              `--set {{ configProperty "password" "<password>" }}` command or the
+              `{{ configPropertyEnvVar "username" "<username>" }}` and
+              `{{ configPropertyEnvVar "password" "<password>" }}` environment variables.

internal/confmapprovider/discovery/bundle/bundle_gen.go

@@ -25,6 +25,8 @@
 //go:generate discoverybundler -r -c -d ../../../../cmd/otelcol/config/collector/config.d.linux/receivers -t bundle.d/receivers/smartagent-collectd-mysql.discovery.yaml.tmpl
 //go:generate discoverybundler -r -t bundle.d/receivers/smartagent-collectd-nginx.discovery.yaml.tmpl
 //go:generate discoverybundler -r -c -d ../../../../cmd/otelcol/config/collector/config.d.linux/receivers -t bundle.d/receivers/smartagent-collectd-nginx.discovery.yaml.tmpl
+//go:generate discoverybundler -r -t bundle.d/receivers/oracledb.discovery.yaml.tmpl
+//go:generate discoverybundler -r -c -d ../../../../cmd/otelcol/config/collector/config.d.linux/receivers -t bundle.d/receivers/oracledb.discovery.yaml.tmpl
 
 //go:generate discoverybundler -r -t bundle.d/extensions/docker-observer.discovery.yaml.tmpl
 //go:generate discoverybundler -r -c -d ../../../../cmd/otelcol/config/collector/config.d.linux/extensions -t bundle.d/extensions/docker-observer.discovery.yaml.tmpl

internal/confmapprovider/discovery/bundle/bundle_other_test.go

@@ -27,6 +27,7 @@ func TestBundleDir(t *testing.T) {
 	receivers, err := fs.Glob(BundledFS, "bundle.d/receivers/*.discovery.yaml")
 	require.NoError(t, err)
 	require.Equal(t, []string{
+		"bundle.d/receivers/oracledb.discovery.yaml",
 		"bundle.d/receivers/smartagent-collectd-mysql.discovery.yaml",
 		"bundle.d/receivers/smartagent-collectd-nginx.discovery.yaml",
 		"bundle.d/receivers/smartagent-postgresql.discovery.yaml",

tests/receivers/oracledb/bundled_test.go

@@ -0,0 +1,81 @@
+// Copyright Splunk, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build integration
+
+package tests
+
+import (
+	"fmt"
+	"path"
+	"runtime"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/signalfx/splunk-otel-collector/tests/testutils"
+)
+
+func TestOracledbDockerObserver(t *testing.T) {
+	testutils.SkipIfNotContainerTest(t)
+	if runtime.GOOS == "darwin" {
+		t.Skip("unable to share sockets between mac and d4m vm: https://github.com/docker/for-mac/issues/483#issuecomment-758836836")
+	}
+	tc := testutils.NewTestcase(t)
+	defer tc.PrintLogsOnFailure()
+	defer tc.ShutdownOTLPReceiverSink()
+
+	_, stop := tc.Containers(
+		testutils.NewContainer().WithContext(
+			path.Join(".", "testdata", "server"),
+		).WithName("oracledb").WithExposedPorts("1521:1521").WillWaitForHealth(45 * time.Minute),
+	)
+
+	defer stop()
+	fmt.Println("Now starting Otel Collector")
+
+	_, shutdown := tc.SplunkOtelCollectorContainer(
+		"otlp_exporter.yaml",
+		func(c testutils.Collector) testutils.Collector {
+			cc := c.(*testutils.CollectorContainer)
+			cc.Container = cc.Container.WithBinds("/var/run/docker.sock:/var/run/docker.sock:ro")
+			cc.Container = cc.Container.WillWaitForLogs("Discovering for next")
+			cc.Container = cc.Container.WithUser(fmt.Sprintf("999:%d", testutils.GetDockerGID(t)))
+			return cc
+		},
+
+		func(c testutils.Collector) testutils.Collector {
+			return c.WithEnv(map[string]string{
+				// runner seems to be slow
+				"SPLUNK_DISCOVERY_DURATION": "30s",
+				// confirm that debug logging doesn't affect runtime
+				"SPLUNK_DISCOVERY_LOG_LEVEL": "debug",
+			}).WithArgs(
+				"--discovery",
+				"--set", "splunk.discovery.receivers.oracledb.config.username=otel",
+				"--set", "splunk.discovery.receivers.oracledb.config.password=password",
+				"--set", "splunk.discovery.receivers.oracledb.config.endpoint=localhost:1521",
+				"--set", "splunk.discovery.receivers.oracledb.config.service=xe",
+				"--set", `splunk.discovery.extensions.k8s_observer.enabled=false`,
+				"--set", `splunk.discovery.extensions.host_observer.enabled=false`,
+			)
+		},
+	)
+
+	defer shutdown()
+
+	expectedResourceMetrics := tc.ResourceMetrics("all.yaml")
+	require.NoError(t, tc.OTLPReceiverSink.AssertAllMetricsReceived(t, *expectedResourceMetrics, 5*time.Minute))
+}

tests/receivers/oracledb/oracledb_test.go

@@ -29,15 +29,15 @@ import (
 // account for startup time is to wait for the container to be healthy before continuing test.
 var oracledb = []testutils.Container{testutils.NewContainer().WithContext(
 	path.Join(".", "testdata", "server"),
-).WithName("oracledb").WithExposedPorts("1521:1521").WillWaitForHealth(15 * time.Minute)}
+).WithName("oracledb").WithExposedPorts("1521:1521").WillWaitForHealth(45 * time.Minute)}
 
 // This test ensures the collector can connect to an Oracle DB, and properly get metrics. It's not intended to
 // test the receiver itself.
 func TestOracleDBIntegration(t *testing.T) {
 	testutils.AssertAllMetricsReceived(t, "all.yaml", "all_metrics_config.yaml",
 		oracledb, []testutils.CollectorBuilder{
 			func(collector testutils.Collector) testutils.Collector {
-				return collector.WithEnv(map[string]string{"ORACLEDB_URL": "oracle://otel:password@localhost:1521/XE"})
+				return collector.WithEnv(map[string]string{"ORACLEDB_URL": "oracle://otel:password@localhost:1521/xe"})
 			},
 		},
 	)

tests/receivers/oracledb/testdata/otlp_exporter.yaml

@@ -0,0 +1,13 @@
+exporters:
+  otlp:
+    endpoint: "${OTLP_ENDPOINT}"
+    tls:
+      insecure: true
+
+service:
+  telemetry:
+    logs:
+      level: debug
+  pipelines:
+    metrics:
+      exporters: [otlp]

tests/receivers/oracledb/testdata/resource_metrics/all.yaml

@@ -1,8 +1,7 @@
 resource_metrics:
-  - attributes:
-      oracledb.instance.name: localhost:1521/XE
-    scope_metrics:
+  - scope_metrics:
       - instrumentation_scope:
+          attributes: {}
           name: otelcol/oracledbreceiver
           version: <VERSION_FROM_BUILD>
         metrics: