Merge branch 'main' into zaptest

.github/workflows/ci.yml

@@ -102,17 +102,20 @@ jobs:
     strategy:
       matrix:
         go-version: ["~1.22.4", "~1.21.12"]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        # GitHub Actions does not support arm* architectures on default
-        # runners. It is possible to accomplish this with a self-hosted runner
-        # if we want to add this in the future:
-        # https://docs.github.com/en/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow
-        arch: ["386", amd64]
-        exclude:
-        # Not a supported Go OS/architecture.
-        - os: macos-latest
-          arch: "386"
-    runs-on: ${{ matrix.os }}
+        platform:
+          - os: ubuntu-latest
+            arch: "386"
+          - os: ubuntu-latest
+            arch: amd64
+          - os: macos-13
+            arch: amd64
+          - os: macos-latest
+            arch: arm64
+          - os: windows-latest
+            arch: "386"
+          - os: windows-latest
+            arch: amd64
+    runs-on: ${{ matrix.platform.os }}
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -124,7 +127,7 @@ jobs:
         cache-dependency-path: "**/go.sum"
     - name: Run tests
       env:
-        GOARCH: ${{ matrix.arch }}
+        GOARCH: ${{ matrix.platform.arch }}
       run: make test-short
 
   test-compatibility:

CHANGELOG.md

@@ -10,8 +10,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Added
 
-- Add the new `go.opentelemetry.io/contrib/instrgen` package to provide auto-generated source code instrumentation. (#3068, #3108)
 - Support for stdoutlog exporter in `go.opentelemetry.io/contrib/config`. (#5850)
+- Add macOS ARM64 platform to the compatibility testing suite. (#5868)
+
+### Removed
+
+- The deprecated `go.opentelemetry.io/contrib/processors/baggagecopy` package is removed. (#5853)
 
 ## [1.28.0/0.53.0/0.22.0/0.8.0/0.3.0/0.1.0] - 2024-07-02
 

CODEOWNERS

@@ -56,7 +56,7 @@ instrumentation/net/http/httptrace/otelhttptrace/                       @open-te
 instrumentation/net/http/otelhttp/                                      @open-telemetry/go-approvers @dmathieu
 instrumentation/runtime/                                                @open-telemetry/go-approvers @MadVikingGod
 
-processors/baggage/baggagetrace                                         @open-telemetry/go-approvers @codeboten @MikeGoldsmith
+processors/baggagecopy                                                  @open-telemetry/go-approvers @codeboten @MikeGoldsmith
 processors/minsev                                                       @open-telemetry/go-approvers @MrAlias
 
 propagators/autoprop/                                                   @open-telemetry/go-approvers @MrAlias

README.md

@@ -48,18 +48,20 @@ stop ensuring compatibility with these versions in the following manner:
 
 This project is tested on the following systems.
 
-| OS      | Go Version | Architecture |
-| ------- | ---------- | ------------ |
-| Ubuntu  | 1.22       | amd64        |
-| Ubuntu  | 1.21       | amd64        |
-| Ubuntu  | 1.22       | 386          |
-| Ubuntu  | 1.21       | 386          |
-| MacOS   | 1.22       | amd64        |
-| MacOS   | 1.21       | amd64        |
-| Windows | 1.22       | amd64        |
-| Windows | 1.21       | amd64        |
-| Windows | 1.22       | 386          |
-| Windows | 1.21       | 386          |
+| OS       | Go Version | Architecture |
+| -------- | ---------- | ------------ |
+| Ubuntu   | 1.22       | amd64        |
+| Ubuntu   | 1.21       | amd64        |
+| Ubuntu   | 1.22       | 386          |
+| Ubuntu   | 1.21       | 386          |
+| macOS 13 | 1.22       | amd64        |
+| macOS 13 | 1.21       | amd64        |
+| macOS    | 1.22       | arm64        |
+| macOS    | 1.21       | arm64        |
+| Windows  | 1.22       | amd64        |
+| Windows  | 1.21       | amd64        |
+| Windows  | 1.22       | 386          |
+| Windows  | 1.21       | 386          |
 
 While this project should work for other systems, no compatibility guarantees
 are made for those systems currently.

bridges/otellogrus/hook_test.go

@@ -400,43 +400,12 @@ func assertKeyValues(t *testing.T, want, got []log.KeyValue) {
 	}
 }
 
-func assertBody(t *testing.T, want log.Value, got log.Value) {
-	t.Helper()
-	if !got.Equal(want) {
-		t.Errorf("Body value is not equal:\nwant: %v\ngot:  %v", want, got)
-	}
-}
-
-func assertAttributes(t *testing.T, want, got logtest.EmittedRecord) {
-	t.Helper()
-
-	var wantAttr []log.KeyValue
-	want.WalkAttributes(func(kv log.KeyValue) bool {
-		wantAttr = append(wantAttr, kv)
-		return true
-	})
-	var gotAttr []log.KeyValue
-	got.WalkAttributes(func(kv log.KeyValue) bool {
-		gotAttr = append(gotAttr, kv)
-		return true
-	})
-
-	if !slices.EqualFunc(wantAttr, gotAttr, log.KeyValue.Equal) {
-		t.Errorf("Attributes are not equal:\nwant: %v\ngot:  %v", want, got)
-	}
-}
-
 func assertRecords(t *testing.T, want, got []logtest.EmittedRecord) {
 	t.Helper()
 
 	assert.Equal(t, len(want), len(got))
 
 	for i, j := range want {
-		assert.Equal(t, j.Timestamp(), got[i].Timestamp())
-		assert.Equal(t, j.ObservedTimestamp(), got[i].ObservedTimestamp())
-		assert.Equal(t, j.Severity(), got[i].Severity())
-		assert.Equal(t, j.SeverityText(), got[i].SeverityText())
-		assertBody(t, j.Body(), got[i].Body())
-		assertAttributes(t, j, got[i])
+		logtest.AssertRecordEqual(t, j.Record, got[i].Record)
 	}
 }

bridges/otelslog/handler.go

@@ -49,7 +49,6 @@ import (
 	"fmt"
 	"log/slog"
 	"slices"
-	"sync"
 
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/global"
@@ -180,8 +179,7 @@ func (h *Handler) convertRecord(r slog.Record) log.Record {
 	n := r.NumAttrs()
 	if h.group != nil {
 		if n > 0 {
-			buf, free := getKVBuffer()
-			defer free()
+			buf := newKVBuffer(n)
 			r.Attrs(buf.AddAttr)
 			record.AddAttributes(h.group.KeyValue(buf.KeyValues()...))
 		} else {
@@ -192,8 +190,7 @@ func (h *Handler) convertRecord(r slog.Record) log.Record {
 			}
 		}
 	} else if n > 0 {
-		buf, free := getKVBuffer()
-		defer free()
+		buf := newKVBuffer(n)
 		r.Attrs(buf.AddAttr)
 		record.AddAttributes(buf.KeyValues()...)
 	}
@@ -338,27 +335,6 @@ func (g *group) AddAttrs(attrs []slog.Attr) {
 	g.attrs.AddAttrs(attrs)
 }
 
-var kvBufferPool = sync.Pool{
-	New: func() any {
-		// Based on slog research (https://go.dev/blog/slog#performance), 95%
-		// of use-cases will use 5 or less attributes.
-		return newKVBuffer(5)
-	},
-}
-
-func getKVBuffer() (buf *kvBuffer, free func()) {
-	buf = kvBufferPool.Get().(*kvBuffer)
-	return buf, func() {
-		// TODO: limit returned size so the pool doesn't hold on to very large
-		// buffers. Idea is based on
-		// https://cs.opensource.google/go/x/exp/+/814bf88c:slog/internal/buffer/buffer.go;l=27-34
-
-		// Do not modify any previously held data.
-		buf.data = buf.data[:0:0]
-		kvBufferPool.Put(buf)
-	}
-}
-
 type kvBuffer struct {
 	data []log.KeyValue
 }
@@ -451,9 +427,9 @@ func convertValue(v slog.Value) log.Value {
 	case slog.KindUint64:
 		return log.Int64Value(int64(v.Uint64()))
 	case slog.KindGroup:
-		buf, free := getKVBuffer()
-		defer free()
-		buf.AddAttrs(v.Group())
+		g := v.Group()
+		buf := newKVBuffer(len(g))
+		buf.AddAttrs(g)
 		return log.MapValue(buf.data...)
 	case slog.KindLogValuer:
 		return convertValue(v.Resolve())

bridges/otelzerolog/example_test.go

@@ -0,0 +1,23 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package otelzerolog_test
+
+import (
+	"os"
+
+	"github.com/rs/zerolog"
+
+	"go.opentelemetry.io/contrib/bridges/otelzerolog"
+	"go.opentelemetry.io/otel/log/noop"
+)
+
+func Example() {
+	// Use a working LoggerProvider implementation instead e.g. using go.opentelemetry.io/otel/sdk/log.
+	provider := noop.NewLoggerProvider()
+
+	// Create a logger that emits logs to both STDOUT and the OTel Go SDK.
+	hook := otelzerolog.NewHook("my/pkg/name", otelzerolog.WithLoggerProvider(provider))
+	logger := zerolog.New(os.Stdout).With().Logger()
+	logger = logger.Hook(hook)
+}

processors/baggage/baggagetrace/go.mod → bridges/otelzerolog/go.mod

@@ -1,25 +1,23 @@
-// Deprecated: Use go.opentelemetry.io/contrib/processors/baggagecopy instead.
-module go.opentelemetry.io/contrib/processors/baggage/baggagetrace
+module go.opentelemetry.io/contrib/bridges/otelzerolog
 
 go 1.21
 
 require (
+	github.com/rs/zerolog v1.33.0
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/contrib/processors/baggagecopy v0.1.0
-	go.opentelemetry.io/otel v1.28.0
-	go.opentelemetry.io/otel/sdk v1.28.0
+	go.opentelemetry.io/otel/log v0.4.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace go.opentelemetry.io/contrib/processors/baggagecopy => ../../baggagecopy

processors/baggage/baggagetrace/go.sum → bridges/otelzerolog/go.sum

@@ -1,26 +1,39 @@
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
 go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o=
+go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I=
 go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
 go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
-go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE=
-go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg=
 go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
 go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=