Skip to content

Commit

Permalink
Merge 497702c into 7870e95
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan authored Mar 28, 2022
2 parents 7870e95 + 497702c commit c278929
Show file tree
Hide file tree
Showing 18 changed files with 62 additions and 62 deletions.
12 changes: 6 additions & 6 deletions examples/grpc-js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^1.0.1",
"@opentelemetry/exporter-zipkin": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^1.1.1",
"@opentelemetry/exporter-zipkin": "^1.1.1",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation-grpc": "^0.27.0",
"@opentelemetry/resources": "^1.0.1",
"@opentelemetry/semantic-conventions": "^1.0.1",
"@opentelemetry/sdk-trace-base": "^1.0.1",
"@opentelemetry/sdk-trace-node": "^1.0.1",
"@opentelemetry/resources": "^1.1.1",
"@opentelemetry/semantic-conventions": "^1.1.1",
"@opentelemetry/sdk-trace-base": "^1.1.1",
"@opentelemetry/sdk-trace-node": "^1.1.1",
"google-protobuf": "^3.9.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^1.0.1",
"@opentelemetry/exporter-zipkin": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^1.1.1",
"@opentelemetry/exporter-zipkin": "^1.1.1",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation-grpc": "^0.27.0",
"@opentelemetry/resources": "^1.0.1",
"@opentelemetry/semantic-conventions": "^1.0.1",
"@opentelemetry/sdk-trace-base": "^1.0.1",
"@opentelemetry/sdk-trace-node": "^1.0.1",
"@opentelemetry/resources": "^1.1.1",
"@opentelemetry/semantic-conventions": "^1.1.1",
"@opentelemetry/sdk-trace-base": "^1.1.1",
"@opentelemetry/sdk-trace-node": "^1.1.1",
"google-protobuf": "^3.9.2",
"grpc": "^1.23.3",
"node-pre-gyp": "0.14.0"
Expand Down
8 changes: 4 additions & 4 deletions examples/otlp-exporter-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.27.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.27.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.27.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.27.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/semantic-conventions": "1.1.1",
"@opentelemetry/sdk-metrics-base": "0.27.0",
"@opentelemetry/sdk-trace-base": "1.0.1"
"@opentelemetry/sdk-trace-base": "1.1.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
16 changes: 8 additions & 8 deletions examples/tracer-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/context-zone": "^1.0.1",
"@opentelemetry/core": "^1.0.1",
"@opentelemetry/sdk-trace-base": "^1.0.1",
"@opentelemetry/sdk-trace-web": "^1.0.1",
"@opentelemetry/exporter-zipkin": "^1.0.1",
"@opentelemetry/semantic-conventions": "^1.0.1",
"@opentelemetry/propagator-b3": "^1.0.1",
"@opentelemetry/resources": "^1.0.1",
"@opentelemetry/context-zone": "^1.1.1",
"@opentelemetry/core": "^1.1.1",
"@opentelemetry/sdk-trace-base": "^1.1.1",
"@opentelemetry/sdk-trace-web": "^1.1.1",
"@opentelemetry/exporter-zipkin": "^1.1.1",
"@opentelemetry/semantic-conventions": "^1.1.1",
"@opentelemetry/propagator-b3": "^1.1.1",
"@opentelemetry/resources": "^1.1.1",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/instrumentation-fetch": "0.27.0",
"@opentelemetry/instrumentation-xml-http-request": "0.27.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node10/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.27.0",
"@opentelemetry/sdk-trace-base": "1.0.1"
"@opentelemetry/sdk-trace-base": "1.1.1"
},
"devDependencies": {
"@types/node": "10.17.60",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node12/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.27.0",
"@opentelemetry/sdk-trace-base": "1.0.1"
"@opentelemetry/sdk-trace-base": "1.1.1"
},
"devDependencies": {
"@types/node": "12.20.37",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node8/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.27.0",
"@opentelemetry/sdk-trace-base": "1.0.1"
"@opentelemetry/sdk-trace-base": "1.1.1"
},
"devDependencies": {
"@types/node": "8.10.66",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@
"dependencies": {
"@grpc/grpc-js": "^1.5.9",
"@grpc/proto-loader": "^0.6.9",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.27.0",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-metrics-base": "0.27.0"
}
}
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.27.0",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-metrics-base": "0.27.0"
}
}
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
},
"dependencies": {
"@grpc/proto-loader": "0.6.9",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.27.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-metrics-base": "0.27.0",
"protobufjs": "^6.9.0"
}
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-exporter-prometheus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"dependencies": {
"@opentelemetry/api-metrics-wip": "0.27.0",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/sdk-metrics-base-wip": "0.27.0"
}
}
12 changes: 6 additions & 6 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/context-zone": "1.0.1",
"@opentelemetry/propagator-b3": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/context-zone": "1.1.1",
"@opentelemetry/propagator-b3": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand Down Expand Up @@ -86,9 +86,9 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/sdk-trace-web": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/sdk-trace-web": "1.1.1",
"@opentelemetry/semantic-conventions": "1.1.1"
}
}
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-instrumentation-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"@grpc/grpc-js": "1.5.9",
"@grpc/proto-loader": "0.6.9",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@opentelemetry/context-async-hooks": "1.1.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1",
"@opentelemetry/sdk-trace-node": "1.1.1",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/semver": "7.3.9",
Expand All @@ -72,6 +72,6 @@
"dependencies": {
"@opentelemetry/api-metrics": "0.27.0",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/semantic-conventions": "1.1.1"
}
}
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-instrumentation-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@opentelemetry/context-async-hooks": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1",
"@opentelemetry/sdk-trace-node": "1.1.1",
"@types/got": "9.6.12",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
Expand All @@ -73,9 +73,9 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/semantic-conventions": "1.0.1",
"@opentelemetry/semantic-conventions": "1.1.1",
"semver": "^7.3.5"
}
}
12 changes: 6 additions & 6 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/context-zone": "1.0.1",
"@opentelemetry/propagator-b3": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/context-zone": "1.1.1",
"@opentelemetry/propagator-b3": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand Down Expand Up @@ -86,9 +86,9 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/sdk-trace-web": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/sdk-trace-web": "1.1.1",
"@opentelemetry/semantic-conventions": "1.1.1"
}
}
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-sdk-metrics-base/examples/metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/core": "^1.0.1",
"@opentelemetry/core": "^1.1.1",
"@opentelemetry/exporter-prometheus": "^0.27.0",
"@opentelemetry/sdk-metrics-base": "^0.27.0"
},
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-metrics-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
"todo": "Move API metrics to peer dependencies. While it is using an unpublished name, lerna doesn't properly link it if it is in peer dependencies",
"dependencies": {
"@opentelemetry/api-metrics-wip": "0.27.0",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/resources": "1.1.1",
"lodash.merge": "4.6.2"
}
}
6 changes: 3 additions & 3 deletions experimental/packages/otlp-transformer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
"webpack": "4.46.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-metrics-base": "0.27.0",
"@opentelemetry/sdk-trace-base": "1.0.1"
"@opentelemetry/sdk-trace-base": "1.1.1"
}
}

0 comments on commit c278929

Please sign in to comment.