Merge branch 'main' into remove_apac_enduser_discussions

Author: danielgblanco

archetypes/blog.md

@@ -9,6 +9,8 @@ author: >- # If you have only one author, then add the single name on this line
 draft: true # TODO: remove this line once your post is ready to be published
 # canonical_url: http://somewhere.else/ # TODO: if this blog post has been posted somewhere else already, uncomment & provide the canonical URL here.
 body_class: otel-with-contributions-from # TODO: remove this line if there are no secondary contributing authors
+issue: the issue ID for this blog post # TODO: See https://opentelemetry.io/docs/contributing/blog/ for details
+sig: SIG Name # TODO: add the name of the SIG that sponsors this blog post 
 ---
 
 <!-- If your post doesn't have secondary authors, then delete the following paragraph: -->

assets/scss/_styles_project.scss

@@ -184,7 +184,7 @@
   }
 
   details {
-    background-color: $gray-100;
+    background-color: var(--bs-tertiary-bg);
     margin-bottom: 0.5em;
 
     summary {

content/en/_index.md

@@ -3,13 +3,25 @@ title: OpenTelemetry
 description: >-
   High-quality, ubiquitous, and portable telemetry to enable effective
   observability
-show_banner: true
 outputs:
   - HTML
   - REDIRECTS # Include this `content/en` ONLY
 developer_note:
   The blocks/cover shortcode (used below) will use as a background image any
   image file containing "background" in its name.
+show_banner: true
+limit_banner: 2 # Default to 2, adjust as needed
+banners:
+  - message:
+      '<i class="fas fa-bullhorn"></i> Join us for [**OTel Community Day** on
+      June
+      25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
+    to: 2024-06-25
+  - message:
+      '<i class="fas fa-bullhorn"></i> Help improve OTel and Prometheus
+      interoperability: [complete our
+      survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
+    to: 2024-05-31
 ---
 
 <div class="d-none"><a rel="me" href="https://fosstodon.org/@opentelemetry"></a></div>

content/en/docs/collector/internal-telemetry.md

@@ -6,13 +6,25 @@ weight: 30
 
 The [OpenTelemetry blog](/blog/) communicates new features, community reports,
 and any news that might be relevant to the OpenTelemetry community. This
-includes end users and developers. Anyone can write a blog post and submit it
-for review.
+includes end users and developers. Anyone can write a blog post, read below what
+the requirements are.
+
+## Documentation or blog post?
+
+Before writing a blog post, ask yourself if your content also might be a good
+addition to the documentation. If the answer is "yes", create a new issue or
+pull request (PR) with your content to get it added to the docs.
+
+Note, that the focus of maintainers and approvers of the OpenTelemetry Website
+is to improve the documentation of the project, so your blog post will have a
+lower priority for review.
 
 ## Before submitting a blog post
 
 Blog posts should not be commercial in nature and should consist of original
-content that applies broadly to the OpenTelemetry community.
+content that applies broadly to the OpenTelemetry community. Blog posts should
+follow the policies outlined in the
+[Social Media Guide](https://github.com/open-telemetry/community/blob/main/social-media-guide.md).
 
 Verify that your intended content broadly applies to the OpenTelemetry Community
 . Appropriate content includes:
@@ -27,15 +39,28 @@ Unsuitable content includes:
 
 - Vendor product pitches
 
-To submit a blog post,
+If your blog post fits into the list of appropriate content,
 [raise an issue](https://github.com/open-telemetry/opentelemetry.io/issues/new?title=New%20Blog%20Post:%20%3Ctitle%3E)
-with the title and a short description of your blog post. If you are not a
-[Member](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
-you also need to provide a _sponsor_ for your blog post, who is a Member (by
-that definition) and who is willing to provide a first review of your blog post.
-
-If you do not raise an issue before providing your PR, we may request you to do
-so before providing a review.
+with the following details:
+
+- Title of the blog post
+- Short description and outline of your blog post
+- If applicable, list the technologies used in your blog post. Make sure that
+  all of them are open source, and prefer CNCF projects over non-CNCF projects
+  (e.g. use Jaeger for trace visualization, and Prometheus for metric
+  visualization)
+- Name of a [SIG](https://github.com/open-telemetry/community/), which is
+  related to this blog post
+- Name of a sponsor (maintainer or approver) from this SIG, who will help to
+  review that PR
+
+Maintainers of SIG Communication will verify, that your blog post satisfies all
+the requirements for being accepted. If you can not name a SIG/sponsor in your
+initial issue details, they will also point you to an appropriate SIG, you can
+reach out to for sponsorship.
+
+If your issue has everything needed, a maintainer will verify that you can go
+ahead and submit your blog post.
 
 ## Submit a blog post
 
@@ -44,10 +69,6 @@ locally or by using the GitHub UI. In both cases we ask you to follow the
 instructions provided by the
 [blog post template](https://github.com/open-telemetry/opentelemetry.io/tree/main/archetypes/blog.md).
 
-**Note**: Before writing a blog post, ask yourself if your content also might be
-a good addition to the documentation. If the answer is "yes", create a new issue
-or pull request (PR) with your content to get it added to the docs.
-
 ### Fork and write locally
 
 After you've set up the local fork you can create a blog post using a template.

content/en/docs/contributing/blog.md

@@ -11,13 +11,20 @@ cSpell:ignore: chan fatalln funcs intn itoa khtml otelhttp rolldice stdouttrace
 This page will show you how to get started with OpenTelemetry in Go.
 
 You will learn how you can instrument a simple application manually, in such a
-way that [traces][] and [metrics][] are emitted to the console.
+way that [traces][], [metrics][], and [logs][] are emitted to the console.
+
+{{% alert title="Note" %}}
+
+The logs signal is still experimental. Breaking changes may be introduced in
+future versions.
+
+{{% /alert %}}
 
 ## Prerequisites
 
 Ensure that you have the following installed locally:
 
-- [Go](https://go.dev/)
+- [Go](https://go.dev/) 1.22 or greater
 
 ## Example application
 
@@ -135,9 +142,12 @@ import (
 	"time"
 
 	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/exporters/stdout/stdoutlog"
 	"go.opentelemetry.io/otel/exporters/stdout/stdoutmetric"
 	"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
+	"go.opentelemetry.io/otel/log/global"
 	"go.opentelemetry.io/otel/propagation"
+	"go.opentelemetry.io/otel/sdk/log"
 	"go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/trace"
 )
@@ -186,6 +196,15 @@ func setupOTelSDK(ctx context.Context) (shutdown func(context.Context) error, er
 	shutdownFuncs = append(shutdownFuncs, meterProvider.Shutdown)
 	otel.SetMeterProvider(meterProvider)
 
+	// Set up logger provider.
+	loggerProvider, err := newLoggerProvider()
+	if err != nil {
+		handleErr(err)
+		return
+	}
+	shutdownFuncs = append(shutdownFuncs, loggerProvider.Shutdown)
+	global.SetLoggerProvider(loggerProvider)
+
 	return
 }
 
@@ -224,6 +243,18 @@ func newMeterProvider() (*metric.MeterProvider, error) {
 	)
 	return meterProvider, nil
 }
+
+func newLoggerProvider() (*log.LoggerProvider, error) {
+	logExporter, err := stdoutlog.New()
+	if err != nil {
+		return nil, err
+	}
+
+	loggerProvider := log.NewLoggerProvider(
+		log.WithProcessor(log.NewBatchProcessor(logExporter)),
+	)
+	return loggerProvider, nil
+}
 ```
 <!-- prettier-ignore-end -->
 
@@ -318,7 +349,8 @@ func newHTTPHandler() http.Handler {
 	}
 
 	// Register handlers.
-	handleFunc("/rolldice", rolldice)
+	handleFunc("/rolldice/", rolldice)
+	handleFunc("/rolldice/{player}", rolldice)
 
 	// Add HTTP instrumentation for the whole server.
 	handler := otelhttp.NewHandler(mux, "/")
@@ -348,14 +380,23 @@ import (
 	"net/http"
 	"strconv"
 
+	"go.opentelemetry.io/contrib/bridges/otelslog"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/sdk/instrumentation"
 )
 
+const name = "rolldice"
+
 var (
-	tracer  = otel.Tracer("rolldice")
-	meter   = otel.Meter("rolldice")
+	tracer = otel.Tracer(name)
+	meter  = otel.Meter(name)
+	logger = otelslog.NewLogger(
+		otelslog.WithInstrumentationScope(instrumentation.Scope{
+			Name: name,
+		}),
+	)
 	rollCnt metric.Int64Counter
 )
 
@@ -375,6 +416,14 @@ func rolldice(w http.ResponseWriter, r *http.Request) {
 
 	roll := 1 + rand.Intn(6)
 
+	var msg string
+	if player := r.PathValue("player"); player != "" {
+		msg = fmt.Sprintf("%s is rolling the dice", player)
+	} else {
+		msg = "Anonymous player is rolling the dice"
+	}
+	logger.InfoContext(ctx, msg, "result", roll)
+
 	rollValueAttr := attribute.Int("roll.value", roll)
 	span.SetAttributes(rollValueAttr)
 	rollCnt.Add(ctx, 1, metric.WithAttributes(rollValueAttr))
@@ -400,11 +449,11 @@ export OTEL_RESOURCE_ATTRIBUTES="service.name=dice,service.version=0.1.0"
 go run .
 ```
 
-Open <http://localhost:8080/rolldice> in your web browser. When you send a
+Open <http://localhost:8080/rolldice/Alice> in your web browser. When you send a
 request to the server, you'll see two spans in the trace emitted to the console.
 The span generated by the instrumentation library tracks the lifetime of a
-request to the `/rolldice` route. The span called `roll` is created manually and
-it is a child of the previously mentioned span.
+request to the `/rolldice/{player}` route. The span called `roll` is created
+manually and it is a child of the previously mentioned span.
 
 <details>
 <summary>View example output</summary>
@@ -571,7 +620,7 @@ it is a child of the previously mentioned span.
 			"Key": "http.route",
 			"Value": {
 				"Type": "STRING",
-				"Value": "/rolldice"
+				"Value": "/rolldice/Alice"
 			}
 		},
 		{
@@ -646,8 +695,83 @@ it is a child of the previously mentioned span.
 
 </details>
 
-Refresh the <http://localhost:8080/rolldice> page a few times, and then either
-wait for a little bit or terminate the app and you'll see metrics as in the
+Along with the trace, log messages are emitted to the console.
+
+<details>
+<summary>View example output</summary>
+
+```json
+{
+  "Timestamp": "2023-09-25T12:42:05.177136776+02:00",
+  "ObservedTimestamp": "2023-09-25T12:42:06.809396011+02:00",
+  "Severity": 9,
+  "SeverityText": "",
+  "Body": {
+    "Type": "String",
+    "Value": "Alice is rolling the dice"
+  },
+  "Attributes": [
+    {
+      "Key": "result",
+      "Value": {
+        "Type": "Int64",
+        "Value": 6
+      }
+    }
+  ],
+  "TraceID": "829fb7ceb787403c96eac3caf285c965",
+  "SpanID": "8b6b408b6c1a35e5",
+  "TraceFlags": "01",
+  "Resource": [
+    {
+      "Key": "service.name",
+      "Value": {
+        "Type": "STRING",
+        "Value": "dice"
+      }
+    },
+    {
+      "Key": "service.version",
+      "Value": {
+        "Type": "STRING",
+        "Value": "0.1.0"
+      }
+    },
+    {
+      "Key": "telemetry.sdk.language",
+      "Value": {
+        "Type": "STRING",
+        "Value": "go"
+      }
+    },
+    {
+      "Key": "telemetry.sdk.name",
+      "Value": {
+        "Type": "STRING",
+        "Value": "opentelemetry"
+      }
+    },
+    {
+      "Key": "telemetry.sdk.version",
+      "Value": {
+        "Type": "STRING",
+        "Value": "1.19.0-rc.1"
+      }
+    }
+  ],
+  "Scope": {
+    "Name": "rolldice",
+    "Version": "",
+    "SchemaURL": ""
+  },
+  "DroppedAttributes": 0
+}
+```
+
+</details>
+
+Refresh the <http://localhost:8080/rolldice/Alice> page a few times, and then
+either wait a little or terminate the app and you'll see metrics as in the
 console output. You'll see the `dice.rolls` metric emitted to the console, with
 separate counts for each roll value, as well as the HTTP metrics generated by
 the instrumentation library.
@@ -832,7 +956,7 @@ the instrumentation library.
                     "Key": "http.route",
                     "Value": {
                       "Type": "STRING",
-                      "Value": "/rolldice"
+                      "Value": "/rolldice/Alice"
                     }
                   },
                   {
@@ -899,7 +1023,7 @@ the instrumentation library.
                     "Key": "http.route",
                     "Value": {
                       "Type": "STRING",
-                      "Value": "/rolldice"
+                      "Value": "/rolldice/Alice"
                     }
                   },
                   {
@@ -966,7 +1090,7 @@ the instrumentation library.
                     "Key": "http.route",
                     "Value": {
                       "Type": "STRING",
-                      "Value": "/rolldice"
+                      "Value": "/rolldice/Alice"
                     }
                   },
                   {
@@ -1041,3 +1165,4 @@ If you'd like to explore a more complex example, take a look at the
 
 [traces]: /docs/concepts/signals/traces/
 [metrics]: /docs/concepts/signals/metrics/
+[logs]: /docs/concepts/signals/logs/