Skip to content

Commit

Permalink
Merge 9dda63e into 7268daa
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan authored Mar 18, 2022
2 parents 7268daa + 9dda63e commit 5a8acd7
Show file tree
Hide file tree
Showing 22 changed files with 233 additions and 75 deletions.
158 changes: 158 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions integration-tests/propagation-validation-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "propagation-validation-server",
"version": "1.0.1",
"version": "1.1.0",
"description": "server for w3c tests",
"main": "validation_server.js",
"private": true,
Expand All @@ -12,9 +12,9 @@
},
"dependencies": {
"@opentelemetry/api": "~1.1.0",
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/context-async-hooks": "1.1.0",
"@opentelemetry/core": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"axios": "0.24.0",
"body-parser": "1.19.0",
"express": "4.17.1"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.1",
"version": "1.1.0",
"npmClient": "npm",
"packages": [
"packages/*",
Expand Down
10 changes: 5 additions & 5 deletions packages/exporter-trace-otlp-grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-grpc",
"version": "1.0.1",
"version": "1.1.0",
"private": "true",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
Expand Down Expand Up @@ -69,9 +69,9 @@
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/exporter-trace-otlp-http": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1"
"@opentelemetry/core": "1.1.0",
"@opentelemetry/exporter-trace-otlp-http": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0"
}
}
8 changes: 4 additions & 4 deletions packages/exporter-trace-otlp-http/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-http",
"version": "1.0.1",
"version": "1.1.0",
"private": "true",
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
Expand Down Expand Up @@ -92,8 +92,8 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1"
"@opentelemetry/core": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0"
}
}
10 changes: 5 additions & 5 deletions packages/exporter-trace-otlp-proto/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-proto",
"version": "1.0.1",
"version": "1.1.0",
"private": "true",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
"main": "build/src/index.js",
Expand Down Expand Up @@ -68,10 +68,10 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/exporter-trace-otlp-http": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/core": "1.1.0",
"@opentelemetry/exporter-trace-otlp-http": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"protobufjs": "^6.9.0"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-async-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/context-async-hooks",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry AsyncHooks-based Context Manager",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-zone-peer-dep/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/context-zone-peer-dep",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Context Zone with peer dependency for zone.js",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-zone/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/context-zone",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Context Zone",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -72,7 +72,7 @@
"webpack-merge": "5.8.0"
},
"dependencies": {
"@opentelemetry/context-zone-peer-dep": "1.0.1",
"@opentelemetry/context-zone-peer-dep": "1.1.0",
"zone.js": "^0.11.0"
},
"sideEffects": true
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/core",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -89,6 +89,6 @@
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/semantic-conventions": "1.1.0"
}
}
10 changes: 5 additions & 5 deletions packages/opentelemetry-exporter-jaeger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-jaeger",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/resources": "1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -60,9 +60,9 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1",
"@opentelemetry/core": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"@opentelemetry/semantic-conventions": "1.1.0",
"jaeger-client": "^3.15.0"
}
}
10 changes: 5 additions & 5 deletions packages/opentelemetry-exporter-zipkin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-zipkin",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -89,9 +89,9 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/core": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"@opentelemetry/semantic-conventions": "1.1.0"
}
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-propagator-b3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/propagator-b3",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/core": "1.0.1"
"@opentelemetry/core": "1.1.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-propagator-jaeger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/propagator-jaeger",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -75,6 +75,6 @@
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1"
"@opentelemetry/core": "1.1.0"
}
}
6 changes: 3 additions & 3 deletions packages/opentelemetry-resources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resources",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry SDK resources",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -85,7 +85,7 @@
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/core": "1.1.0",
"@opentelemetry/semantic-conventions": "1.1.0"
}
}
8 changes: 4 additions & 4 deletions packages/opentelemetry-sdk-trace-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/sdk-trace-base",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Tracing",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -86,8 +86,8 @@
"@opentelemetry/api": ">=1.1.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/core": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/semantic-conventions": "1.1.0"
}
}
16 changes: 8 additions & 8 deletions packages/opentelemetry-sdk-trace-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/sdk-trace-node",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -44,8 +44,8 @@
},
"devDependencies": {
"@opentelemetry/api": "~1.1.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/semantic-conventions": "1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/semver": "7.3.9",
Expand All @@ -62,11 +62,11 @@
"@opentelemetry/api": ">=1.1.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/propagator-b3": "1.0.1",
"@opentelemetry/propagator-jaeger": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/context-async-hooks": "1.1.0",
"@opentelemetry/core": "1.1.0",
"@opentelemetry/propagator-b3": "1.1.0",
"@opentelemetry/propagator-jaeger": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"semver": "^7.3.5"
}
}
14 changes: 7 additions & 7 deletions packages/opentelemetry-sdk-trace-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/sdk-trace-web",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry Web Tracer",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -55,9 +55,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "~1.1.0",
"@opentelemetry/context-zone": "1.0.1",
"@opentelemetry/propagator-b3": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/context-zone": "1.1.0",
"@opentelemetry/propagator-b3": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@types/jquery": "3.5.8",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
Expand Down Expand Up @@ -89,8 +89,8 @@
"@opentelemetry/api": ">=1.1.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/core": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"@opentelemetry/semantic-conventions": "1.1.0"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-semantic-conventions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/semantic-conventions",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTelemetry semantic conventions",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
12 changes: 6 additions & 6 deletions packages/opentelemetry-shim-opentracing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/shim-opentracing",
"version": "1.0.1",
"version": "1.1.0",
"description": "OpenTracing to OpenTelemetry shim",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -41,9 +41,9 @@
},
"devDependencies": {
"@opentelemetry/api": "~1.1.0",
"@opentelemetry/propagator-b3": "1.0.1",
"@opentelemetry/propagator-jaeger": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/propagator-b3": "1.1.0",
"@opentelemetry/propagator-jaeger": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"codecov": "3.8.3",
Expand All @@ -57,8 +57,8 @@
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1",
"@opentelemetry/core": "1.1.0",
"@opentelemetry/semantic-conventions": "1.1.0",
"opentracing": "^0.14.4"
}
}
2 changes: 1 addition & 1 deletion packages/template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/template",
"version": "1.0.1",
"version": "1.1.0",
"private": true,
"publishConfig": {
"access": "restricted"
Expand Down
Loading

0 comments on commit 5a8acd7

Please sign in to comment.