Merge branch 'main' into cartermp/go-attributes

Author: cartermp

.gitmodules

@@ -9,7 +9,7 @@
 [submodule "content-modules/community"]
 	path = content-modules/community
 	url = https://github.com/open-telemetry/community
-	community-pin = 4e0d748
+	community-pin = f16a58e
 [submodule "content-modules/opentelemetry-proto"]
 	path = content-modules/opentelemetry-proto
 	url = https://github.com/open-telemetry/opentelemetry-proto

.htmltest.yml

@@ -9,7 +9,8 @@ IgnoreDirs:
   - ^blog/(\d+/)?page/\d+
 IgnoreInternalURLs: # list of paths
 IgnoreURLs: # list of regexs of paths or URLs to be ignored
-  - ^/docs/languages/\w+/(api|examples)/$
+  - ^/docs/languages/\w+/(api|examples|registry)/$
+  - ^/docs/collector/registry/$
   - ^/docs/languages/net/(metrics-api|traces-api)/
   - ^/community/end-user/feedback-survey/$
   - ^(/docs/migration/)?opencensus/$

content-modules/community

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Exporters, processors, receivers and other useful components for the
+  OpenTelemetry Collector
+redirect: /ecosystem/registry/?language=collector
+_build: { render: link }
+weight: 300
+---

content/en/docs/collector/registry.md

@@ -7,7 +7,7 @@ description: A measurement captured at runtime
 A **metric** is a **measurement** of a service captured at runtime. The moment
 of capturing a measurements is known as a **metric event**, which consists not
 only of the measurement itself, but also the time at which it was captured and
-associated metadata.d
+associated metadata.
 
 Application and request metrics are important indicators of availability and
 performance. Custom metrics can provide insights into how availability

content/en/docs/concepts/signals/metrics.md

@@ -9,7 +9,7 @@ cSpell:ignore: decltype labelkv nostd nullptr
 
 <!-- markdownlint-disable no-duplicate-heading -->
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 ## Setup
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry C++
+redirect: /ecosystem/registry/?language=cpp
+_build: { render: link }
+weight: 300
+---

content/en/docs/languages/cpp/registry.md

@@ -5,7 +5,7 @@ weight: 30
 description: Instrumentation for OpenTelemetry Erlang/Elixir
 ---
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 ## Setup
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry Erlang/Elixir
+redirect: /ecosystem/registry/?language=erlang
+_build: { render: link }
+weight: 300
+---

content/en/docs/languages/erlang/registry.md

@@ -8,7 +8,7 @@ description: Manual instrumentation for OpenTelemetry Go
 cSpell:ignore: fatalf otlptrace sdktrace sighup
 ---
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 ## Setup
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry Go
+redirect: /ecosystem/registry/?language=go
+_build: { render: link }
+weight: 300
+---

content/en/docs/languages/go/registry.md

@@ -10,7 +10,7 @@ Resources should be assigned to a tracer provider at its initialization, and are
 created much like attributes:
 
 ```go
-resources := resource.NewWithAttributes(
+res := resource.NewWithAttributes(
     semconv.SchemaURL,
     semconv.ServiceNameKey.String("myService"),
     semconv.ServiceVersionKey.String("1.0.0"),
@@ -19,7 +19,7 @@ resources := resource.NewWithAttributes(
 
 provider := sdktrace.NewTracerProvider(
     ...
-    sdktrace.WithResource(resources),
+    sdktrace.WithResource(res),
 )
 ```
 
@@ -36,13 +36,17 @@ hosting that operating system instance, or any number of other resource
 attributes.
 
 ```go
-resources := resource.New(context.Background(),
-    resource.WithFromEnv(), // pull attributes from OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables
-    resource.WithProcess(), // This option configures a set of Detectors that discover process information
-    resource.WithOS(), // This option configures a set of Detectors that discover OS information
-    resource.WithContainer(), // This option configures a set of Detectors that discover container information
-    resource.WithHost(), // This option configures a set of Detectors that discover host information
-    resource.WithDetectors(thirdparty.Detector{}), // Bring your own external Detector implementation
-    resource.WithAttributes(attribute.String("foo", "bar")), // Or specify resource attributes directly
+res, err := resource.New(context.Background(),
+	resource.WithFromEnv(),      // Pull attributes from OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables.
+	resource.WithTelemetrySDK(), // Provide information about the OpenTelemetry SDK used.
+	resource.WithProcess(),      // Discover and provide process information.
+	resource.WithOS(),           // Discover and provide OS information.
+	resource.WithContainer(),    // Discover and provide container information.
+	resource.WithHost(),         // Discover and provide information.
+	resource.WithAttributes(attribute.String("foo", "bar")), // Add custom resource attributes.
+	// resource.WithDetectors(thirdparty.Detector{}), // Bring your own external Detector implementation.
 )
+if err != nil {
+	log.Println(err) // Log issues during resource creation. Note that resource.New still returns a resource.
+}
 ```

content/en/docs/languages/go/resources.md

@@ -231,7 +231,7 @@ with the OpenTelemetry
 ## Automatic instrumentation
 
 Autoconfigures OpenTelemetry instrumentation for
-[spring-web](#spring-web-autoconfiguration) ,
+[spring-web](#spring-web-autoconfiguration),
 [spring-webmvc](#spring-web-mvc-autoconfiguration), and
 [spring-webflux](#spring-webflux-autoconfiguration). Leverages Spring Aspect
 Oriented Programming, dependency injection, and bean post-processing to trace
@@ -476,7 +476,7 @@ autoconfiguration features with an annotation or the Zipkin starter.
 
 ### Spring support
 
-Autoconfiguration is natively supported by Springboot applications. To enable
+Autoconfiguration is natively supported by Spring Boot applications. To enable
 these features in "vanilla" use `@EnableOpenTelemetry` to complete a component
 scan of this package.
 

content/en/docs/languages/java/automatic/spring-boot.md

@@ -13,7 +13,7 @@ cSpell:ignore: Autowired customizer logback loggable multivalued rolldice spring
 
 <!-- markdownlint-disable no-duplicate-heading -->
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 {{% alert title="Note" color="info" %}}
 
@@ -190,22 +190,47 @@ You should get a list of 12 numbers in your browser window, for example:
 For both library and app instrumentation, the first step is to install the
 dependencies for the OpenTelemetry API.
 
+Throughout this documentation you will add dependencies. For a full list of
+artifact coordinates, see [releases]. For semantic convention releases, see
+[semantic-conventions-java].
+
+[releases]: https://github.com/open-telemetry/opentelemetry-java#releases
+[semantic-conventions-java]:
+  https://github.com/open-telemetry/semantic-conventions-java/releases
+
+### Dependency management
+
+A Bill of Material
+([BOM](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#bill-of-materials-bom-poms))
+ensures that versions of dependencies (including transitive ones) are aligned.
+Importing the `opentelemetry-bom` BOM is important to ensure version alignment
+across all OpenTelemetry dependencies.
+
 {{< tabpane text=true >}} {{% tab Gradle %}}
 
-```kotlin { hl_lines=3 }
+```kotlin { hl_lines=["1-5",9] }
+dependencyManagement {
+  imports {
+    mavenBom("io.opentelemetry:opentelemetry-bom:{{% param vers.otel %}}")
+  }
+}
+
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web");
-    implementation("io.opentelemetry:opentelemetry-api:{{% param vers.otel %}}");
+    implementation("io.opentelemetry:opentelemetry-api");
 }
 ```
 
-Throughout this documentation you will add dependencies. For a full list of
-artifact coordinates, see [releases]. For semantic convention releases, see
-[semantic-conventions-java].
+If you are not using Spring and its `io.spring.dependency-management` dependency
+management plugin, install the OpenTelemetry BOM and API using Gradle
+dependencies only.
 
-[releases]: https://github.com/open-telemetry/opentelemetry-java#releases
-[semantic-conventions-java]:
-  https://github.com/open-telemetry/semantic-conventions-java/releases
+```kotlin
+dependencies {
+    implementation(platform("io.opentelemetry:opentelemetry-bom:{{% param vers.otel %}}"));
+    implementation("io.opentelemetry:opentelemetry-api");
+}
+```
 
 {{% /tab %}} {{% tab Maven %}}
 
@@ -238,49 +263,31 @@ artifact coordinates, see [releases]. For semantic convention releases, see
 {{% alert title="Note" color="info" %}} If you’re instrumenting a library,
 **skip this step**. {{% /alert %}}
 
-If you instrument a Java app, install the dependencies for the OpenTelemetry
-SDK.
+The OpenTelemetry API provides a set of interfaces for collecting telemetry, but
+the data is dropped without an implementation. The OpenTelemetry SDK is the
+implementation of the OpenTelemetry API provided by OpenTelemetry. To use it if
+you instrument a Java app, begin by installing dependencies:
 
 {{< tabpane text=true >}} {{% tab Gradle %}}
 
-```kotlin { hl_lines="4-8" }
+```kotlin { hl_lines="4-6" }
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web");
-    implementation("io.opentelemetry:opentelemetry-api:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-sdk:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-sdk-metrics:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-exporter-logging:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-semconv:{{% param vers.otel %}}-alpha");
+    implementation("io.opentelemetry:opentelemetry-api");
+    implementation("io.opentelemetry:opentelemetry-sdk");
+    implementation("io.opentelemetry:opentelemetry-exporter-logging");
+    implementation("io.opentelemetry.semconv:opentelemetry-semconv:{{% param vers.semconv %}}-alpha");
 }
 ```
 
 {{% /tab %}} {{% tab Maven %}}
 
 ```xml
 <project>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-bom</artifactId>
-                <version>{{% param vers.otel %}}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk</artifactId>
-        </dependency>
-                <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
@@ -312,16 +319,14 @@ To use autoconfiguration add the following dependency to your application:
 
 {{< tabpane text=true >}} {{% tab Gradle %}}
 
-```kotlin { hl_lines="9-10" }
+```kotlin { hl_lines="7" }
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web");
-    implementation("io.opentelemetry:opentelemetry-api:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-sdk:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-sdk-metrics:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-exporter-logging:{{% param vers.otel %}}");
-    implementation("io.opentelemetry.semconv:opentelemetry-semconv:{{% param vers.semconv %}}-alpha")
-    implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:{{% param vers.otel %}}");
-    implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:{{% param vers.otel %}}");
+    implementation("io.opentelemetry:opentelemetry-api");
+    implementation("io.opentelemetry:opentelemetry-sdk");
+    implementation("io.opentelemetry:opentelemetry-exporter-logging");
+    implementation("io.opentelemetry.semconv:opentelemetry-semconv:{{% param vers.semconv %}}-alpha");
+    implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure");
 }
 ```
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry Java
+redirect: /ecosystem/registry/?language=java
+_build: { render: link }
+weight: 300
+---

content/en/docs/languages/java/registry.md

@@ -8,7 +8,7 @@ cSpell:ignore: dicelib Millis rolldice
 description: Instrumentation for OpenTelemetry JavaScript
 ---
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 {{% alert title="Note" color="info" %}}
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry JavaScript
+redirect: /ecosystem/registry/?language=js
+_build: { render: link }
+weight: 300
+---

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

@@ -5,7 +5,7 @@ aliases: [manual]
 description: Instrumentation for OpenTelemetry .NET
 ---
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 ## A note on terminology
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry .NET
+redirect: /ecosystem/registry/?language=dotnet
+_build: { render: link }
+weight: 300
+---

content/en/docs/languages/net/registry.md

@@ -8,7 +8,7 @@ cSpell:ignore: guzzlehttp myapp
 
 <!-- markdownlint-disable no-duplicate-heading -->
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 ## Example app preparation {#example-app}
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry PHP
+redirect: /ecosystem/registry/?language=php
+_build: { render: link }
+weight: 300
+---

content/en/docs/languages/php/registry.md

@@ -8,7 +8,7 @@ cSpell:ignore: millis ottrace textmap
 
 <!-- markdownlint-disable no-duplicate-heading -->
 
-{{% docs/languages/manual-intro %}}
+{{% docs/languages/instrumentation-intro %}}
 
 ## Setup
 

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

@@ -0,0 +1,9 @@
+---
+title: Registry
+description:
+  Instrumentation libraries, exporters and other useful components for
+  OpenTelemetry Python
+redirect: /ecosystem/registry/?language=python
+_build: { render: link }
+weight: 300
+---