Add a timeout param to all OTLP grpc / http export calls

.github/workflows/contrib.yml

@@ -15,4 +15,8 @@ jobs:
     uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main
     with:
       CORE_REPO_SHA: ${{ github.sha }}
-      CONTRIB_REPO_SHA: main
+      CONTRIB_REPO_SHA: ${{ github.event_name == 'pull_request' && (
+          contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+          contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+          'main'
+        ) || 'main' }}

.github/workflows/lint_0.yml

@@ -15,7 +15,15 @@ concurrency:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
+  # For PRs you can change the inner fallback ('main')
+  # For pushes you change the outer fallback ('main')
+  # The logic below is used during releases and depends on having an equivalent branch name in the contrib repo.
+  CONTRIB_REPO_SHA: ${{ github.event_name == 'pull_request' && (
+       contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+       contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+       'main'
+    ) || 'main' }}
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/misc_0.yml

@@ -15,7 +15,15 @@ concurrency:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
+  # For PRs you can change the inner fallback ('main')
+  # For pushes you change the outer fallback ('main')
+  # The logic below is used during releases and depends on having an equivalent branch name in the contrib repo.
+  CONTRIB_REPO_SHA: ${{ github.event_name == 'pull_request' && (
+       contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+       contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+       'main'
+    ) || 'main' }}
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/prepare-patch-release.yml

@@ -65,6 +65,7 @@ jobs:
         run: .github/scripts/use-cla-approved-github-bot.sh
 
       - name: Create pull request
+        id: create_pr
         env:
           # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
           GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
@@ -74,7 +75,15 @@ jobs:
 
           git commit -a -m "$message"
           git push origin HEAD:$branch
-          gh pr create --title "[$GITHUB_REF_NAME] $message" \
+          pr_url=$(gh pr create --title "[$GITHUB_REF_NAME] $message" \
                        --body "$message." \
                        --head $branch \
-                       --base $GITHUB_REF_NAME
+                       --base $GITHUB_REF_NAME)
+
+          echo "pr_url=$pr_url" >> $GITHUB_OUTPUT
+      - name: Add prepare-release label to PR
+        if: steps.create_pr.outputs.pr_url != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit ${{ steps.create_pr.outputs.pr_url }}  --add-label "prepare-release"

.github/workflows/prepare-release-branch.yml

@@ -91,6 +91,7 @@ jobs:
         run: .github/scripts/use-cla-approved-github-bot.sh
 
       - name: Create pull request against the release branch
+        id: create_release_branch_pr
         env:
           # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
           GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
@@ -100,10 +101,18 @@ jobs:
 
           git commit -a -m "$message"
           git push origin HEAD:$branch
-          gh pr create --title "[$RELEASE_BRANCH_NAME] $message" \
+          pr_url=$(gh pr create --title "[$RELEASE_BRANCH_NAME] $message" \
                        --body "$message." \
                        --head $branch \
-                       --base $RELEASE_BRANCH_NAME
+                       --base $RELEASE_BRANCH_NAME)
+          echo "pr_url=$pr_url" >> $GITHUB_OUTPUT
+
+      - name: Add prepare-release label to PR
+        if: steps.create_release_branch_pr.outputs.pr_url != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit ${{ steps.create_release_branch_pr.outputs.pr_url }}  --add-label "prepare-release"
 
   create-pull-request-against-main:
     runs-on: ubuntu-latest
@@ -170,6 +179,7 @@ jobs:
         run: .github/scripts/use-cla-approved-github-bot.sh
 
       - name: Create pull request against main
+        id: create_main_pr
         env:
           # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
           GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
@@ -180,7 +190,15 @@ jobs:
 
           git commit -a -m "$message"
           git push origin HEAD:$branch
-          gh pr create --title "$message" \
+          pr_url=$(gh pr create --title "$message" \
                        --body "$body" \
                        --head $branch \
-                       --base main
+                       --base main)
+          echo "pr_url=$pr_url" >> $GITHUB_OUTPUT
+
+      - name: Add prepare-release label to PR
+        if: steps.create_main_pr.outputs.pr_url != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit ${{ steps.create_main_pr.outputs.pr_url }}  --add-label "prepare-release"

.github/workflows/templates/lint.yml.j2

@@ -15,7 +15,15 @@ concurrency:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
+  # For PRs you can change the inner fallback ('main')
+  # For pushes you change the outer fallback ('main')
+  # The logic below is used during releases and depends on having an equivalent branch name in the contrib repo.
+  CONTRIB_REPO_SHA: {% raw %}${{ github.event_name == 'pull_request' && (
+       contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+       contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+       'main'
+    ) || 'main' }}{% endraw %}
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/templates/misc.yml.j2

@@ -15,7 +15,15 @@ concurrency:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
+  # For PRs you can change the inner fallback ('main')
+  # For pushes you change the outer fallback ('main')
+  # The logic below is used during releases and depends on having an equivalent branch name in the contrib repo.
+  CONTRIB_REPO_SHA: {% raw %}${{ github.event_name == 'pull_request' && (
+       contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+       contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+       'main'
+    ) || 'main' }}{% endraw %}
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/templates/test.yml.j2

@@ -15,7 +15,15 @@ concurrency:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
+  # For PRs you can change the inner fallback ('main')
+  # For pushes you change the outer fallback ('main')
+  # The logic below is used during releases and depends on having an equivalent branch name in the contrib repo.
+  CONTRIB_REPO_SHA: {% raw %}${{ github.event_name == 'pull_request' && (
+       contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+       contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+       'main'
+    ) || 'main' }}{% endraw %}
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/test_0.yml

@@ -15,7 +15,15 @@ concurrency:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
+  # For PRs you can change the inner fallback ('main')
+  # For pushes you change the outer fallback ('main')
+  # The logic below is used during releases and depends on having an equivalent branch name in the contrib repo.
+  CONTRIB_REPO_SHA: ${{ github.event_name == 'pull_request' && (
+       contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+       contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+       'main'
+    ) || 'main' }}
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/test_1.yml

@@ -15,7 +15,15 @@ concurrency:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
+  # For PRs you can change the inner fallback ('main')
+  # For pushes you change the outer fallback ('main')
+  # The logic below is used during releases and depends on having an equivalent branch name in the contrib repo.
+  CONTRIB_REPO_SHA: ${{ github.event_name == 'pull_request' && (
+       contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
+       contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
+       'main'
+    ) || 'main' }}
   PIP_EXISTS_ACTION: w
 
 jobs:

CHANGELOG.md

@@ -7,8 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fix intermittent `Connection aborted` error when using otlp/http exporters
+  ([#4477](https://github.com/open-telemetry/opentelemetry-python/pull/4477))
+- opentelemetry-sdk: use stable code attributes: `code.function` -> `code.function.name`, `code.lineno` -> `code.line.number`, `code.filepath` -> `code.file.path`
+  ([#4508](https://github.com/open-telemetry/opentelemetry-python/pull/4508))
 - Fix serialization of extended attributes for logs signal
   ([#4342](https://github.com/open-telemetry/opentelemetry-python/pull/4342))
+- docs: updated and added to the metrics and log examples
+  ([#4559](https://github.com/open-telemetry/opentelemetry-python/pull/4559))
 
 ## Version 1.32.0/0.53b0 (2025-04-10)
 

docs/examples/logs/README.rst

@@ -52,37 +52,70 @@ The resulting logs will appear in the output from the collector and look similar
 
 .. code-block:: sh
 
-        Resource SchemaURL: 
-        Resource labels:
-            -> telemetry.sdk.language: STRING(python)
-            -> telemetry.sdk.name: STRING(opentelemetry)
-            -> telemetry.sdk.version: STRING(1.8.0)
-            -> service.name: STRING(shoppingcart)
-            -> service.instance.id: STRING(instance-12)
-        InstrumentationLibraryLogs #0
-        InstrumentationLibraryMetrics SchemaURL: 
-        InstrumentationLibrary __main__ 0.1
-        LogRecord #0
-        Timestamp: 2022-01-13 20:37:03.998733056 +0000 UTC
-        Severity: WARNING
-        ShortName: 
-        Body: Jail zesty vixen who grabbed pay from quack.
-        Trace ID: 
-        Span ID: 
-        Flags: 0
-        LogRecord #1
-        Timestamp: 2022-01-13 20:37:04.082757888 +0000 UTC
-        Severity: ERROR
-        ShortName: 
-        Body: The five boxing wizards jump quickly.
-        Trace ID: 
-        Span ID: 
-        Flags: 0
-        LogRecord #2
-        Timestamp: 2022-01-13 20:37:04.082979072 +0000 UTC
-        Severity: ERROR
-        ShortName: 
-        Body: Hyderabad, we have a major problem.
-        Trace ID: 63491217958f126f727622e41d4460f3
-        Span ID: d90c57d6e1ca4f6c
-        Flags: 1
+    ResourceLog #0
+    Resource SchemaURL: 
+    Resource attributes:
+        -> telemetry.sdk.language: Str(python)
+        -> telemetry.sdk.name: Str(opentelemetry)
+        -> telemetry.sdk.version: Str(1.33.0.dev0)
+        -> service.name: Str(shoppingcart)
+        -> service.instance.id: Str(instance-12)
+    ScopeLogs #0
+    ScopeLogs SchemaURL: 
+    InstrumentationScope myapp.area2 
+    LogRecord #0
+    ObservedTimestamp: 2025-04-22 12:16:57.315179 +0000 UTC
+    Timestamp: 2025-04-22 12:16:57.315152896 +0000 UTC
+    SeverityText: WARN
+    SeverityNumber: Warn(13)
+    Body: Str(Jail zesty vixen who grabbed pay from quack.)
+    Attributes:
+        -> code.filepath: Str(/Users/jayclifford/Repos/opentelemetry-python/docs/examples/logs/example.py)
+        -> code.function: Str(<module>)
+        -> code.lineno: Int(47)
+    Trace ID: 
+    Span ID: 
+    Flags: 0
+    LogRecord #1
+    ObservedTimestamp: 2025-04-22 12:16:57.31522 +0000 UTC
+    Timestamp: 2025-04-22 12:16:57.315213056 +0000 UTC
+    SeverityText: ERROR
+    SeverityNumber: Error(17)
+    Body: Str(The five boxing wizards jump quickly.)
+    Attributes:
+        -> code.filepath: Str(/Users/jayclifford/Repos/opentelemetry-python/docs/examples/logs/example.py)
+        -> code.function: Str(<module>)
+        -> code.lineno: Int(48)
+    Trace ID: 
+    Span ID: 
+    Flags: 0
+    LogRecord #2
+    ObservedTimestamp: 2025-04-22 12:16:57.315445 +0000 UTC
+    Timestamp: 2025-04-22 12:16:57.31543808 +0000 UTC
+    SeverityText: ERROR
+    SeverityNumber: Error(17)
+    Body: Str(Hyderabad, we have a major problem.)
+    Attributes:
+        -> code.filepath: Str(/Users/jayclifford/Repos/opentelemetry-python/docs/examples/logs/example.py)
+        -> code.function: Str(<module>)
+        -> code.lineno: Int(61)
+    Trace ID: 8a6739fffce895e694700944e2faf23e
+    Span ID: a45337020100cb63
+    Flags: 1
+    ScopeLogs #1
+    ScopeLogs SchemaURL: 
+    InstrumentationScope myapp.area1 
+    LogRecord #0
+    ObservedTimestamp: 2025-04-22 12:16:57.315242 +0000 UTC
+    Timestamp: 2025-04-22 12:16:57.315234048 +0000 UTC
+    SeverityText: ERROR
+    SeverityNumber: Error(17)
+    Body: Str(I have custom attributes.)
+    Attributes:
+        -> user_id: Str(user-123)
+        -> code.filepath: Str(/Users/jayclifford/Repos/opentelemetry-python/docs/examples/logs/example.py)
+        -> code.function: Str(<module>)
+        -> code.lineno: Int(53)
+    Trace ID: 
+    Span ID: 
+    Flags: 0

docs/examples/logs/example.py

@@ -47,6 +47,10 @@
 logger2.warning("Jail zesty vixen who grabbed pay from quack.")
 logger2.error("The five boxing wizards jump quickly.")
 
+# Log custom attributes
+# Custom attributes are added on a per event basis
+user_id = "user-123"
+logger1.error("I have custom attributes.", extra={"user_id": user_id})
 
 # Trace context correlation
 tracer = trace.get_tracer(__name__)

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

@@ -6,7 +6,7 @@ receivers:
 
 exporters:
   debug:
-    verbosity: debug
+    verbosity: detailed
 
 processors:
   batch:

docs/examples/metrics/reader/README.rst

@@ -6,6 +6,7 @@ These examples show how to customize the metrics that are output by the SDK usin
 * preferred_aggregation.py: Shows how to configure the preferred aggregation for metric instrument types.
 * preferred_temporality.py: Shows how to configure the preferred temporality for metric instrument types.
 * preferred_exemplarfilter.py: Shows how to configure the exemplar filter.
+* synchronous_gauge_read.py: Shows how to use `PeriodicExportingMetricReader` in a synchronous manner to explicitly control the collection of metrics.
 
 The source files of these examples are available :scm_web:`here <docs/examples/metrics/reader/>`.