Skip to content

Commit 4e48f6a

Browse files
authored
feat: add nr-forked db components to core (#612)
1 parent b593546 commit 4e48f6a

5 files changed

Lines changed: 45 additions & 2 deletions

File tree

distributions/nrdot-collector-experimental/manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ receivers:
2323
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.154.0
2424
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.154.0
2525
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.154.0
26-
- gomod: github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nroracledbreceiver v0.154.1
27-
- gomod: github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nrsqlserverreceiver v0.154.1
26+
- gomod: github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nroracledbreceiver v0.154.4
27+
- gomod: github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nrsqlserverreceiver v0.154.4
2828
processors:
2929
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.154.0
3030
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.154.0

distributions/nrdot-collector/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Note: See [general README](../README.md) for information that applies to all dis
1919
| ATP (Host Monitoring w/ process metrics) | `alpha` | N/A (new) | [Docs](https://docs.newrelic.com/docs/opentelemetry/nrdot/atp/overview/) |
2020
| Gateway Mode | `alpha` | N/A (new) | [See 'Gateway Mode' below](#gateway-mode) |
2121
| On-Host Integrations (OHI) | `alpha` | N/A (new) | [ECS](https://docs.newrelic.com/docs/opentelemetry/integrations/ecs-monitoring/overview/), [ElasticSearch](https://docs.newrelic.com/docs/opentelemetry/integrations/elasticsearch/elasticsearch-otel-integration-overview/), HAProxy (Coming Soon), [Kafka](https://docs.newrelic.com/docs/opentelemetry/integrations/kafka/overview/), [NGINX](https://docs.newrelic.com/docs/opentelemetry/integrations/nginx/nginx-otel-overview/), [RabbitMQ](https://docs.newrelic.com/docs/opentelemetry/integrations/rabbitmq/overview/), Redis (Coming Soon) |
22+
| Database Monitoring | `alpha` | N/A (new) | [SQL Server](https://docs.newrelic.com/docs/opentelemetry/database/otel-mssql/), [Oracle DB](https://docs.newrelic.com/docs/opentelemetry/database/otel-oracledb/) |
2223

2324
Note: While it's technically possible to have a single collector serve multiple use cases at the same time, we generally do not recommend or support this pattern due to the operational complexity that comes with it (configuration, deployment, scaling, ...). Instead we recommend deploying one collector per use case and chain them as necessary. Please note that when we say 'one collector' we refer to a logical service, not a single instance, i.e. you should still employ common scaling practices to ensure your architecture is resilient.
2425

distributions/nrdot-collector/THIRD_PARTY_NOTICES.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@ can be found at https://github.com/newrelic/nrdot-collector-releases.
1212

1313

1414

15+
## [github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nroracledbreceiver](https://github.com/newrelic-forks/opentelemetry-collector-contrib)
16+
17+
Distributed under the following license(s):
18+
19+
* Apache-2.0
20+
21+
22+
23+
## [github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nrsqlserverreceiver](https://github.com/newrelic-forks/opentelemetry-collector-contrib)
24+
25+
Distributed under the following license(s):
26+
27+
* Apache-2.0
28+
29+
30+
1531
## [github.com/newrelic/nrdot-collector-components/processor/adaptivetelemetryprocessor](https://github.com/newrelic/nrdot-collector-components)
1632

1733
Distributed under the following license(s):
@@ -20,6 +36,22 @@ Distributed under the following license(s):
2036

2137

2238

39+
## [github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/aesprovider](https://github.com/open-telemetry/opentelemetry-collector-contrib)
40+
41+
Distributed under the following license(s):
42+
43+
* Apache-2.0
44+
45+
46+
47+
## [github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider](https://github.com/open-telemetry/opentelemetry-collector-contrib)
48+
49+
Distributed under the following license(s):
50+
51+
* Apache-2.0
52+
53+
54+
2355
## [github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib)
2456

2557
Distributed under the following license(s):

distributions/nrdot-collector/component-inventory.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This document maps each component in the `nrdot-collector` distribution to the u
1010
- **Gateway**: Gateway Mode
1111
- **OHI**: On-Host Integrations (shared infrastructure used across multiple integrations)
1212
- **OHI-{name}**: On-Host Integration specific to a product. The suffix indicates the target integration (e.g., `OHI-kafka` for Kafka monitoring).
13+
- **DB-{name}**: Database Monitoring specific to a database product. The suffix indicates the target database (e.g., `DB-sqlserver` for SQL Server monitoring).
1314

1415
## Receivers
1516

@@ -31,6 +32,8 @@ This document maps each component in the `nrdot-collector` distribution to the u
3132
| `prometheusreceiver` | Gateway, k8s |
3233
| `rabbitmqreceiver` | OHI-rabbitmq |
3334
| `redisreceiver` | OHI-redis |
35+
| `nroracledbreceiver` | DB-oracle |
36+
| `nrsqlserverreceiver` | DB-sqlserver |
3437
| `receivercreator` | OHI |
3538

3639
## Processors
@@ -86,3 +89,5 @@ This document maps each component in the `nrdot-collector` distribution to the u
8689
| `httpprovider` | Core |
8790
| `httpsprovider` | Core |
8891
| `yamlprovider` | Core |
92+
| `aesprovider` | DB-oracle, DB-sqlserver |
93+
| `secretsmanagerprovider` | DB-oracle, DB-sqlserver |

distributions/nrdot-collector/manifest.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ receivers:
2222
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.154.0
2323
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.154.0
2424
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.154.0
25+
- gomod: github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nroracledbreceiver v0.154.4
26+
- gomod: github.com/newrelic-forks/opentelemetry-collector-contrib/receiver/nrsqlserverreceiver v0.154.4
2527
processors:
2628
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.154.0
2729
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.154.0
@@ -56,6 +58,9 @@ providers:
5658
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.60.0
5759
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.60.0
5860
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.60.0
61+
# Secret Management Providers
62+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.154.0
63+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/aesprovider v0.154.0
5964
# When adding a replace, add a comment before it to document why it's needed and when it can be removed
6065
replaces:
6166
# Why: Fixes CVE-2026-42151 and CVE-2026-42154

0 commit comments

Comments
 (0)