Skip to content

Commit 36edb6f

Browse files
trentmtrentm
authored
Merge branch 'main' into bedrock-metrics
2 parents c050b89 + ddf9bd5 commit 36edb6f

31 files changed

+1403
-247
lines changed

‎README.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# OpenTelemetry JavaScript Contrib
4040

41-
A repository for OpenTelemetry JavaScript contributions that are not part of the [core repository](https://github.com/open-telemetry/opentelemetry-js) and core distribution of the API and the SDK.
41+
A repository for community-maintained OpenTelemetry JavaScript contributions that are not part of the [core repository](https://github.com/open-telemetry/opentelemetry-js) and core distribution of the API and the SDK.
4242

4343
This project includes:
4444

@@ -52,6 +52,19 @@ Please read the [contributing guidelines on adding new instrumentation](CONTRIBU
5252

5353
**Resource Detectors**: OpenTelemetry can collect resource attributes of the entity that producing telemetry. For example, a process producing telemetry that is running in a container on Kubernetes has a Pod name, it is in a namespace and possibly is part of a Deployment which also has a name. All three of these attributes can be included in the `Resource`.
5454

55+
## Component Ownership
56+
57+
This repository includes various components, each maintained by one or more designated component owners. Unless
58+
necessary to resolve disagreements, [@open-telemetry/javascript-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers)
59+
take a more passive role when it comes to Maintaining these components.
60+
61+
Component owners have the authority to make decisions on implementation and feature requests, following the best practices
62+
and the [mission, vision and values](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md) of the OpenTelemetry Project. They are also assigned the Triager role to manage issues
63+
related to their components, and are the primary contact for conducting PR reviews for their components.
64+
65+
Component owners are automatically assigned to pull requests as reviewers. The source of truth for component ownership
66+
is [.github/component_owners.yml](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml).
67+
5568
## Stability levels
5669

5770
Stability level for components in this repository follow the definitions in [CONTRIBUTING.md](./CONTRIBUTING.md).

‎examples/connect/tracing.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const { diag, DiagConsoleLogger, DiagLogLevel } = opentelemetry;
66
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
77

88
const { Resource } = require('@opentelemetry/resources');
9-
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
9+
const { ATTR_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
1010
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
1111
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
1212
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
@@ -25,7 +25,7 @@ module.exports = (serviceName) => {
2525
const exporter = new CollectorTraceExporter();
2626
const provider = new NodeTracerProvider({
2727
resource: new Resource({
28-
[SEMRESATTRS_SERVICE_NAME]: serviceName,
28+
[ATTR_SERVICE_NAME]: serviceName,
2929
}),
3030
spanProcessors: [
3131
new SimpleSpanProcessor(exporter),

‎examples/graphql/tracer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-http');
88
const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
99
const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
1010
const { Resource } = require('@opentelemetry/resources');
11-
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
11+
const { ATTR_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
1212

1313
const provider = new NodeTracerProvider({
1414
resource: new Resource({
15-
[SEMRESATTRS_SERVICE_NAME]: 'graphql-service',
15+
[ATTR_SERVICE_NAME]: 'graphql-service',
1616
}),
1717
spanProcessors: [
1818
new SimpleSpanProcessor(new OTLPTraceExporter()),

‎examples/koa/src/tracer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
1010
import { JaegerExporter } from '@opentelemetry/exporter-jaeger';
1111
import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
1212
import { Resource } from '@opentelemetry/resources';
13-
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
13+
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
1414

1515
const EXPORTER = process.env.EXPORTER || '';
1616

@@ -24,7 +24,7 @@ export const setupTracing = (serviceName: string) => {
2424

2525
const provider = new NodeTracerProvider({
2626
resource: new Resource({
27-
[SEMRESATTRS_SERVICE_NAME]: serviceName
27+
[ATTR_SERVICE_NAME]: serviceName
2828
}),
2929
spanProcessors: [
3030
new SimpleSpanProcessor(exporter),

‎examples/memcached/tracer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ const { registerInstrumentations } = require('@opentelemetry/instrumentation');
99
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
1010
const { SimpleSpanProcessor, ConsoleSpanExporter } = require('@opentelemetry/sdk-trace-base');
1111
const { Resource } = require('@opentelemetry/resources');
12-
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
12+
const { ATTR_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
1313

1414
const { MemcachedInstrumentation } = require('@opentelemetry/instrumentation-memcached');
1515

1616
module.exports = (serviceName) => {
1717
const exporter = new ConsoleSpanExporter();
1818
const provider = new NodeTracerProvider({
1919
resource: new Resource({
20-
[SEMRESATTRS_SERVICE_NAME]: serviceName,
20+
[ATTR_SERVICE_NAME]: serviceName,
2121
}),
2222
spanProcessors: [
2323
new SimpleSpanProcessor(exporter),

‎examples/mysql/src/tracer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { registerInstrumentations } from '@opentelemetry/instrumentation';
88
import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
99
import { MySQLInstrumentation } from '@opentelemetry/instrumentation-mysql';
1010
import { Resource } from '@opentelemetry/resources';
11-
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
11+
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1212
import {
1313
MeterProvider,
1414
PeriodicExportingMetricReader,
@@ -39,7 +39,7 @@ export const setupTracing = (serviceName: string) => {
3939

4040
const tracerProvider = new NodeTracerProvider({
4141
resource: new Resource({
42-
[SEMRESATTRS_SERVICE_NAME]: serviceName,
42+
[ATTR_SERVICE_NAME]: serviceName,
4343
}),
4444
spanProcessors,
4545
});

‎examples/react-load/react/src/web-tracer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ZoneContextManager } from '@opentelemetry/context-zone';
55
import { CollectorTraceExporter } from '@opentelemetry/exporter-collector';
66
import { diag, DiagConsoleLogger } from '@opentelemetry/api';
77
import { Resource } from '@opentelemetry/resources';
8-
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
8+
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
99

1010
export default (serviceName) => {
1111
const exporter = new CollectorTraceExporter({
@@ -14,7 +14,7 @@ export default (serviceName) => {
1414

1515
const provider = new WebTracerProvider({
1616
resource: new Resource({
17-
[SEMRESATTRS_SERVICE_NAME]: "react-load-example"
17+
[ATTR_SERVICE_NAME]: "react-load-example"
1818
}),
1919
spanProcessors: [
2020
new SimpleSpanProcessor(new ConsoleSpanExporter()),

‎examples/redis/src/tracer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { registerInstrumentations } from '@opentelemetry/instrumentation';
99
import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
1010
import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
1111
import { Resource } from '@opentelemetry/resources';
12-
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
12+
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1313

1414
const EXPORTER = process.env.EXPORTER || '';
1515

@@ -23,7 +23,7 @@ export const setupTracing = (serviceName: string) => {
2323

2424
const provider = new NodeTracerProvider({
2525
resource: new Resource({
26-
[SEMRESATTRS_SERVICE_NAME]: serviceName,
26+
[ATTR_SERVICE_NAME]: serviceName,
2727
}),
2828
spanProcessors: [
2929
new SimpleSpanProcessor(exporter),

‎examples/web/examples/document-load/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
99
import { CompositePropagator, W3CTraceContextPropagator } from '@opentelemetry/core';
1010
import { registerInstrumentations } from '@opentelemetry/instrumentation';
1111
import { Resource } from '@opentelemetry/resources';
12-
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
12+
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1313

1414
const provider = new WebTracerProvider({
1515
resource: new Resource({
16-
[SEMRESATTRS_SERVICE_NAME]: 'web-service-dl',
16+
[ATTR_SERVICE_NAME]: 'web-service-dl',
1717
}),
1818
spanProcessors: [
1919
new SimpleSpanProcessor(new ConsoleSpanExporter()),

‎examples/web/examples/meta/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
66
import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web';
77
import { registerInstrumentations } from '@opentelemetry/instrumentation';
88
import { Resource } from '@opentelemetry/resources';
9-
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
9+
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1010

1111
const providerWithZone = new WebTracerProvider({
1212
resource: new Resource({
13-
[SEMRESATTRS_SERVICE_NAME]: 'web-service-meta',
13+
[ATTR_SERVICE_NAME]: 'web-service-meta',
1414
}),
1515
spanProcessors: [
1616
new SimpleSpanProcessor(new ConsoleSpanExporter()),

0 commit comments

Comments
 (0)