Merge branch 'main' into pytyped

Author: xrmx

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Removed superfluous py.typed markers and added them where they were missing
   ([#4172](https://github.com/open-telemetry/opentelemetry-python/pull/4172))
+- Include metric info in encoding exceptions
+  ([#4154](https://github.com/open-telemetry/opentelemetry-python/pull/4154))
+- sdk: Add support for log formatting
+  ([#4137](https://github.com/open-telemetry/opentelemetry-python/pull/4166))
 
 ## Version 1.27.0/0.48b0 (2024-08-28)
 

CONTRIBUTING.md

@@ -224,6 +224,23 @@ updating the GitHub workflow to reference a PR in the Contrib repo
 * Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for one day.
 * Urgent fix can take exception as long as it has been actively communicated.
 
+#### Allow edits from maintainers
+
+Something _very important_ is to allow edits from maintainers when opening a PR. This will
+allow maintainers to rebase your PR against `main` which is necessary in order to merge
+your PR. You could do it yourself too, but keep in mind that every time another PR gets
+merged, your PR will require rebasing. Since only maintainers can merge your PR it is
+almost impossible for maintainers to find your PR just when it has been rebased by you so
+that it can be merged. Allowing maintainers to edit your PR also allows them to help you
+get your PR merged by making any minor fixes to solve any issue that while being unrelated
+to your PR, can still happen.
+
+#### Fork from a personal Github account
+
+Right now Github [does not allow](https://github.com/orgs/community/discussions/5634) PRs
+to be edited by maintainers if the corresponding repo fork exists in a Github organization.
+Please for this repo in a personal Github account instead.
+
 One of the maintainers will merge the PR once it is **ready to merge**.
 
 ## Design Choices

docs/examples/logs/README.rst

@@ -18,8 +18,8 @@ Start the Collector locally to see data being exported. Write the following file
             endpoint: 0.0.0.0:4317
 
     exporters:
-      logging:
-        loglevel: debug
+      debug:
+        verbosity: detailed
 
     processors:
       batch:
@@ -29,11 +29,11 @@ Start the Collector locally to see data being exported. Write the following file
             logs:
                 receivers: [otlp]
                 processors: [batch]
-                exporters: [logging]
+                exporters: [debug]
             traces:
                 receivers: [otlp]
                 processors: [batch]
-                exporters: [logging]
+                exporters: [debug]
 
 Then start the Docker container:
 

docs/examples/logs/otel-collector-config.yaml

@@ -5,8 +5,8 @@ receivers:
         endpoint: 0.0.0.0:4317
 
 exporters:
-  logging:
-    loglevel: debug
+  debug:
+    verbosity: debug
 
 processors:
   batch:
@@ -16,8 +16,8 @@ service:
         logs:
             receivers: [otlp]
             processors: [batch]
-            exporters: [logging]
+            exporters: [debug]
         traces: 
             receivers: [otlp]
             processors: [batch]
-            exporters: [logging]
+            exporters: [debug]

docs/examples/metrics/instruments/README.rst

@@ -13,7 +13,7 @@ Start the Collector locally to see data being exported. Write the following file
                     endpoint: 0.0.0.0:4317
 
     exporters:
-        logging:
+        debug:
 
     processors:
         batch:
@@ -22,7 +22,7 @@ Start the Collector locally to see data being exported. Write the following file
         pipelines:
             metrics:
                 receivers: [otlp]
-                exporters: [logging]
+                exporters: [debug]
   
 Then start the Docker container:
 

docs/examples/metrics/instruments/otel-collector-config.yaml

@@ -5,7 +5,7 @@ receivers:
                 endpoint: 0.0.0.0:4317
 
 exporters:
-    logging:
+    debug:
 
 processors:
     batch:
@@ -14,4 +14,4 @@ service:
     pipelines:
         metrics:
             receivers: [otlp]
-            exporters: [logging]
+            exporters: [debug]

docs/examples/opencensus-exporter-tracer/docker/collector-config.yaml

@@ -5,7 +5,7 @@ receivers:
 exporters:
   jaeger_grpc:
     endpoint: jaeger-all-in-one:14250
-  logging: {}
+  debug:
 
 processors:
   batch:
@@ -15,5 +15,5 @@ service:
   pipelines:
     traces:
       receivers: [opencensus]
-      exporters: [jaeger_grpc, logging]
+      exporters: [jaeger_grpc, debug]
       processors: [batch, queued_retry]