Merge branch 'main' into feat/proto-metrics-add-esm

open-telemetry · Sep 13, 2023 · 6c4b908 · 6c4b908
2 parents 08bc62f + 5615b1c
commit 6c4b908
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,17 +2,9 @@ name: "CodeQL Analysis"
 
 on:
   workflow_dispatch:
-  schedule:
-    #        ┌───────────── minute (0 - 59)
-    #        │  ┌───────────── hour (0 - 23)
-    #        │  │ ┌───────────── day of the month (1 - 31)
-    #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        *  * * * *
-    - cron: '30 1 * * *'
+  push:
+    branches: [ main ]
+  pull_request:
 
 jobs:
   CodeQL-Build:

diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -49,6 +49,7 @@ All notable changes to experimental packages in this project will be documented
 ### :bug: (Bug Fix)
 
 * fix(exporter-logs-otlp-http): add @opentelemetry/api-logs as dependency
+* fix(sdk-node): remove explicit dependency on @opentelemetry/exporter-jaeger.
 
 ## 0.41.2
 

diff --git a/experimental/packages/opentelemetry-sdk-node/README.md b/experimental/packages/opentelemetry-sdk-node/README.md
@@ -36,6 +36,7 @@ Before any other module in your application is loaded, you must initialize the S
 If you fail to initialize the SDK or initialize it too late, no-op implementations will be provided to any library which acquires a tracer or meter from the API.
 
 This example uses Jaeger and Prometheus, but exporters exist for [other tracing backends][other-tracing-backends].
+As shown in the installation instructions, exporters passed to the SDK must be installed alongside `@opentelemetry/sdk-node`.
 
 ```javascript
 const opentelemetry = require("@opentelemetry/sdk-node");

diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json
@@ -66,6 +66,7 @@
   "devDependencies": {
     "@opentelemetry/api": "1.6.0",
     "@opentelemetry/context-async-hooks": "1.17.0",
+    "@opentelemetry/exporter-jaeger": "1.17.0",
     "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.1",