Merge branch 'main' into MSNev/Minification

open-telemetry · Jun 20, 2023 · 78dfb5d · 78dfb5d
2 parents 1e0c4a0 + 196b644
commit 78dfb5d
Show file tree

Hide file tree

Showing 53 changed files with 183 additions and 122 deletions.
diff --git a/api/package.json b/api/package.json
@@ -76,7 +76,7 @@
     "karma-mocha-webworker": "1.3.0",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",
-    "lerna": "6.6.2",
+    "lerna": "7.0.2",
     "memfs": "3.5.3",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json
@@ -30,13 +30,13 @@
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
   "dependencies": {
-    "@opentelemetry/api": "1.4.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.38.0",
-    "@opentelemetry/instrumentation": "0.38.0",
-    "@opentelemetry/instrumentation-http": "0.38.0",
-    "@opentelemetry/resources": "1.9.1",
-    "@opentelemetry/sdk-trace-base": "1.9.1",
-    "@opentelemetry/sdk-trace-node": "1.9.1",
-    "@opentelemetry/semantic-conventions": "1.9.1"
+    "@opentelemetry/api": "1.4.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.40.0",
+    "@opentelemetry/instrumentation": "0.40.0",
+    "@opentelemetry/instrumentation-http": "0.40.0",
+    "@opentelemetry/resources": "1.14.0",
+    "@opentelemetry/sdk-trace-base": "1.14.0",
+    "@opentelemetry/sdk-trace-node": "1.14.0",
+    "@opentelemetry/semantic-conventions": "1.14.0"
   }
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -10,6 +10,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :rocket: (Enhancement)
 
+* feat(otlp-grpc-exporters): add support for UDS endpoints. [#3853](https://github.com/open-telemetry/opentelemetry-js/pull/3853) @llc1123
+
 ### :bug: (Bug Fix)
 
 ### :books: (Refine Doc)

diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -77,7 +77,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",
-    "lerna": "6.6.2",
+    "lerna": "7.0.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -77,7 +77,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",
-    "lerna": "6.6.2",
+    "lerna": "7.0.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/README.md b/experimental/packages/exporter-logs-otlp-grpc/README.md
@@ -34,6 +34,7 @@ import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc';
 
 const collectorOptions = {
   // url is optional and can be omitted - default is http://localhost:4317
+  // Unix domain sockets are also supported: 'unix:///path/to/socket.sock'
   url: 'http://<collector-hostname>:<port>',
 };
 

diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -60,7 +60,7 @@
     "codecov": "3.8.3",
     "cpx": "1.5.0",
     "cross-var": "1.1.0",
-    "lerna": "6.6.2",
+    "lerna": "7.0.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.1.2",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts
@@ -44,20 +44,23 @@ const includeDirs = [
   path.resolve(__dirname, '../../otlp-grpc-exporter-base/protos'),
 ];
 
-const address = 'localhost:1503';
+const httpAddr = 'https://localhost:1503';
+const udsAddr = 'unix:///tmp/otlp-logs.sock';
 
 type TestParams = {
+  address?: string;
   useTLS?: boolean;
   metadata?: grpc.Metadata;
 };
 
 const metadata = new grpc.Metadata();
 metadata.set('k', 'v');
 
-const testCollectorExporter = (params: TestParams) =>
-  describe(`OTLPLogExporter - node ${params.useTLS ? 'with' : 'without'} TLS, ${
-    params.metadata ? 'with' : 'without'
-  } metadata`, () => {
+const testCollectorExporter = (params: TestParams) => {
+  const { address = httpAddr, useTLS, metadata } = params;
+  return describe(`OTLPLogExporter - node ${useTLS ? 'with' : 'without'} TLS, ${
+    metadata ? 'with' : 'without'
+  } metadata, target ${address}`, () => {
     let collectorExporter: OTLPLogExporter;
     let server: grpc.Server;
     let exportedData: IResourceLogs | undefined;
@@ -92,7 +95,7 @@ const testCollectorExporter = (params: TestParams) =>
               },
             }
           );
-          const credentials = params.useTLS
+          const credentials = useTLS
             ? grpc.ServerCredentials.createSsl(
                 fs.readFileSync('./test/certs/ca.crt'),
                 [
@@ -103,10 +106,15 @@ const testCollectorExporter = (params: TestParams) =>
                 ]
               )
             : grpc.ServerCredentials.createInsecure();
-          server.bindAsync(address, credentials, () => {
-            server.start();
-            done();
-          });
+          const serverAddr = new URL(address);
+          server.bindAsync(
+            serverAddr.protocol === 'https:' ? serverAddr.host : address,
+            credentials,
+            () => {
+              server.start();
+              done();
+            }
+          );
         });
     });
 
@@ -115,17 +123,17 @@ const testCollectorExporter = (params: TestParams) =>
     });
 
     beforeEach(done => {
-      const credentials = params.useTLS
+      const credentials = useTLS
         ? grpc.credentials.createSsl(
             fs.readFileSync('./test/certs/ca.crt'),
             fs.readFileSync('./test/certs/client.key'),
             fs.readFileSync('./test/certs/client.crt')
           )
         : grpc.credentials.createInsecure();
       collectorExporter = new OTLPLogExporter({
-        url: 'https://' + address,
+        url: address,
         credentials,
-        metadata: params.metadata,
+        metadata: metadata,
       });
       done();
     });
@@ -141,7 +149,7 @@ const testCollectorExporter = (params: TestParams) =>
         // Need to stub/spy on the underlying logger as the 'diag' instance is global
         const spyLoggerWarn = sinon.stub(diag, 'warn');
         collectorExporter = new OTLPLogExporter({
-          url: `http://${address}`,
+          url: address,
           headers: {
             foo: 'bar',
           },
@@ -150,9 +158,13 @@ const testCollectorExporter = (params: TestParams) =>
         assert.strictEqual(args[0], 'Headers cannot be set when using grpc');
       });
       it('should warn about path in url', () => {
+        if (new URL(address).protocol === 'unix:') {
+          // Skip this test for UDS
+          return;
+        }
         const spyLoggerWarn = sinon.stub(diag, 'warn');
         collectorExporter = new OTLPLogExporter({
-          url: `http://${address}/v1/logs`,
+          url: `${address}/v1/logs`,
         });
         const args = spyLoggerWarn.args[0];
         assert.strictEqual(
@@ -190,7 +202,7 @@ const testCollectorExporter = (params: TestParams) =>
         }, 500);
       });
       it('should log deadline exceeded error', done => {
-        const credentials = params.useTLS
+        const credentials = useTLS
           ? grpc.credentials.createSsl(
               fs.readFileSync('./test/certs/ca.crt'),
               fs.readFileSync('./test/certs/client.key'),
@@ -199,9 +211,9 @@ const testCollectorExporter = (params: TestParams) =>
           : grpc.credentials.createInsecure();
 
         const collectorExporterWithTimeout = new OTLPLogExporter({
-          url: 'grpcs://' + address,
+          url: address,
           credentials,
-          metadata: params.metadata,
+          metadata: metadata,
           timeoutMillis: 100,
         });
 
@@ -222,21 +234,21 @@ const testCollectorExporter = (params: TestParams) =>
     });
     describe('export - with gzip compression', () => {
       beforeEach(() => {
-        const credentials = params.useTLS
+        const credentials = useTLS
           ? grpc.credentials.createSsl(
               fs.readFileSync('./test/certs/ca.crt'),
               fs.readFileSync('./test/certs/client.key'),
               fs.readFileSync('./test/certs/client.crt')
             )
           : grpc.credentials.createInsecure();
         collectorExporter = new OTLPLogExporter({
-          url: 'https://' + address,
+          url: address,
           credentials,
-          metadata: params.metadata,
+          metadata: metadata,
           compression: CompressionAlgorithm.GZIP,
         });
       });
-      it('should successfully send the spans', done => {
+      it('should successfully send the log records', done => {
         const responseSpy = sinon.spy();
         const logRecords = [Object.assign({}, mockedReadableLogRecord)];
         collectorExporter.export(logRecords, responseSpy);
@@ -248,13 +260,13 @@ const testCollectorExporter = (params: TestParams) =>
           const logs = exportedData.scopeLogs[0].logRecords;
           const resource = exportedData.resource;
 
-          assert.ok(typeof logs !== 'undefined', 'spans do not exist');
+          assert.ok(typeof logs !== 'undefined', 'log records do not exist');
           ensureExportedLogRecordIsCorrect(logs[0]);
 
           assert.ok(typeof resource !== 'undefined', "resource doesn't exist");
           ensureResourceIsCorrect(resource);
 
-          ensureMetadataIsCorrect(reqMetadata, params.metadata);
+          ensureMetadataIsCorrect(reqMetadata, metadata);
 
           done();
         }, 500);
@@ -263,7 +275,7 @@ const testCollectorExporter = (params: TestParams) =>
     describe('Logs Exporter with compression', () => {
       const envSource = process.env;
       it('should return gzip compression algorithm on exporter', () => {
-        const credentials = params.useTLS
+        const credentials = useTLS
           ? grpc.credentials.createSsl(
               fs.readFileSync('./test/certs/ca.crt'),
               fs.readFileSync('./test/certs/client.key'),
@@ -273,9 +285,9 @@ const testCollectorExporter = (params: TestParams) =>
 
         envSource.OTEL_EXPORTER_OTLP_COMPRESSION = 'gzip';
         collectorExporter = new OTLPLogExporter({
-          url: 'https://' + address,
+          url: address,
           credentials,
-          metadata: params.metadata,
+          metadata: metadata,
         });
         assert.strictEqual(
           collectorExporter.compression,
@@ -285,6 +297,7 @@ const testCollectorExporter = (params: TestParams) =>
       });
     });
   });
+};
 
 describe('OTLPLogExporter - node (getDefaultUrl)', () => {
   it('should default to localhost', done => {
@@ -344,3 +357,5 @@ describe('when configuring via environment', () => {
 testCollectorExporter({ useTLS: true });
 testCollectorExporter({ useTLS: false });
 testCollectorExporter({ metadata });
+// skip UDS tests on windows
+process.platform !== 'win32' && testCollectorExporter({ address: udsAddr });
diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -88,7 +88,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",
-    "lerna": "6.6.2",
+    "lerna": "7.0.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.1.2",

diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -71,7 +71,7 @@
     "codecov": "3.8.3",
     "cpx": "1.5.0",
     "cross-var": "1.1.0",
-    "lerna": "6.6.2",
+    "lerna": "7.0.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.1.2",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/README.md b/experimental/packages/exporter-trace-otlp-grpc/README.md
@@ -30,6 +30,7 @@ const { OTLPTraceExporter } =  require('@opentelemetry/exporter-trace-otlp-grpc'
 
 const collectorOptions = {
   // url is optional and can be omitted - default is http://localhost:4317
+  // Unix domain sockets are also supported: 'unix:///path/to/socket.sock'
   url: 'http://<collector-hostname>:<port>',
 };
 
@@ -54,6 +55,7 @@ const { OTLPTraceExporter } =  require('@opentelemetry/exporter-trace-otlp-grpc'
 
 const collectorOptions = {
   // url is optional and can be omitted - default is http://localhost:4317
+  // Unix domain sockets are also supported: 'unix:///path/to/socket.sock'
   url: 'http://<collector-hostname>:<port>',
   credentials: grpc.credentials.createSsl(),
 };
@@ -94,6 +96,7 @@ metadata.set('k', 'v');
 
 const collectorOptions = {
   // url is optional and can be omitted - default is http://localhost:4317
+  // Unix domain sockets are also supported: 'unix:///path/to/socket.sock'
   url: 'http://<collector-hostname>:<port>',
   metadata, // // an optional grpc.Metadata object to be sent with each request
 };
@@ -120,6 +123,7 @@ The OTLPTraceExporter has a timeout configuration option which is the maximum ti
   const collectorOptions = {
     timeoutMillis: 15000,
     // url is optional and can be omitted - default is localhost:4317
+    // Unix domain sockets are also supported: 'unix:///path/to/socket.sock'
     url: '<collector-hostname>:<port>',
     metadata, // // an optional grpc.Metadata object to be sent with each request
   };
@@ -138,6 +142,7 @@ const { CompressionAlgorithm } = require('@opentelemetry/exporter-trace-otlp-grp
 
 const collectorOptions = {
   // url is optional and can be omitted - default is http://localhost:4317
+  // Unix domain sockets are also supported: 'unix:///path/to/socket.sock'
   url: 'http://<collector-hostname>:<port>',
   metadata, // // an optional grpc.Metadata object to be sent with each request
   compression: CompressionAlgorithm.GZIP,

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -57,7 +57,7 @@
     "codecov": "3.8.3",
     "cpx": "1.5.0",
     "cross-var": "1.1.0",
-    "lerna": "6.6.2",
+    "lerna": "7.0.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.1.2",