Merge branch 'main' into jamie.aws-sdk-semconv-strings

open-telemetry · Apr 24, 2024 · 3cc9718 · 3cc9718
2 parents 8d22664 + 77452c1
commit 3cc9718
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 47 deletions.
diff --git a/examples/connect/package.json b/examples/connect/package.json
@@ -45,7 +45,7 @@
     "@opentelemetry/instrumentation-http": "^0.25.0",
     "@opentelemetry/sdk-trace-node": "^0.25.0",
     "@opentelemetry/resources": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0",
+    "@opentelemetry/semantic-conventions": "^1.23.0",
     "@opentelemetry/sdk-trace-base": "^0.25.0",
     "axios": "^0.21.1",
     "cross-env": "^7.0.3",

diff --git a/examples/connect/tracing.js b/examples/connect/tracing.js
@@ -6,7 +6,7 @@ const { diag, DiagConsoleLogger, DiagLogLevel } = opentelemetry;
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes: SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
 const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
@@ -24,7 +24,7 @@ function log() {
 module.exports = (serviceName) => {
   const provider = new NodeTracerProvider({
     resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
+      [SEMRESATTRS_SERVICE_NAME]: serviceName,
     }),
   });
   const connectInstrumentation = new ConnectInstrumentation();

diff --git a/examples/web/examples/document-load/index.js b/examples/web/examples/document-load/index.js
@@ -9,11 +9,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { CompositePropagator, W3CTraceContextPropagator } from '@opentelemetry/core';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 
 const provider = new WebTracerProvider({
   resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'web-service-dl',
+    [SEMRESATTRS_SERVICE_NAME]: 'web-service-dl',
   }),
 });
 

diff --git a/examples/web/examples/meta/index.js b/examples/web/examples/meta/index.js
@@ -6,11 +6,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 
 const providerWithZone = new WebTracerProvider({
   resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'web-service-meta',
+    [SEMRESATTRS_SERVICE_NAME]: 'web-service-meta',
   }),
 });
 

diff --git a/examples/web/examples/user-interaction/index.js b/examples/web/examples/user-interaction/index.js
@@ -7,11 +7,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 
 const providerWithZone = new WebTracerProvider({
   resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'web-service-ui',
+    [SEMRESATTRS_SERVICE_NAME]: 'web-service-ui',
   }),
 });
 

diff --git a/examples/web/package.json b/examples/web/package.json
@@ -46,7 +46,7 @@
     "@opentelemetry/instrumentation-xml-http-request": "^0.39.1",
     "@opentelemetry/propagator-b3": "^1.13.0",
     "@opentelemetry/sdk-trace-web": "^1.13.0",
-    "@opentelemetry/semantic-conventions": "^1.13.0"
+    "@opentelemetry/semantic-conventions": "^1.23.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json
@@ -59,8 +59,7 @@
   },
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",
-    "@opentelemetry/instrumentation": "^0.50.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/instrumentation": "^0.50.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
 }
diff --git a/plugins/node/instrumentation-undici/README.md b/plugins/node/instrumentation-undici/README.md
@@ -71,21 +71,21 @@ Ref: [opentelemetry-js/issues/4235](https://github.com/open-telemetry/openteleme
 
 Attributes collected:
 
-| Attribute    | Short Description                  | Notes             |
-| ------------ | ---------------------------------- | ----------------- |
-| `http.request.method` | HTTP request method. | Key: `HTTP_REQUEST_METHOD` |
-| `http.request.method_original` | Original HTTP method sent by the client in the request line. | Key: `HTTP_REQUEST_METHOD_ORIGINAL` |
-| `url.full` | Absolute URL describing a network resource according to [RFC3986](https://www.rfc-editor.org/rfc/rfc3986). | Key: `URL_FULL` |
-| `url.path` | The [URI path](https://www.rfc-editor.org/rfc/rfc3986#section-3.3) component. | Key: `URL_PATH` |
-| `url.query` | The [URI query](https://www.rfc-editor.org/rfc/rfc3986#section-3.4) component. | Key: `URL_QUERY` |
-| `url.scheme` | HTTP request method. | Key: `URL_SCHEME` |
-| `server.address` | Server domain name, IP address or Unix domain socket name. | Key: `HTTP_REQUEST_METHOD` |
-| `server.port` | Server port number. | Key: `HTTP_REQUEST_METHOD` |
-| `user_agent.original` | Value of the HTTP User-Agent header sent by the client. | Key: `USER_AGENT_ORIGINAL` |
-| `network.peer.address` | Peer address of the network connection - IP address or Unix domain socket name. | Key: `NETWORK_PEER_ADDRESS` |
-| `network.peer.port` | Peer port number of the network connection. | Key: `NETWORK_PEER_PORT` |
-| `http.response.status_code` | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). | Key: `HTTP_RESPONSE_STATUS_CODE` |
-| `error.type` | Describes a class of error the operation ended with. | Key: `ERROR_TYPE` |
+| Attribute                      | Short Description                                                                                          |
+| ------------------------------ | ---------------------------------------------------------------------------------------------------------- |
+| `error.type`                   | Describes a class of error the operation ended with.                                                       |
+| `http.request.method`          | HTTP request method.                                                                                       |
+| `http.request.method_original` | Original HTTP method sent by the client in the request line.                                               |
+| `http.response.status_code`    | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6).                                |
+| `network.peer.address`         | Peer address of the network connection - IP address or Unix domain socket name.                            |
+| `network.peer.port`            | Peer port number of the network connection.                                                                |
+| `server.address`               | Server domain name, IP address or Unix domain socket name.                                                 |
+| `server.port`                  | Server port number.                                                                                        |
+| `url.full`                     | Absolute URL describing a network resource according to [RFC3986](https://www.rfc-editor.org/rfc/rfc3986). |
+| `url.path`                     | The [URI path](https://www.rfc-editor.org/rfc/rfc3986#section-3.3) component.                              |
+| `url.query`                    | The [URI query](https://www.rfc-editor.org/rfc/rfc3986#section-3.4) component.                             |
+| `url.scheme`                   | HTTP request method.                                                                                       |
+| `user_agent.original`          | Value of the HTTP User-Agent header sent by the client.                                                    |
 
 ## Useful links
 

diff --git a/plugins/node/opentelemetry-instrumentation-express/README.md b/plugins/node/opentelemetry-instrumentation-express/README.md
@@ -148,9 +148,9 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
 
 Attributes collected:
 
-| Attribute    | Short Description                  | Notes                      |
-| ------------ | ---------------------------------- | -------------------------- |
-| `http.route` | The matched route (path template). | Key: `SEMATTRS_HTTP_ROUTE` |
+| Attribute    | Short Description                  |
+| ------------ | ---------------------------------- |
+| `http.route` | The matched route (path template). |
 
 ## Useful links
 

diff --git a/plugins/node/opentelemetry-instrumentation-fastify/README.md b/plugins/node/opentelemetry-instrumentation-fastify/README.md
@@ -74,9 +74,9 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
 
 Attributes collected:
 
-| Attribute    | Short Description                  | Notes                      |
-| ------------ | ---------------------------------- | -------------------------- |
-| `http.route` | The matched route (path template). | Key: `SEMATTRS_HTTP_ROUTE` |
+| Attribute    | Short Description                  |
+| ------------ | ---------------------------------- |
+| `http.route` | The matched route (path template). |
 
 ## Useful links
 

diff --git a/plugins/node/opentelemetry-instrumentation-redis/README.md b/plugins/node/opentelemetry-instrumentation-redis/README.md
@@ -80,13 +80,13 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
 
 Attributes collected:
 
-| Attribute              | Short Description                                            | Notes                                |
-|------------------------|--------------------------------------------------------------|--------------------------------------|
-| `db.connection_string` | URL to Redis server address, of the form `redis://host:port` | Key: `SEMATTRS_DB_CONNECTION_STRING` |
-| `db.statement`         | Executed Redis statement                                     | Key: `SEMATTRS_DB_STATEMENT`         |
-| `db.system`            | Database identifier; always `redis`                          | Key: `SEMATTRS_DB_SYSTEM`            |
-| `net.peer.name`        | Hostname or IP of the connected Redis server                 | Key: `SEMATTRS_NET_PEER_NAME`        |
-| `net.peer.port`        | Port of the connected Redis server                           | Key: `SEMATTRS_NET_PORT_NAME`        |
+| Attribute              | Short Description                                            |
+|------------------------|--------------------------------------------------------------|
+| `db.connection_string` | URL to Redis server address, of the form `redis://host:port` |
+| `db.statement`         | Executed Redis statement                                     |
+| `db.system`            | Database identifier; always `redis`                          |
+| `net.peer.name`        | Hostname or IP of the connected Redis server                 |
+| `net.peer.port`        | Port of the connected Redis server                           |
 
 ## Useful links
 

diff --git a/plugins/web/opentelemetry-instrumentation-document-load/README.md b/plugins/web/opentelemetry-instrumentation-document-load/README.md
@@ -117,10 +117,10 @@ This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which i
 
 Attributes collected:
 
-| Attribute         | Short Description                                                              | Notes                           |
-| ----------------- | ------------------------------------------------------------------------------ | ------------------------------- |
-| `http.url`        | Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]` | Key: `SEMATTRS_HTTP_URL`        |
-| `http.user_agent` | Value of the HTTP User-Agent header sent by the client                         | Key: `SEMATTRS_HTTP_USER_AGENT` |
+| Attribute         | Short Description                                                              |
+| ----------------- | ------------------------------------------------------------------------------ |
+| `http.url`        | Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]` |
+| `http.user_agent` | Value of the HTTP User-Agent header sent by the client                         |
 
 ## Useful links