Merge branch 'open-telemetry:main' into main

content/en/docs/demo/architecture.md

@@ -128,8 +128,8 @@ subgraph tdf[Telemetry Data Flow]
 
         subgraph oc[OTel Collector]
             style oc fill:#97aef3,color:black;
-            oc-grpc[/"OTLP Receiver<br/>listening on<br/>grpc://localhost:4317/"/]
-            oc-http[/"OTLP Receiver<br/>listening on <br/>http://localhost:4318/<br/>https://localhost:4318/"/]
+            oc-grpc[/"OTLP Receiver<br/>listening on<br/>grpc://localhost:4317"/]
+            oc-http[/"OTLP Receiver<br/>listening on <br/>localhost:4318<br/>localhost:4318"/]
             oc-proc(Processors)
             oc-prom[/"OTLP HTTP Exporter"/]
             oc-otlp[/"OTLP Exporter"/]
@@ -141,27 +141,27 @@ subgraph tdf[Telemetry Data Flow]
             oc-proc --> oc-otlp
         end
 
-        oc-prom -->|"http://localhost:9090/api/v1/otlp"| pr-sc
+        oc-prom -->|"localhost:9090/api/v1/otlp"| pr-sc
         oc-otlp -->|gRPC| ja-col
 
         subgraph pr[Prometheus]
             style pr fill:#e75128,color:black;
             pr-sc[/"Prometheus OTLP Write Receiver"/]
             pr-tsdb[(Prometheus TSDB)]
-            pr-http[/"Prometheus HTTP<br/>listening on<br/>http://localhost:9090"/]
+            pr-http[/"Prometheus HTTP<br/>listening on<br/>localhost:9090"/]
 
             pr-sc --> pr-tsdb
             pr-tsdb --> pr-http
         end
 
         pr-b{{"Browser<br/>Prometheus UI"}}
-        pr-http ---->|"http://localhost:9090/graph"| pr-b
+        pr-http ---->|"localhost:9090/graph"| pr-b
 
         subgraph ja[Jaeger]
             style ja fill:#60d0e4,color:black;
-            ja-col[/"Jaeger Collector<br/>listening on<br/>grpc://jaeger:4317/"/]
+            ja-col[/"Jaeger Collector<br/>listening on<br/>grpc://jaeger:4317"/]
             ja-db[(Jaeger DB)]
-            ja-http[/"Jaeger HTTP<br/>listening on<br/>http://localhost:16686"/]
+            ja-http[/"Jaeger HTTP<br/>listening on<br/>localhost:16686"/]
 
             ja-col --> ja-db
             ja-db --> ja-http
@@ -170,19 +170,19 @@ subgraph tdf[Telemetry Data Flow]
         subgraph gr[Grafana]
             style gr fill:#f8b91e,color:black;
             gr-srv["Grafana Server"]
-            gr-http[/"Grafana HTTP<br/>listening on<br/>http://localhost:3000"/]
+            gr-http[/"Grafana HTTP<br/>listening on<br/>localhost:3000"/]
 
             gr-srv --> gr-http
         end
 
-        pr-http --> |"http://localhost:9090/api"| gr-srv
-        ja-http --> |"http://localhost:16686/api"| gr-srv
+        pr-http --> |"localhost:9090/api"| gr-srv
+        ja-http --> |"localhost:16686/api"| gr-srv
 
         ja-b{{"Browser<br/>Jaeger UI"}}
-        ja-http ---->|"http://localhost:16686/search"| ja-b
+        ja-http ---->|"localhost:16686/search"| ja-b
 
         gr-b{{"Browser<br/>Grafana UI"}}
-        gr-http -->|"http://localhost:3000/dashboard"| gr-b
+        gr-http -->|"localhost:3000/dashboard"| gr-b
     end
 end
 ```

content/en/docs/languages/js/instrumentation.md

@@ -223,14 +223,14 @@ import {
 } from '@opentelemetry/sdk-metrics';
 import { Resource } from '@opentelemetry/resources';
 import {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
 } from '@opentelemetry/semantic-conventions';
 
 const sdk = new NodeSDK({
   resource: new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: 'yourServiceName',
-    [SEMRESATTRS_SERVICE_VERSION]: '1.0',
+    [ATTR_SERVICE_NAME]: 'yourServiceName',
+    [ATTR_SERVICE_VERSION]: '1.0',
   }),
   traceExporter: new ConsoleSpanExporter(),
   metricReader: new PeriodicExportingMetricReader({
@@ -253,14 +253,14 @@ const {
 } = require('@opentelemetry/sdk-metrics');
 const { Resource } = require('@opentelemetry/resources');
 const {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
 } = require('@opentelemetry/semantic-conventions');
 
 const sdk = new NodeSDK({
   resource: new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: 'dice-server',
-    [SEMRESATTRS_SERVICE_VERSION]: '0.1.0',
+    [ATTR_SERVICE_NAME]: 'dice-server',
+    [ATTR_SERVICE_VERSION]: '0.1.0',
   }),
   traceExporter: new ConsoleSpanExporter(),
   metricReader: new PeriodicExportingMetricReader({
@@ -352,8 +352,8 @@ SDK initialization code in it:
 ```ts
 import { Resource } from '@opentelemetry/resources';
 import {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
 } from '@opentelemetry/semantic-conventions';
 import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
 import {
@@ -363,8 +363,8 @@ import {
 
 const resource = Resource.default().merge(
   new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: 'service-name-here',
-    [SEMRESATTRS_SERVICE_VERSION]: '0.1.0',
+    [ATTR_SERVICE_NAME]: 'service-name-here',
+    [ATTR_SERVICE_VERSION]: '0.1.0',
   }),
 );
 
@@ -384,8 +384,8 @@ provider.register();
 const opentelemetry = require('@opentelemetry/api');
 const { Resource } = require('@opentelemetry/resources');
 const {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
 } = require('@opentelemetry/semantic-conventions');
 const { WebTracerProvider } = require('@opentelemetry/sdk-trace-web');
 const {
@@ -395,8 +395,8 @@ const {
 
 const resource = Resource.default().merge(
   new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: 'service-name-here',
-    [SEMRESATTRS_SERVICE_VERSION]: '0.1.0',
+    [ATTR_SERVICE_NAME]: 'service-name-here',
+    [ATTR_SERVICE_VERSION]: '0.1.0',
   }),
 );
 
@@ -1259,14 +1259,14 @@ import {
 } from '@opentelemetry/sdk-metrics';
 import { Resource } from '@opentelemetry/resources';
 import {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
 } from '@opentelemetry/semantic-conventions';
 
 const resource = Resource.default().merge(
   new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: 'dice-server',
-    [SEMRESATTRS_SERVICE_VERSION]: '0.1.0',
+    [ATTR_SERVICE_NAME]: 'dice-server',
+    [ATTR_SERVICE_VERSION]: '0.1.0',
   }),
 );
 
@@ -1296,14 +1296,14 @@ const {
 } = require('@opentelemetry/sdk-metrics');
 const { Resource } = require('@opentelemetry/resources');
 const {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
 } = require('@opentelemetry/semantic-conventions');
 
 const resource = Resource.default().merge(
   new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: 'service-name-here',
-    [SEMRESATTRS_SERVICE_VERSION]: '0.1.0',
+    [ATTR_SERVICE_NAME]: 'service-name-here',
+    [ATTR_SERVICE_VERSION]: '0.1.0',
   }),
 );