Skip to content

Commit

Permalink
Merge branch 'main' into proposal-1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan committed Sep 30, 2021
2 parents 7adfb13 + 6afe2fc commit c28965a
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node10/package.json
View file
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/sdk-trace-base": "0.26.0"
},
"devDependencies": {
"@types/node": "10.17.60",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node12/package.json
View file
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/sdk-trace-base": "0.26.0"
},
"devDependencies": {
"@types/node": "12.20.20",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatability/node8/package.json
View file
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/sdk-trace-base": "0.26.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
Expand Up @@ -69,10 +69,10 @@
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/exporter-otlp-http": "0.25.0",
"@opentelemetry/sdk-metrics-base": "0.25.0",
"@opentelemetry/resources": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0"
}
}
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-exporter-otlp-http/package.json
View file
Expand Up @@ -87,9 +87,9 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.25.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/resources": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/sdk-metrics-base": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/sdk-trace-base": "0.26.0"
}
}
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-exporter-otlp-proto/package.json
View file
Expand Up @@ -68,11 +68,11 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/exporter-otlp-http": "0.25.0",
"@opentelemetry/sdk-metrics-base": "0.25.0",
"@opentelemetry/resources": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0",
"protobufjs": "^6.9.0"
}
}
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-exporter-prometheus/package.json
View file
Expand Up @@ -58,7 +58,7 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.25.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/sdk-metrics-base": "0.25.0"
}
}
12 changes: 6 additions & 6 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Expand Up @@ -50,9 +50,9 @@
"devDependencies": {
"@babel/core": "7.15.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/context-zone": "0.25.0",
"@opentelemetry/propagator-b3": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0",
"@opentelemetry/context-zone": "0.26.0",
"@opentelemetry/propagator-b3": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.11",
"@types/sinon": "10.0.2",
Expand Down Expand Up @@ -81,9 +81,9 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/core": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/instrumentation": "0.25.0",
"@opentelemetry/sdk-trace-web": "0.25.0",
"@opentelemetry/semantic-conventions": "0.25.0"
"@opentelemetry/sdk-trace-web": "0.26.0",
"@opentelemetry/semantic-conventions": "0.26.0"
}
}
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-instrumentation-grpc/package.json
View file
Expand Up @@ -46,10 +46,10 @@
"@grpc/grpc-js": "1.3.7",
"@grpc/proto-loader": "0.6.4",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/context-async-hooks": "0.25.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0",
"@opentelemetry/sdk-trace-node": "0.25.0",
"@opentelemetry/context-async-hooks": "0.26.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0",
"@opentelemetry/sdk-trace-node": "0.26.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.11",
"@types/semver": "7.3.8",
Expand All @@ -71,6 +71,6 @@
"dependencies": {
"@opentelemetry/api-metrics": "0.25.0",
"@opentelemetry/instrumentation": "0.25.0",
"@opentelemetry/semantic-conventions": "0.25.0"
"@opentelemetry/semantic-conventions": "0.26.0"
}
}
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts
View file
Expand Up @@ -19,7 +19,7 @@ import {
SpanKind,
propagation, trace,
} from '@opentelemetry/api';
import { HttpTraceContextPropagator } from '@opentelemetry/core';
import { W3CTraceContextPropagator } from '@opentelemetry/core';
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
import { ContextManager } from '@opentelemetry/api';
Expand Down Expand Up @@ -386,7 +386,7 @@ export const runTests = (
let contextManager: ContextManager;

before(() => {
propagation.setGlobalPropagator(new HttpTraceContextPropagator());
propagation.setGlobalPropagator(new W3CTraceContextPropagator());
});

beforeEach(() => {
Expand Down
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-instrumentation-http/package.json
View file
Expand Up @@ -44,9 +44,9 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/context-async-hooks": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0",
"@opentelemetry/sdk-trace-node": "0.25.0",
"@opentelemetry/context-async-hooks": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0",
"@opentelemetry/sdk-trace-node": "0.26.0",
"@types/got": "9.6.12",
"@types/mocha": "8.2.3",
"@types/node": "14.17.11",
Expand All @@ -72,9 +72,9 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/core": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/instrumentation": "0.25.0",
"@opentelemetry/semantic-conventions": "0.25.0",
"@opentelemetry/semantic-conventions": "0.26.0",
"semver": "^7.3.5"
}
}
12 changes: 6 additions & 6 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Expand Up @@ -50,9 +50,9 @@
"devDependencies": {
"@babel/core": "7.15.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/context-zone": "0.25.0",
"@opentelemetry/propagator-b3": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0",
"@opentelemetry/context-zone": "0.26.0",
"@opentelemetry/propagator-b3": "0.26.0",
"@opentelemetry/sdk-trace-base": "0.26.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.11",
"@types/sinon": "10.0.2",
Expand Down Expand Up @@ -81,9 +81,9 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/core": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/instrumentation": "0.25.0",
"@opentelemetry/sdk-trace-web": "0.25.0",
"@opentelemetry/semantic-conventions": "0.25.0"
"@opentelemetry/sdk-trace-web": "0.26.0",
"@opentelemetry/semantic-conventions": "0.26.0"
}
}
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-metrics-base/package.json
View file
Expand Up @@ -64,8 +64,8 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.25.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/resources": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/resources": "0.26.0",
"lodash.merge": "^4.6.2"
}
}
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-sdk-node/package.json
View file
Expand Up @@ -43,21 +43,21 @@
},
"dependencies": {
"@opentelemetry/api-metrics": "0.25.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/core": "0.26.0",
"@opentelemetry/instrumentation": "0.25.0",
"@opentelemetry/resource-detector-aws": "0.24.0",
"@opentelemetry/resource-detector-gcp": "0.24.0",
"@opentelemetry/resources": "0.25.0",
"@opentelemetry/resources": "0.26.0",
"@opentelemetry/sdk-metrics-base": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0",
"@opentelemetry/sdk-trace-node": "0.25.0"
"@opentelemetry/sdk-trace-base": "0.26.0",
"@opentelemetry/sdk-trace-node": "0.26.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
},
"devDependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/context-async-hooks": "0.25.0",
"@opentelemetry/context-async-hooks": "0.26.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.11",
"@types/semver": "7.3.8",
Expand Down

0 comments on commit c28965a

Please sign in to comment.