Skip to content

Commit a44c600

Browse files
legendecaslegendecas
committed
Merge remote-tracking branch 'upstream/main' into move-detectors
# Conflicts: # packages/opentelemetry-test-utils/package.json
2 parents e3458ea + 99e1472 commit a44c600

60 files changed

Lines changed: 281 additions & 281 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎detectors/node/opentelemetry-resource-detector-github/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@
6060
"typescript": "4.3.5"
6161
},
6262
"dependencies": {
63-
"@opentelemetry/resources": "^0.23.0"
63+
"@opentelemetry/resources": "^0.24.0"
6464
}
6565
}

‎examples/dns/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
},
2828
"dependencies": {
2929
"@opentelemetry/api": "^1.0.1",
30-
"@opentelemetry/exporter-jaeger": "^0.23.0",
31-
"@opentelemetry/exporter-zipkin": "^0.23.0",
32-
"@opentelemetry/instrumentation": "^0.23.0",
30+
"@opentelemetry/exporter-jaeger": "^0.24.0",
31+
"@opentelemetry/exporter-zipkin": "^0.24.0",
32+
"@opentelemetry/instrumentation": "^0.24.0",
3333
"@opentelemetry/instrumentation-dns": "^0.23.0",
34-
"@opentelemetry/node": "^0.23.0",
35-
"@opentelemetry/tracing": "^0.23.0"
34+
"@opentelemetry/node": "^0.24.0",
35+
"@opentelemetry/tracing": "^0.24.0"
3636
},
3737
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
3838
"devDependencies": {

‎examples/express/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
},
3030
"dependencies": {
3131
"@opentelemetry/api": "^1.0.1",
32-
"@opentelemetry/exporter-jaeger": "^0.23.0",
33-
"@opentelemetry/exporter-zipkin": "^0.23.0",
34-
"@opentelemetry/instrumentation": "^0.23.0",
32+
"@opentelemetry/exporter-jaeger": "^0.24.0",
33+
"@opentelemetry/exporter-zipkin": "^0.24.0",
34+
"@opentelemetry/instrumentation": "^0.24.0",
3535
"@opentelemetry/instrumentation-express": "^0.23.0",
36-
"@opentelemetry/instrumentation-http": "^0.23.0",
37-
"@opentelemetry/resources": "^0.23.0",
38-
"@opentelemetry/semantic-conventions": "^0.23.0",
39-
"@opentelemetry/node": "^0.23.0",
40-
"@opentelemetry/tracing": "^0.23.0",
36+
"@opentelemetry/instrumentation-http": "^0.24.0",
37+
"@opentelemetry/resources": "^0.24.0",
38+
"@opentelemetry/semantic-conventions": "^0.24.0",
39+
"@opentelemetry/node": "^0.24.0",
40+
"@opentelemetry/tracing": "^0.24.0",
4141
"axios": "^0.21.1",
4242
"cross-env": "^7.0.3",
4343
"express": "^4.17.1"

‎examples/express/tracer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
1212
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
1313
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
1414
const { Resource } = require('@opentelemetry/resources');
15-
const { ResourceAttributes: ResourceAttributesSC } = require('@opentelemetry/semantic-conventions');
15+
const { SemanticResourceAttributes: ResourceAttributesSC } = require('@opentelemetry/semantic-conventions');
1616

1717
const Exporter = (process.env.EXPORTER || '')
1818
.toLowerCase().startsWith('z') ? ZipkinExporter : JaegerExporter;

‎examples/graphql/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
},
3333
"dependencies": {
3434
"@opentelemetry/api": "^1.0.1",
35-
"@opentelemetry/exporter-collector": "^0.23.0",
36-
"@opentelemetry/instrumentation": "^0.23.0",
35+
"@opentelemetry/exporter-collector": "^0.24.0",
36+
"@opentelemetry/instrumentation": "^0.24.0",
3737
"@opentelemetry/instrumentation-express": "^0.23.0",
3838
"@opentelemetry/instrumentation-graphql": "^0.23.0",
39-
"@opentelemetry/instrumentation-http": "^0.23.0",
40-
"@opentelemetry/node": "^0.23.0",
41-
"@opentelemetry/tracing": "^0.23.0",
39+
"@opentelemetry/instrumentation-http": "^0.24.0",
40+
"@opentelemetry/node": "^0.24.0",
41+
"@opentelemetry/tracing": "^0.24.0",
4242
"apollo-server": "^2.18.1",
4343
"express": "^4.17.1",
4444
"express-graphql": "^0.11.0",

‎examples/grpc-census-prop/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
"@opencensus/nodejs": "0.0.21",
3636
"@opencensus/propagation-binaryformat": "0.0.21",
3737
"@opentelemetry/api": "^1.0.1",
38-
"@opentelemetry/core": "^0.23.0",
39-
"@opentelemetry/instrumentation": "^0.23.0",
40-
"@opentelemetry/instrumentation-grpc": "^0.23.0",
41-
"@opentelemetry/node": "^0.23.0",
38+
"@opentelemetry/core": "^0.24.0",
39+
"@opentelemetry/instrumentation": "^0.24.0",
40+
"@opentelemetry/instrumentation-grpc": "^0.24.0",
41+
"@opentelemetry/node": "^0.24.0",
4242
"@opentelemetry/propagator-grpc-census-binary": "^0.23.0",
43-
"@opentelemetry/tracing": "^0.23.0",
43+
"@opentelemetry/tracing": "^0.24.0",
4444
"grpc": "^1.24.2"
4545
},
4646
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",

‎examples/grpc_dynamic_codegen/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
"dependencies": {
3030
"@grpc/proto-loader": "^0.4.0",
3131
"@opentelemetry/api": "^1.0.1",
32-
"@opentelemetry/exporter-jaeger": "^0.23.0",
33-
"@opentelemetry/exporter-zipkin": "^0.23.0",
34-
"@opentelemetry/node": "^0.23.0",
35-
"@opentelemetry/instrumentation-grpc": "^0.23.0",
36-
"@opentelemetry/tracing": "^0.23.0",
32+
"@opentelemetry/exporter-jaeger": "^0.24.0",
33+
"@opentelemetry/exporter-zipkin": "^0.24.0",
34+
"@opentelemetry/node": "^0.24.0",
35+
"@opentelemetry/instrumentation-grpc": "^0.24.0",
36+
"@opentelemetry/tracing": "^0.24.0",
3737
"grpc": "^1.24.6"
3838
},
3939
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",

‎examples/hapi/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
"dependencies": {
3434
"@hapi/hapi": "^19.2.0",
3535
"@opentelemetry/api": "^1.0.1",
36-
"@opentelemetry/exporter-jaeger": "^0.23.0",
37-
"@opentelemetry/exporter-zipkin": "^0.23.0",
38-
"@opentelemetry/instrumentation": "^0.23.0",
36+
"@opentelemetry/exporter-jaeger": "^0.24.0",
37+
"@opentelemetry/exporter-zipkin": "^0.24.0",
38+
"@opentelemetry/instrumentation": "^0.24.0",
3939
"@opentelemetry/instrumentation-hapi": "^0.23.0",
40-
"@opentelemetry/instrumentation-http": "^0.23.0",
41-
"@opentelemetry/node": "^0.23.0",
42-
"@opentelemetry/tracing": "^0.23.0",
40+
"@opentelemetry/instrumentation-http": "^0.24.0",
41+
"@opentelemetry/node": "^0.24.0",
42+
"@opentelemetry/tracing": "^0.24.0",
4343
"axios": "^0.21.1"
4444
},
4545
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",

‎examples/host-metrics/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
},
2828
"dependencies": {
2929
"@opentelemetry/api": "^1.0.1",
30-
"@opentelemetry/core": "^0.23.0",
31-
"@opentelemetry/exporter-collector": "^0.23.0",
32-
"@opentelemetry/exporter-prometheus": "^0.23.0",
33-
"@opentelemetry/host-metrics": "^0.23.0",
34-
"@opentelemetry/instrumentation": "^0.23.0",
35-
"@opentelemetry/metrics": "^0.23.0"
30+
"@opentelemetry/core": "^0.24.0",
31+
"@opentelemetry/exporter-collector": "^0.24.0",
32+
"@opentelemetry/exporter-prometheus": "^0.24.0",
33+
"@opentelemetry/host-metrics": "^0.24.0",
34+
"@opentelemetry/instrumentation": "^0.24.0",
35+
"@opentelemetry/metrics": "^0.24.0"
3636
},
3737
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
3838
}

‎examples/ioredis/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
},
3030
"dependencies": {
3131
"@opentelemetry/api": "^1.0.1",
32-
"@opentelemetry/exporter-jaeger": "^0.23.0",
33-
"@opentelemetry/instrumentation": "^0.23.0",
32+
"@opentelemetry/exporter-jaeger": "^0.24.0",
33+
"@opentelemetry/instrumentation": "^0.24.0",
3434
"@opentelemetry/instrumentation-ioredis": "^0.23.0",
35-
"@opentelemetry/node": "^0.23.0",
36-
"@opentelemetry/tracing": "^0.23.0",
35+
"@opentelemetry/node": "^0.24.0",
36+
"@opentelemetry/tracing": "^0.24.0",
3737
"ioredis": "^4.22.0"
3838
},
3939
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"

0 commit comments

Comments
 (0)