Skip to content

Commit ce25419

Browse files
committed
chore: revert breaking changes
1 parent 09f6e2d commit ce25419

File tree

4 files changed

+39
-19702
lines changed

4 files changed

+39
-19702
lines changed

examples/aws_driver_example/telemetry_metrics_otlp_example.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,16 @@ import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
2222
import { AwsInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
2323
import { AWSXRayIdGenerator } from "@opentelemetry/id-generator-aws-xray";
2424
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
25-
import { Resource } from "@opentelemetry/resources";
25+
import { resourceFromAttributes } from "@opentelemetry/resources";
2626
import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
2727
import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
2828
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
2929
import { AwsPGClient } from "../../pg";
3030

3131
const traceExporter = new OTLPTraceExporter({ url: "http://localhost:4317" });
32-
const resource = Resource.default().merge(
33-
new Resource({
34-
[ATTR_SERVICE_NAME]: "aws-advanced-nodejs-wrapper"
35-
})
36-
);
32+
const resource = resourceFromAttributes({
33+
[ATTR_SERVICE_NAME]: "aws-advanced-nodejs-wrapper"
34+
});
3735

3836
const metricReader = new PeriodicExportingMetricReader({
3937
exporter: new OTLPMetricExporter(),

examples/aws_driver_example/telemetry_tracing_xray_example.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@ import { AWSXRayPropagator } from "@opentelemetry/propagator-aws-xray";
2222
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
2323
import { AwsInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
2424
import { AWSXRayIdGenerator } from "@opentelemetry/id-generator-aws-xray";
25-
import { Resource } from "@opentelemetry/resources";
25+
import { resourceFromAttributes } from "@opentelemetry/resources";
2626
import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
2727
import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
2828
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
2929

30-
const resource = Resource.default().merge(
31-
new Resource({
32-
[ATTR_SERVICE_NAME]: "aws-advanced-nodejs-wrapper"
33-
})
34-
);
30+
const resource = resourceFromAttributes({
31+
[ATTR_SERVICE_NAME]: "aws-advanced-nodejs-wrapper"
32+
});
3533

3634
const metricReader = new PeriodicExportingMetricReader({
3735
exporter: new OTLPMetricExporter(),

0 commit comments

Comments
 (0)