Skip to content

Commit

Permalink
Merge pull request #64 from timlrx/pr-60
Browse files Browse the repository at this point in the history
update @opentelemetry dependencies
  • Loading branch information
timlrx authored Feb 8, 2025
2 parents 79bc492 + 0fbc55c commit ef629a8
Show file tree
Hide file tree
Showing 15 changed files with 135 additions and 191 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ out
!tap-snapshots/dist/*

.contentlayer
.DS_Store
.DS_Store

.idea
.idea/**
2 changes: 1 addition & 1 deletion packages/@contentlayer/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/cli",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/@contentlayer/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/client",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/@contentlayer/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/core",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": {
".": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/experimental-source-files-stackbit",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": {
".": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@contentlayer/source-contentful/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/source-contentful",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/@contentlayer/source-files/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/source-files",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": {
".": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@contentlayer/source-remote-files/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/source-remote-files",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": {
".": {
Expand Down
16 changes: 8 additions & 8 deletions packages/@contentlayer/utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentlayer2/utils",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"exports": {
"./package.json": {
Expand Down Expand Up @@ -61,13 +61,13 @@
"@effect-ts/otel": "^0.15.1",
"@effect-ts/otel-sdk-trace-node": "^0.15.1",
"@js-temporal/polyfill": "^0.4.4",
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/core": "^1.24.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.51.0",
"@opentelemetry/resources": "^1.21.0",
"@opentelemetry/sdk-trace-base": "^1.21.0",
"@opentelemetry/sdk-trace-node": "^1.21.0",
"@opentelemetry/semantic-conventions": "^1.21.0",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/core": "^1.30.1",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.57.1",
"@opentelemetry/resources": "^1.30.1",
"@opentelemetry/sdk-trace-base": "^1.30.1",
"@opentelemetry/sdk-trace-node": "^1.30.1",
"@opentelemetry/semantic-conventions": "^1.28.0",
"chokidar": "^3.5.3",
"hash-wasm": "^4.11.0",
"inflection": "^3.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,7 @@ export const makeTracingSpanExporter = M.gen(function* (_) {
const spanExporter = yield* _(
pipe(
T.succeedWith(() => new OTLPTraceExporter(config)),
// NOTE Unfortunately this workaround/"hack" is currently needed since Otel doesn't yet provide a graceful
// way to shutdown.
//
// Related issue: https://github.com/open-telemetry/opentelemetry-js/issues/987
M.make((p) =>
T.gen(function* (_) {
while (1) {
yield* _(T.sleep(0))
const promises = p['_sendingPromises'] as any[]
if (promises.length > 0) {
yield* _(T.result(T.promise(() => Promise.all(promises))))
} else {
break
}
}
}),
),
M.make((exporter) => T.promise(() => exporter.shutdown())),
),
)

Expand Down
2 changes: 1 addition & 1 deletion packages/contentlayer-stackbit-yaml-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "contentlayer-stackbit-yaml-generator2",
"version": "0.5.1",
"version": "0.5.4",
"type": "module",
"bin": "./dist/cli/index.js",
"exports": "./dist/lib/index.js",
Expand Down
3 changes: 1 addition & 2 deletions packages/contentlayer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,9 @@ Join [our Discord community](https://discord.gg/fk83HNECYJ) to get help, suggest
- [guneyunay.com](https://www.guneyunay.com)
- [sailingdigital.online](https://sailingdigital.online/)
- [ruchern.dev](https://ruchern.dev)
- [fwzyrln_](https://zira.my.id) ([Source](https://github.com/fauziralpiandi/fauziralpiandi))
- [fwzyrln\_](https://zira.my.id) ([Source](https://github.com/fauziralpiandi/fauziralpiandi))
- [Top4AI](https://top4ai.com)
- [haklee.me](https://www.haklee.me)([Source](https://github.com/ohprettyhak/haklee.me))
- [blog.imbios.dev](https://blog.imbios.dev/)


Are you using Contentlayer? Please add your page (and repo) to the end of the list via a PR. 🙏
2 changes: 1 addition & 1 deletion packages/contentlayer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "contentlayer2",
"version": "0.5.2",
"version": "0.5.4",
"bin": "./bin/cli.cjs",
"type": "module",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/next-contentlayer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-contentlayer2",
"version": "0.5.2",
"version": "0.5.4",
"type": "module",
"main": "./dist/index-cjs.cjs",
"sideEffects": false,
Expand Down
Loading

0 comments on commit ef629a8

Please sign in to comment.