Merge branch 'main' into feat/nodejs/update-auto-instrumentation-defaults

Author: maxday

.github/workflows/ci-python.yml

@@ -31,13 +31,13 @@ jobs:
       matrix:
         # If you add a python version here, please make sure that the collector/Makefile publish and publish-layer targets
         # get updated as well
-        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
       - name: Checkout this repo
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup Python for OTel Python SDK
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
           python-version: ${{ matrix.python }}
       - name: Install tox testing package

.github/workflows/codeql.yml

@@ -68,7 +68,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
+      uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
       with:
         languages: ${{ matrix.target.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -82,7 +82,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
+      uses: github/codeql-action/autobuild@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
       with:
         working-directory: ${{ matrix.target.directory }}
       # There are no array literals in GHA that is why we need to use fromJson.
@@ -114,7 +114,7 @@ jobs:
       if: ${{ matrix.target.language == 'java' }}
 
     - name: setup dotnet
-      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
+      uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
       with:
         dotnet-version: 6.x
       if: ${{ matrix.target.language == 'csharp' }}
@@ -126,6 +126,6 @@ jobs:
       if: ${{ matrix.target.language == 'csharp' }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
+      uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
       with:
         category: "/language:${{matrix.target.language}}"

.github/workflows/layer-publish.yml

@@ -94,7 +94,7 @@ jobs:
         with:
           name: ${{ inputs.artifact-name }}
 
-      - uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
+      - uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
         with:
           role-to-assume: ${{ inputs.role-arn || secrets.OTEL_LAMBDA_LAYER_PUBLISH_ROLE_ARN || secrets.PROD_LAMBDA_ROLE_ARN }}
           role-duration-seconds: 1200

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
+        uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/release-layer-python.yml

@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
           python-version: '3.9'
 

README.md

@@ -135,6 +135,7 @@ For more information about the maintainer role, see the [community repository](h
 ### Approvers
 
 - [Ivan Santos](https://github.com/pragmaticivan)
+- [Maxime David](https://github.com/maxday)
 
 For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
 

collector/internal/telemetryapi/listener.go

@@ -17,14 +17,11 @@ package telemetryapi
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
-	"math/rand"
 	"net"
 	"net/http"
 	"os"
-	"syscall"
 	"time"
 
 	"github.com/golang-collections/go-datastructures/queue"
@@ -33,17 +30,8 @@ import (
 
 const (
 	initialQueueSize = 5
-	maxRetries       = 5
-	// Define ephemeral port range (typical range is 49152-65535)
-	minPort = 49152
-	maxPort = 65535
 )
 
-// getRandomPort returns a random port number within the ephemeral range
-func getRandomPort() string {
-	return fmt.Sprintf("%d", rand.Intn(maxPort-minPort)+minPort)
-}
-
 // Listener is used to listen to the Telemetry API
 type Listener struct {
 	httpServer *http.Server
@@ -60,46 +48,39 @@ func NewListener(logger *zap.Logger) *Listener {
 	}
 }
 
-func (s *Listener) tryBindPort() (net.Listener, string, error) {
-	for i := 0; i < maxRetries; i++ {
-		port := getRandomPort()
-		address := listenOnAddress(port)
-
-		l, err := net.Listen("tcp", address)
-		if err != nil {
-			if errors.Is(err, syscall.EADDRINUSE) {
-				s.logger.Debug("Port in use, trying another",
-					zap.String("address", address))
-				continue
-			}
-			return nil, "", err
-		}
-		return l, address, nil
+func (s *Listener) bindListener() (net.Listener, string, error) {
+	listenerAddr := listenOnAddress()
+	l, err := net.Listen("tcp", listenerAddr+":0")
+	if err != nil {
+		return nil, "", err
 	}
-
-	return nil, "", fmt.Errorf("failed to find available port after %d attempts", maxRetries)
+	addr := fmt.Sprintf("%s:%d", listenerAddr, l.Addr().(*net.TCPAddr).Port)
+	return l, addr, nil
 }
 
-func listenOnAddress(port string) string {
+func listenOnAddress() string {
 	envAwsLocal, ok := os.LookupEnv("AWS_SAM_LOCAL")
-	var addr string
 	if ok && envAwsLocal == "true" {
-		addr = ":" + port
+		return ""
 	} else {
-		addr = "sandbox.localdomain:" + port
+		return "sandbox.localdomain"
 	}
-	return addr
 }
 
 // Start the server in a goroutine where the log events will be sent
 func (s *Listener) Start() (string, error) {
-	listener, address, err := s.tryBindPort()
+	listener, address, err := s.bindListener()
 	if err != nil {
 		return "", fmt.Errorf("failed to find available port: %w", err)
 	}
 	s.logger.Info("Listening for requests", zap.String("address", address))
-	s.httpServer = &http.Server{Addr: address}
-	http.HandleFunc("/", s.httpHandler)
+	mux := http.NewServeMux()
+	s.httpServer = &http.Server{
+		Addr:    address,
+		Handler: mux,
+	}
+	mux.HandleFunc("/", s.httpHandler)
+
 	go func() {
 		err := s.httpServer.Serve(listener)
 		if err != http.ErrServerClosed {