Skip to content

Commit 61dd957

Browse files
authored
fix(preact-example): update example to use latest otelcol/js-core (open-telemetry#1458)
1 parent 5b70055 commit 61dd957

File tree

4 files changed

+26
-20
lines changed

4 files changed

+26
-20
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
receivers:
22
otlp:
3-
endpoint: 0.0.0.0:55678
3+
protocols:
4+
http:
5+
cors:
6+
allowed_origins:
7+
- http://*
8+
- https://*
49

510
exporters:
611
zipkin:
7-
url: "http://zipkin-all-in-one:9411/api/v2/spans"
12+
endpoint: "http://zipkin-all-in-one:9411/api/v2/spans"
813

914
processors:
1015
batch:
11-
queued_retry:
1216

1317
service:
1418
pipelines:
1519
traces:
1620
receivers: [otlp]
1721
exporters: [zipkin]
18-
processors: [batch, queued_retry]
22+
processors: [batch]
23+
telemetry:
24+
logs:
25+
level: "debug"

examples/react-load/preact/docker/docker-compose.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ services:
33

44
# Collector
55
collector:
6-
image: omnition/opentelemetry-collector-contrib:0.2.8
7-
command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"]
6+
image: otel/opentelemetry-collector-contrib:0.75.0
7+
command: ["--config=/conf/collector-config.yaml"]
88
volumes:
99
- ./collector-config.yaml:/conf/collector-config.yaml
1010
ports:
11-
- "55678:55678"
11+
- "4318:4318"
1212
depends_on:
1313
- zipkin-all-in-one
1414

examples/react-load/preact/package.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "react-load-preact-example",
4-
"version": "0.23.0",
4+
"version": "0.24.0",
55
"description": "Example of using @opentelemetry/plugin-react-load in browser with Preact",
66
"main": "index.js",
77
"scripts": {
@@ -23,7 +23,7 @@
2323
"tracing"
2424
],
2525
"engines": {
26-
"node": ">=8"
26+
"node": ">=14"
2727
},
2828
"author": "OpenTelemetry Authors",
2929
"license": "Apache-2.0",
@@ -33,15 +33,14 @@
3333
"devDependencies": {
3434
"identity-obj-proxy": "^3.0.0",
3535
"preact-cli": "^3.0.0",
36-
"preact-render-spy": "^1.2.1",
3736
"sirv-cli": "1.0.3"
3837
},
3938
"dependencies": {
40-
"@opentelemetry/context-zone": "^0.25.0",
41-
"@opentelemetry/exporter-collector": "^0.25.0",
42-
"@opentelemetry/plugin-react-load": "^0.23.0",
43-
"@opentelemetry/sdk-trace-base": "^0.25.0",
44-
"@opentelemetry/sdk-trace-web": "^0.25.0",
39+
"@opentelemetry/context-zone": "^1.11.0",
40+
"@opentelemetry/exporter-trace-otlp-http": "^0.37.0",
41+
"@opentelemetry/plugin-react-load": "^0.28.1",
42+
"@opentelemetry/sdk-trace-base": "^1.11.0",
43+
"@opentelemetry/sdk-trace-web": "^1.11.0",
4544
"preact": "^10.3.2",
4645
"preact-render-to-string": "^5.1.4",
4746
"preact-router": "^3.2.1"
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
2+
import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
23
import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
34
import { BaseOpenTelemetryComponent } from '@opentelemetry/plugin-react-load';
45
import { ZoneContextManager } from '@opentelemetry/context-zone';
5-
import { CollectorTraceExporter } from '@opentelemetry/exporter-collector';
6+
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
67

78
export default (serviceName) => {
9+
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
810
const provider = new WebTracerProvider();
9-
10-
const exporter = new CollectorTraceExporter({
11-
url: 'http://localhost:55678/v1/trace',
11+
const exporter = new OTLPTraceExporter({
12+
url: 'http://localhost:4318/v1/traces',
1213
});
1314

1415
provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
@@ -21,7 +22,6 @@ export default (serviceName) => {
2122
const tracer = provider.getTracer(serviceName);
2223

2324
BaseOpenTelemetryComponent.setTracer(serviceName)
24-
BaseOpenTelemetryComponent.setLogger(provider.logger)
2525

2626
return tracer;
2727
}

0 commit comments

Comments
 (0)