Skip to content

Commit adf7c38

Browse files
blumamirblumamir
authored
Merge branch 'main' into example-graphql
2 parents 7e812cc + 77452c1 commit adf7c38

File tree

13 files changed

+44
-47
lines changed

13 files changed

+44
-47
lines changed

‎examples/connect/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@opentelemetry/instrumentation-http": "^0.25.0",
4646
"@opentelemetry/sdk-trace-node": "^0.25.0",
4747
"@opentelemetry/resources": "^0.25.0",
48-
"@opentelemetry/semantic-conventions": "^0.25.0",
48+
"@opentelemetry/semantic-conventions": "^1.23.0",
4949
"@opentelemetry/sdk-trace-base": "^0.25.0",
5050
"axios": "^0.21.1",
5151
"cross-env": "^7.0.3",

‎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 { ResourceAttributes: SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
9+
const { SEMRESATTRS_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');
@@ -24,7 +24,7 @@ function log() {
2424
module.exports = (serviceName) => {
2525
const provider = new NodeTracerProvider({
2626
resource: new Resource({
27-
[SemanticResourceAttributes.SERVICE_NAME]: serviceName,
27+
[SEMRESATTRS_SERVICE_NAME]: serviceName,
2828
}),
2929
});
3030
const connectInstrumentation = new ConnectInstrumentation();

‎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 { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
12+
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1313

1414
const provider = new WebTracerProvider({
1515
resource: new Resource({
16-
[SemanticResourceAttributes.SERVICE_NAME]: 'web-service-dl',
16+
[SEMRESATTRS_SERVICE_NAME]: 'web-service-dl',
1717
}),
1818
});
1919

‎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 { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
9+
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1010

1111
const providerWithZone = new WebTracerProvider({
1212
resource: new Resource({
13-
[SemanticResourceAttributes.SERVICE_NAME]: 'web-service-meta',
13+
[SEMRESATTRS_SERVICE_NAME]: 'web-service-meta',
1414
}),
1515
});
1616

‎examples/web/examples/user-interaction/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
77
import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
88
import { registerInstrumentations } from '@opentelemetry/instrumentation';
99
import { Resource } from '@opentelemetry/resources';
10-
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
10+
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1111

1212
const providerWithZone = new WebTracerProvider({
1313
resource: new Resource({
14-
[SemanticResourceAttributes.SERVICE_NAME]: 'web-service-ui',
14+
[SEMRESATTRS_SERVICE_NAME]: 'web-service-ui',
1515
}),
1616
});
1717

‎examples/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@opentelemetry/instrumentation-xml-http-request": "^0.39.1",
4747
"@opentelemetry/propagator-b3": "^1.13.0",
4848
"@opentelemetry/sdk-trace-web": "^1.13.0",
49-
"@opentelemetry/semantic-conventions": "^1.13.0"
49+
"@opentelemetry/semantic-conventions": "^1.23.0"
5050
},
5151
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
5252
}

‎package-lock.json

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/node/instrumentation-fs/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
},
6060
"dependencies": {
6161
"@opentelemetry/core": "^1.8.0",
62-
"@opentelemetry/instrumentation": "^0.50.0",
63-
"@opentelemetry/semantic-conventions": "^1.0.0"
62+
"@opentelemetry/instrumentation": "^0.50.0"
6463
},
6564
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
6665
}

‎plugins/node/instrumentation-undici/README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ Ref: [opentelemetry-js/issues/4235](https://github.com/open-telemetry/openteleme
7171

7272
Attributes collected:
7373

74-
| Attribute | Short Description | Notes |
75-
| ------------ | ---------------------------------- | ----------------- |
76-
| `http.request.method` | HTTP request method. | Key: `HTTP_REQUEST_METHOD` |
77-
| `http.request.method_original` | Original HTTP method sent by the client in the request line. | Key: `HTTP_REQUEST_METHOD_ORIGINAL` |
78-
| `url.full` | Absolute URL describing a network resource according to [RFC3986](https://www.rfc-editor.org/rfc/rfc3986). | Key: `URL_FULL` |
79-
| `url.path` | The [URI path](https://www.rfc-editor.org/rfc/rfc3986#section-3.3) component. | Key: `URL_PATH` |
80-
| `url.query` | The [URI query](https://www.rfc-editor.org/rfc/rfc3986#section-3.4) component. | Key: `URL_QUERY` |
81-
| `url.scheme` | HTTP request method. | Key: `URL_SCHEME` |
82-
| `server.address` | Server domain name, IP address or Unix domain socket name. | Key: `HTTP_REQUEST_METHOD` |
83-
| `server.port` | Server port number. | Key: `HTTP_REQUEST_METHOD` |
84-
| `user_agent.original` | Value of the HTTP User-Agent header sent by the client. | Key: `USER_AGENT_ORIGINAL` |
85-
| `network.peer.address` | Peer address of the network connection - IP address or Unix domain socket name. | Key: `NETWORK_PEER_ADDRESS` |
86-
| `network.peer.port` | Peer port number of the network connection. | Key: `NETWORK_PEER_PORT` |
87-
| `http.response.status_code` | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). | Key: `HTTP_RESPONSE_STATUS_CODE` |
88-
| `error.type` | Describes a class of error the operation ended with. | Key: `ERROR_TYPE` |
74+
| Attribute | Short Description |
75+
| ------------------------------ | ---------------------------------------------------------------------------------------------------------- |
76+
| `error.type` | Describes a class of error the operation ended with. |
77+
| `http.request.method` | HTTP request method. |
78+
| `http.request.method_original` | Original HTTP method sent by the client in the request line. |
79+
| `http.response.status_code` | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). |
80+
| `network.peer.address` | Peer address of the network connection - IP address or Unix domain socket name. |
81+
| `network.peer.port` | Peer port number of the network connection. |
82+
| `server.address` | Server domain name, IP address or Unix domain socket name. |
83+
| `server.port` | Server port number. |
84+
| `url.full` | Absolute URL describing a network resource according to [RFC3986](https://www.rfc-editor.org/rfc/rfc3986). |
85+
| `url.path` | The [URI path](https://www.rfc-editor.org/rfc/rfc3986#section-3.3) component. |
86+
| `url.query` | The [URI query](https://www.rfc-editor.org/rfc/rfc3986#section-3.4) component. |
87+
| `url.scheme` | HTTP request method. |
88+
| `user_agent.original` | Value of the HTTP User-Agent header sent by the client. |
8989

9090
## Useful links
9191

‎plugins/node/opentelemetry-instrumentation-express/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
148148

149149
Attributes collected:
150150

151-
| Attribute | Short Description | Notes |
152-
| ------------ | ---------------------------------- | -------------------------- |
153-
| `http.route` | The matched route (path template). | Key: `SEMATTRS_HTTP_ROUTE` |
151+
| Attribute | Short Description |
152+
| ------------ | ---------------------------------- |
153+
| `http.route` | The matched route (path template). |
154154

155155
## Useful links
156156

‎plugins/node/opentelemetry-instrumentation-fastify/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
7474

7575
Attributes collected:
7676

77-
| Attribute | Short Description | Notes |
78-
| ------------ | ---------------------------------- | -------------------------- |
79-
| `http.route` | The matched route (path template). | Key: `SEMATTRS_HTTP_ROUTE` |
77+
| Attribute | Short Description |
78+
| ------------ | ---------------------------------- |
79+
| `http.route` | The matched route (path template). |
8080

8181
## Useful links
8282

‎plugins/node/opentelemetry-instrumentation-redis/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
8080

8181
Attributes collected:
8282

83-
| Attribute | Short Description | Notes |
84-
|------------------------|--------------------------------------------------------------|--------------------------------------|
85-
| `db.connection_string` | URL to Redis server address, of the form `redis://host:port` | Key: `SEMATTRS_DB_CONNECTION_STRING` |
86-
| `db.statement` | Executed Redis statement | Key: `SEMATTRS_DB_STATEMENT` |
87-
| `db.system` | Database identifier; always `redis` | Key: `SEMATTRS_DB_SYSTEM` |
88-
| `net.peer.name` | Hostname or IP of the connected Redis server | Key: `SEMATTRS_NET_PEER_NAME` |
89-
| `net.peer.port` | Port of the connected Redis server | Key: `SEMATTRS_NET_PORT_NAME` |
83+
| Attribute | Short Description |
84+
|------------------------|--------------------------------------------------------------|
85+
| `db.connection_string` | URL to Redis server address, of the form `redis://host:port` |
86+
| `db.statement` | Executed Redis statement |
87+
| `db.system` | Database identifier; always `redis` |
88+
| `net.peer.name` | Hostname or IP of the connected Redis server |
89+
| `net.peer.port` | Port of the connected Redis server |
9090

9191
## Useful links
9292

‎plugins/web/opentelemetry-instrumentation-document-load/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
117117

118118
Attributes collected:
119119

120-
| Attribute | Short Description | Notes |
121-
| ----------------- | ------------------------------------------------------------------------------ | ------------------------------- |
122-
| `http.url` | Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]` | Key: `SEMATTRS_HTTP_URL` |
123-
| `http.user_agent` | Value of the HTTP User-Agent header sent by the client | Key: `SEMATTRS_HTTP_USER_AGENT` |
120+
| Attribute | Short Description |
121+
| ----------------- | ------------------------------------------------------------------------------ |
122+
| `http.url` | Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]` |
123+
| `http.user_agent` | Value of the HTTP User-Agent header sent by the client |
124124

125125
## Useful links
126126

0 commit comments

Comments
 (0)