Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove JSON syntax error and regenerate tsconfig files #3566

Merged
merged 8 commits into from
Jan 27, 2023
Merged

fix: remove JSON syntax error and regenerate tsconfig files #3566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
647313d
chore: regenerate tsconfig files
Flarna Jan 25, 2023
067dea4
Merge branch 'main' into update-tsconfigs
Flarna Jan 25, 2023
b6a96e2
Merge branch 'main' into update-tsconfigs
Flarna Jan 25, 2023
b54e1a0
Merge branch 'main' into pr/Flarna/3566
dyladan Jan 27, 2023
1e453fc
fix: add generated js files back to proto base esnext
dyladan Jan 27, 2023
0ef1038
Changelog
dyladan Jan 27, 2023
4cb3e45
Merge branch 'main' into update-tsconfigs
dyladan Jan 27, 2023
f324f22
Merge branch 'main' into update-tsconfigs
dyladan Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions experimental/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ All notable changes to experimental packages in this project will be documented

### :bug: (Bug Fix)

* fix: remove JSON syntax error and regenerate tsconfig files [#3566](https://github.com/open-telemetry/opentelemetry-js/pull/3566) @Flarna
* Fixes an error where the generated JS files were not included in the esnext package due to a failure of the tsconfig generation
* fix(sdk-node): register instrumentations early [#3502](https://github.com/open-telemetry/opentelemetry-js/pull/3502) @flarna
* fix: include tracestate in export [#3569](https://github.com/open-telemetry/opentelemetry-js/pull/3569) @flarna

Expand Down
15 changes: 15 additions & 0 deletions experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@
},
{
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../../../packages/opentelemetry-resources"
},
{
"path": "../../../packages/opentelemetry-sdk-trace-base"
},
{
"path": "../otlp-exporter-base"
},
{
"path": "../otlp-proto-exporter-base"
},
{
"path": "../otlp-transformer"
}
]
}
15 changes: 15 additions & 0 deletions experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@
},
{
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../../../packages/opentelemetry-resources"
},
{
"path": "../../../packages/opentelemetry-sdk-trace-base"
},
{
"path": "../otlp-exporter-base"
},
{
"path": "../otlp-proto-exporter-base"
},
{
"path": "../otlp-transformer"
}
]
}
3 changes: 3 additions & 0 deletions experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
},
{
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../otlp-exporter-base"
}
]
}
5 changes: 4 additions & 1 deletion experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
},
"include": [
"src/**/*.ts",
"src/generated/*.js",
dyladan marked this conversation as resolved.
Show resolved Hide resolved
"src/generated/*.js"
],
"references": [
{
"path": "../../../api"
},
{
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../otlp-exporter-base"
}
]
}
6 changes: 6 additions & 0 deletions tsconfig.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
{
"path": "experimental/packages/exporter-trace-otlp-http/tsconfig.esm.json"
},
{
"path": "experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json"
},
{
"path": "experimental/packages/opentelemetry-browser-detector/tsconfig.esm.json"
},
Expand All @@ -29,6 +32,9 @@
{
"path": "experimental/packages/otlp-exporter-base/tsconfig.esm.json"
},
{
"path": "experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json"
},
{
"path": "experimental/packages/otlp-transformer/tsconfig.esm.json"
},
Expand Down
6 changes: 6 additions & 0 deletions tsconfig.esnext.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
{
"path": "experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json"
},
{
"path": "experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json"
},
{
"path": "experimental/packages/opentelemetry-browser-detector/tsconfig.esnext.json"
},
Expand All @@ -29,6 +32,9 @@
{
"path": "experimental/packages/otlp-exporter-base/tsconfig.esnext.json"
},
{
"path": "experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json"
},
{
"path": "experimental/packages/otlp-transformer/tsconfig.esnext.json"
},
Expand Down