Skip to content

Commit

Permalink
fix: remove JSON syntax error and regenerate tsconfig files (#3566)
Browse files Browse the repository at this point in the history
* chore: regenerate tsconfig files

* fix: add generated js files back to proto base esnext

* Changelog

---------

Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
  • Loading branch information
Flarna and dyladan authored Jan 27, 2023
1 parent a90c558 commit e0abcc0
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 1 deletion.
2 changes: 2 additions & 0 deletions experimental/CHANGELOG.md
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
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"
}
]
}
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"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
},
{
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../otlp-exporter-base"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
},
"include": [
"src/**/*.ts",
"src/generated/*.js",
"src/generated/*.js"
],
"references": [
{
"path": "../../../api"
},
{
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../otlp-exporter-base"
}
]
}
6 changes: 6 additions & 0 deletions tsconfig.esm.json
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
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

0 comments on commit e0abcc0

Please sign in to comment.