Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(experimental): v0.26.0 proposal #2513

Merged
merged 3 commits into from
Oct 5, 2021
Merged

chore(experimental): v0.26.0 proposal #2513

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f04bf2
chore(experimental): v0.26.0 proposal
dyladan Sep 30, 2021
9ae4fba
Merge remote-tracking branch 'origin/main' into proposal-experimental-26
dyladan Oct 5, 2021
21a5ab9
chore: update compatibility matrix
dyladan Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into proposal-experimental-26
  • Loading branch information
@dyladan
dyladan committed Oct 5, 2021
commit 9ae4fba7bd75398d283eea5b2debcd3059ef09e0
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node10/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0"
"@opentelemetry/sdk-trace-base": "1.0.0"
},
"devDependencies": {
"@types/node": "10.17.60",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node12/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0"
"@opentelemetry/sdk-trace-base": "1.0.0"
},
"devDependencies": {
"@types/node": "12.20.20",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node8/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0"
"@opentelemetry/sdk-trace-base": "1.0.0"
},
"devDependencies": {
"@types/node": "8.10.66",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-exporter-otlp-grpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/exporter-otlp-http": "0.26.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/resources": "1.0.0",
"@opentelemetry/sdk-metrics-base": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0"
"@opentelemetry/sdk-trace-base": "1.0.0"
}
}
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-exporter-otlp-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.26.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/resources": "1.0.0",
"@opentelemetry/sdk-metrics-base": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0"
"@opentelemetry/sdk-trace-base": "1.0.0"
}
}
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-exporter-otlp-proto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/exporter-otlp-http": "0.26.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/resources": "1.0.0",
"@opentelemetry/sdk-metrics-base": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0",
"@opentelemetry/sdk-trace-base": "1.0.0",
"protobufjs": "^6.9.0"
}
}
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-exporter-prometheus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.26.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/sdk-metrics-base": "0.26.0"
}
}
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/core": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/sdk-trace-web": "0.26.0",
"@opentelemetry/semantic-conventions": "0.26.0"
"@opentelemetry/sdk-trace-web": "1.0.0",
"@opentelemetry/semantic-conventions": "1.0.0"
}
}
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation-grpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@
"dependencies": {
"@opentelemetry/api-metrics": "0.26.0",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/semantic-conventions": "0.26.0"
"@opentelemetry/semantic-conventions": "1.0.0"
}
}
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-instrumentation-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/core": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/semantic-conventions": "0.26.0",
"@opentelemetry/semantic-conventions": "1.0.0",
"semver": "^7.3.5"
}
}
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/core": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/sdk-trace-web": "0.26.0",
"@opentelemetry/semantic-conventions": "0.26.0"
"@opentelemetry/sdk-trace-web": "1.0.0",
"@opentelemetry/semantic-conventions": "1.0.0"
}
}
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-metrics-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.26.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/resources": "1.0.0",
"lodash.merge": "^4.6.2"
}
}
8 changes: 4 additions & 4 deletions experimental/packages/opentelemetry-sdk-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.26.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/resource-detector-aws": "0.24.0",
"@opentelemetry/resource-detector-gcp": "0.24.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/resources": "1.0.0",
"@opentelemetry/sdk-metrics-base": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0",
"@opentelemetry/sdk-trace-node": "0.26.0"
"@opentelemetry/sdk-trace-base": "1.0.0",
"@opentelemetry/sdk-trace-node": "1.0.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.