Skip to content

Commit e0abcc0

Browse files
Flarnadyladan
andauthored
fix: remove JSON syntax error and regenerate tsconfig files (#3566)
* chore: regenerate tsconfig files * fix: add generated js files back to proto base esnext * Changelog --------- Co-authored-by: Daniel Dyla <[email protected]>
1 parent a90c558 commit e0abcc0

File tree

7 files changed

+51
-1
lines changed

7 files changed

+51
-1
lines changed

experimental/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ All notable changes to experimental packages in this project will be documented
1010

1111
### :bug: (Bug Fix)
1212

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

experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,21 @@
1414
},
1515
{
1616
"path": "../../../packages/opentelemetry-core"
17+
},
18+
{
19+
"path": "../../../packages/opentelemetry-resources"
20+
},
21+
{
22+
"path": "../../../packages/opentelemetry-sdk-trace-base"
23+
},
24+
{
25+
"path": "../otlp-exporter-base"
26+
},
27+
{
28+
"path": "../otlp-proto-exporter-base"
29+
},
30+
{
31+
"path": "../otlp-transformer"
1732
}
1833
]
1934
}

experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,21 @@
1414
},
1515
{
1616
"path": "../../../packages/opentelemetry-core"
17+
},
18+
{
19+
"path": "../../../packages/opentelemetry-resources"
20+
},
21+
{
22+
"path": "../../../packages/opentelemetry-sdk-trace-base"
23+
},
24+
{
25+
"path": "../otlp-exporter-base"
26+
},
27+
{
28+
"path": "../otlp-proto-exporter-base"
29+
},
30+
{
31+
"path": "../otlp-transformer"
1732
}
1833
]
1934
}

experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
},
1717
{
1818
"path": "../../../packages/opentelemetry-core"
19+
},
20+
{
21+
"path": "../otlp-exporter-base"
1922
}
2023
]
2124
}

experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@
88
},
99
"include": [
1010
"src/**/*.ts",
11-
"src/generated/*.js",
11+
"src/generated/*.js"
1212
],
1313
"references": [
1414
{
1515
"path": "../../../api"
1616
},
1717
{
1818
"path": "../../../packages/opentelemetry-core"
19+
},
20+
{
21+
"path": "../otlp-exporter-base"
1922
}
2023
]
2124
}

tsconfig.esm.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
{
1212
"path": "experimental/packages/exporter-trace-otlp-http/tsconfig.esm.json"
1313
},
14+
{
15+
"path": "experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json"
16+
},
1417
{
1518
"path": "experimental/packages/opentelemetry-browser-detector/tsconfig.esm.json"
1619
},
@@ -29,6 +32,9 @@
2932
{
3033
"path": "experimental/packages/otlp-exporter-base/tsconfig.esm.json"
3134
},
35+
{
36+
"path": "experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json"
37+
},
3238
{
3339
"path": "experimental/packages/otlp-transformer/tsconfig.esm.json"
3440
},

tsconfig.esnext.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
{
1212
"path": "experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json"
1313
},
14+
{
15+
"path": "experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json"
16+
},
1417
{
1518
"path": "experimental/packages/opentelemetry-browser-detector/tsconfig.esnext.json"
1619
},
@@ -29,6 +32,9 @@
2932
{
3033
"path": "experimental/packages/otlp-exporter-base/tsconfig.esnext.json"
3134
},
35+
{
36+
"path": "experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json"
37+
},
3238
{
3339
"path": "experimental/packages/otlp-transformer/tsconfig.esnext.json"
3440
},

0 commit comments

Comments
 (0)