Merge branch 'main' into sdk/xlogs

pellared · Feb 7, 2025 · cb91d27 · cb91d27
2 parents c23714b + b25505b
commit cb91d27
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 11 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -5,6 +5,9 @@ on:
       - main
   workflow_dispatch:
 
+# Declare default permissions as read only.
+permissions: read-all
+
 env:
   DEFAULT_GO_VERSION: "~1.23.0"
 jobs:

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -10,6 +10,10 @@ on:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches:
       - main
+
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   changelog:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,6 +13,8 @@ env:
   # explicitly test our code for these versions so keeping this at prior
   # versions does not add value.
   DEFAULT_GO_VERSION: "~1.23.0"
+# Declare default permissions as read only.
+permissions: read-all
 jobs:
   lint:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -17,6 +17,9 @@ on:
     branches: [ main ]
   pull_request:
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   CodeQL-Build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/codespell.yaml b/.github/workflows/codespell.yaml
@@ -4,6 +4,8 @@ on:
     branches:
       - main
   pull_request:
+# Declare default permissions as read only.
+permissions: read-all
 jobs:
   codespell:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/links-fail-fast.yml b/.github/workflows/links-fail-fast.yml
@@ -6,6 +6,9 @@ on:
       - main
   pull_request:
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   check-links:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
@@ -7,6 +7,9 @@ on:
   # Everyday at 9:00 AM.
   - cron: "0 9 * * *"
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   check-links:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/markdown-fail-fast.yml b/.github/workflows/markdown-fail-fast.yml
@@ -4,6 +4,9 @@ on:
   push:
   pull_request:
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   changedfiles:
     name: changed files

diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml
@@ -7,6 +7,9 @@ on:
   # Everyday at 9:00 AM.
   - cron: "0 9 * * *"
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   lint-markdown:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/protect-released-changelog.yml b/.github/workflows/protect-released-changelog.yml
@@ -7,6 +7,10 @@ name: Protect released changelog
 on:
   pull_request:
     types: [opened, synchronize, reopened, labeled, unlabeled]
+
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   protect-released-changelog:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-go/coverage.svg?branch=main)](https://app.codecov.io/gh/open-telemetry/opentelemetry-go?branch=main)
 [![PkgGoDev](https://pkg.go.dev/badge/go.opentelemetry.io/otel)](https://pkg.go.dev/go.opentelemetry.io/otel)
 [![Go Report Card](https://goreportcard.com/badge/go.opentelemetry.io/otel)](https://goreportcard.com/report/go.opentelemetry.io/otel)
+[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/open-telemetry/opentelemetry-go/badge)](https://scorecard.dev/viewer/?uri=github.com/open-telemetry/opentelemetry-go)
 [![Slack](https://img.shields.io/badge/slack-@cncf/otel--go-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01NPAXACKT)
 
 OpenTelemetry-Go is the [Go](https://golang.org/) implementation of [OpenTelemetry](https://opentelemetry.io/).

diff --git a/dependencies.Dockerfile b/dependencies.Dockerfile
@@ -1,3 +1,3 @@
 # This is a renovate-friendly source of Docker images.
-FROM python:3.13.1-slim-bullseye@sha256:0eab754489555b1f0a6beaa0733e5bc7d39b12c58cb3f0a45613bec60555e716 AS python
+FROM python:3.13.2-slim-bullseye@sha256:561ff65b26571534bea164cff88489f8ba621032475a099e572a9ccd4fbcd6ab AS python
 FROM otel/weaver:v0.12.0@sha256:0b6136dc8ba68b3ee143dc8ee63b214af740276e5bbb0e7712ad61acc9b447da AS weaver
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -12,7 +12,7 @@ require (
 	go.opentelemetry.io/build-tools/gotmpl v0.18.0
 	go.opentelemetry.io/build-tools/multimod v0.18.0
 	go.opentelemetry.io/build-tools/semconvgen v0.18.0
-	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
+	golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3
 	golang.org/x/tools v0.29.0
 	golang.org/x/vuln v1.1.4
 )
@@ -208,7 +208,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20250128182459-e0ece0dbea4c // indirect
+	golang.org/x/exp/typeparams v0.0.0-20250207012021-f9890c6ad9f3 // indirect
 	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect

diff --git a/internal/tools/go.sum b/internal/tools/go.sum
@@ -519,12 +519,12 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
 golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
-golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
+golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 h1:qNgPs5exUA+G0C96DrPwNrvLSj7GT/9D+3WMWUcUg34=
+golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
-golang.org/x/exp/typeparams v0.0.0-20250128182459-e0ece0dbea4c h1:sMPlrlhFwAE8DZXzAIztseGS+N8uGlLbFQCOTsoIPmc=
-golang.org/x/exp/typeparams v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
+golang.org/x/exp/typeparams v0.0.0-20250207012021-f9890c6ad9f3 h1:w2c+/ogVo2eFFhGTMddgOF7WQkdOPwjh+MRS8wUnujk=
+golang.org/x/exp/typeparams v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=

diff --git a/sdk/trace/sampling.go b/sdk/trace/sampling.go
@@ -47,12 +47,12 @@ const (
 	// Drop will not record the span and all attributes/events will be dropped.
 	Drop SamplingDecision = iota
 
-	// Record indicates the span's `IsRecording() == true`, but `Sampled` flag
-	// *must not* be set.
+	// RecordOnly indicates the span's IsRecording method returns true, but trace.FlagsSampled flag
+	// must not be set.
 	RecordOnly
 
-	// RecordAndSample has span's `IsRecording() == true` and `Sampled` flag
-	// *must* be set.
+	// RecordAndSample indicates the span's IsRecording method returns true and trace.FlagsSampled flag
+	// must be set.
 	RecordAndSample
 )