From 34f19d563822e88f6965ddc7f0346c2876f73660 Mon Sep 17 00:00:00 2001
From: Carlos Crespo <carloshenrique.leonelcrespo@elastic.co>
Date: Thu, 14 Jul 2022 10:15:00 +0200
Subject: [PATCH] Enable OTEL_EXPORTER_OTLP_ENDPOINT env var

---
 x-pack/plugins/monitoring_collection/README.md        | 2 +-
 x-pack/plugins/monitoring_collection/server/plugin.ts | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/monitoring_collection/README.md b/x-pack/plugins/monitoring_collection/README.md
index b5e8a38d16ad6..1f9cadf40ee7b 100644
--- a/x-pack/plugins/monitoring_collection/README.md
+++ b/x-pack/plugins/monitoring_collection/README.md
@@ -49,7 +49,7 @@ monitoring_collection.opentelemetry.metrics:
       Authorization: "Bearer SECRET_TOKEN"
 ```
 
-Alternatively, OTLP Exporter can be configured using environment variables `OTEL_EXPORTER_OTLP_METRICS_ENDPOINT`, `OTEL_EXPORTER_OTLP_METRICS_HEADERS`. [See OTLP Exporter docs](https://opentelemetry.io/docs/reference/specification/protocol/exporter/) for details.
+Alternatively, OTLP Exporter can be configured using environment variables `OTEL_EXPORTER_OTLP_ENDPOINT`, `OTEL_EXPORTER_OTLP_METRICS_ENDPOINT` and `OTEL_EXPORTER_OTLP_METRICS_HEADERS`. [See OTLP Exporter docs](https://opentelemetry.io/docs/reference/specification/protocol/exporter/) for details.
 
 It's possible to configure logging for the OTLP integration. If not informed, the default will be `info`
 
diff --git a/x-pack/plugins/monitoring_collection/server/plugin.ts b/x-pack/plugins/monitoring_collection/server/plugin.ts
index 818dd81a9c303..1c30a8439cf3c 100644
--- a/x-pack/plugins/monitoring_collection/server/plugin.ts
+++ b/x-pack/plugins/monitoring_collection/server/plugin.ts
@@ -137,12 +137,15 @@ export class MonitoringCollectionPlugin implements Plugin<MonitoringCollectionSe
     metrics.setGlobalMeterProvider(meterProvider);
 
     const otlpConfig = this.config.opentelemetry?.metrics.otlp;
-    const url = otlpConfig?.url ?? process.env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT;
+    const url =
+      otlpConfig?.url ??
+      process.env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT ??
+      process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
     if (url) {
       // Add OTLP exporter
       // Set Authorization headers
       // OTLPMetricExporter internally will look at OTEL_EXPORTER_OTLP_METRICS_HEADERS env variable
-      // if `headers` are not present in the kibana config file
+      // if `headers` is not present in the kibana config file
       const metadata = new grpc.Metadata();
       if (otlpConfig.headers) {
         for (const [key, value] of Object.entries(otlpConfig.headers)) {