Skip to content

Commit

Permalink
Merge b910611 into a30952c
Browse files Browse the repository at this point in the history
  • Loading branch information
llc1123 authored Jun 26, 2023
2 parents a30952c + b910611 commit b42680d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ All notable changes to experimental packages in this project will be documented

* fix(exporter-logs-otlp-http): set useHex to true [#3875](https://github.com/open-telemetry/opentelemetry-js/pull/3875) @Nico385412
fix(otlp-proto-exporter-base): add missing type import [#3937](https://github.com/open-telemetry/opentelemetry-js/pull/3937) @pichlermarc
* fix(example-opencensus-shim): avoid OpenCensus auto instrumentations [#3951](https://github.com/open-telemetry/opentelemetry-js/pull/3951) @llc1123

### :books: (Refine Doc)

Expand Down
2 changes: 1 addition & 1 deletion experimental/examples/opencensus-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@opentelemetry/api": "1.4.1",
"@opentelemetry/sdk-trace-node": "1.14.0",
"@opencensus/core": "0.1.0",
"@opencensus/nodejs": "0.1.0",
"@opencensus/nodejs-base": "0.1.0",
"@opentelemetry/semantic-conventions": "1.14.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.40.0",
"@opentelemetry/resources": "1.14.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/examples/opencensus-shim/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const {
} = require('@opentelemetry/semantic-conventions');

module.exports = function setup(serviceName) {
const tracing = require('@opencensus/nodejs');
const tracing = require('@opencensus/nodejs-base');

diag.setLogger(new DiagConsoleLogger(), { logLevel: DiagLogLevel.ALL });
const provider = new NodeTracerProvider({
Expand Down

0 comments on commit b42680d

Please sign in to comment.