Merge branch 'main' into codeboten/proto-0.17.0

.github/workflows/build-and-test-windows.yaml

@@ -16,11 +16,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.17
-      - name: Setup Go Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-        shell: bash
       - name: Cache Go
         uses: actions/cache@v3
         env:

.github/workflows/build-and-test.yml

@@ -16,10 +16,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.17
-      - name: Setup Go Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -34,6 +30,7 @@ jobs:
       - name: Install Tools
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make install-tools
+
   lint:
     runs-on: ubuntu-latest
     needs: [setup-environment]
@@ -44,10 +41,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.17
-      - name: Setup Go Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -71,10 +64,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.17
-      - name: Setup Go Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -111,6 +100,7 @@ jobs:
           git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genotelcorecol" and commit the changes in this PR.' && exit 1)
       - name: Multimod verify
         run: make multimod-verify
+
   unittest:
     strategy:
       matrix:
@@ -124,10 +114,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Setup Go Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -143,6 +129,7 @@ jobs:
           key: unittest-${{ runner.os }}-go-build-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
       - name: Run Unit Tests
         run: make gotest
+
   test-coverage:
     runs-on: ubuntu-latest
     needs: [setup-environment]
@@ -153,10 +140,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.17
-      - name: Setup Go Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -178,6 +161,7 @@ jobs:
           file: ./coverage.txt
           fail_ci_if_error: true
           verbose: true
+
   cross-build-collector:
     needs: [setup-environment]
     runs-on: ubuntu-latest
@@ -212,10 +196,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.17
-      - name: Setup Go Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3

.github/workflows/builder-integration-test.yaml

@@ -23,16 +23,13 @@ on:
 jobs:
   integration-test:
     name: Integration test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-
-    - name: Set up Go
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
-    - name: Test
-      run: cd ./cmd/builder && ./test/test.sh
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.17
+      - name: Test
+        run: cd ./cmd/builder && ./test/test.sh

.github/workflows/builder-release.yaml

@@ -7,20 +7,17 @@ on:
 
 jobs:
   goreleaser:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout Repo
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      -
-        name: Set up Go
+      - name: Setup Go
         uses: actions/setup-go@v3
         with:
           go-version: 1.17
-      -
-        name: Run GoReleaser
+      - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           distribution: goreleaser-pro

.github/workflows/contrib-tests.yml

@@ -9,13 +9,13 @@ on:
 jobs:
   contrib_tests:
     runs-on: ubuntu-latest
-    container:
-      image: cimg/go:1.17
     steps:
-      - name: Setup Permissions
-        run: sudo chmod -R 777 $GITHUB_WORKSPACE /github /__w/_temp
       - name: Checkout Repo
         uses: actions/checkout@v3
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.17
       - name: Run Contrib Tests
         run: |
           contrib_path=/tmp/opentelemetry-collector-contrib

CHANGELOG.md

@@ -4,16 +4,44 @@
 
 ### 🛑 Breaking changes 🛑
 
+- Remove `configunmarshaler.Unmarshaler` interface, per deprecation comment )#5348)
+- Remove deprecated pdata funcs/structs from v0.50.0 (#5345)
+- Remove derecated featuregate funcs/structs from v0.50.0 (#5346)
+
+### 🚩 Deprecations 🚩
+
+### 💡 Enhancements 💡
+
+- Update OTLP to v0.17.0 (#5335)
+
+### 🧰 Bug fixes 🧰
+
+## v0.51.0 Beta
+
+### 🛑 Breaking changes 🛑
+
 - Remove deprecated model module, everything is available in `pdata` and `semconv`. (#5281)
   - Old versions of the module are still available, but no new versions will be released.
 - Remove deprecated LogRecord.Name field. (#5202)
 
 ### 🚩 Deprecations 🚩
 
+- In preparation of migration to immutable slices for primitive type items, the following methods are renamed (#5344)
+  - `Value.BytesVal` func is deprecated in favor of `Value.MBytesVal`.
+  - `Value.SetBytesVal` func is deprecated in favor of `Value.SetMBytesVal`.
+  - `Value.UpdateBytes` func is deprecated in favor of `Value.UpdateMBytes`.
+  - `Value.InsertBytes` func is deprecated in favor of `Value.InsertMBytes`.
+  - `Value.UpsertBytes` func is deprecated in favor of `Value.UpsertMBytes`.
+  - `<HistogramDataPoint|Buckets>.BucketCounts` funcs are deprecated in favor of
+    `<HistogramDataPoint|Buckets>.MBucketCounts`.
+  - `<HistogramDataPoint|Buckets>.SetBucketCounts` funcs are deprecated in favor of
+    `<HistogramDataPoint|Buckets>.SetMBucketCounts`.
+  - `HistogramDataPoint.ExplicitBounds` func is deprecated in favor of `HistogramDataPoint.MExplicitBounds`.
+  - `HistogramDataPoint.SetExplicitBounds` func is deprecated in favor of `HistogramDataPoint.SetMExplicitBounds`.
+
 ### 💡 Enhancements 💡
 
-- `pdata`: Expose `pcommon.NewSliceFromRay` and `pcommon.Slice.AsRaw` functions (#5298)
-- Update OTLP to v0.17.0 (#5335)
+- `pdata`: Expose `pcommon.NewSliceFromRaw` and `pcommon.Slice.AsRaw` functions (#5311)
 
 ### 🧰 Bug fixes 🧰
 

Makefile

@@ -361,4 +361,5 @@ multimod-verify: install-tools
 
 .PHONY: multimod-prerelease
 multimod-prerelease: install-tools
-	multimod prerelease -v ./versions.yaml -m collector-base
+	multimod prerelease -v ./versions.yaml -m collector-core
+	$(MAKE) gotidy

cmd/builder/internal/builder/config.go

@@ -25,7 +25,7 @@ import (
 	"go.uber.org/zap"
 )
 
-const defaultOtelColVersion = "0.50.0"
+const defaultOtelColVersion = "0.51.0"
 
 // ErrInvalidGoMod indicates an invalid gomod
 var ErrInvalidGoMod = errors.New("invalid gomod specification for module")

cmd/otelcorecol/builder-config.yaml

@@ -2,29 +2,29 @@ dist:
   module: go.opentelemetry.io/collector/cmd/otelcorecol
   name: otelcorecol
   description: Local OpenTelemetry Collector binary, testing only.
-  version: 0.50.0-dev
-  otelcol_version: 0.50.0
+  version: 0.51.0-dev
+  otelcol_version: 0.51.0
 
 receivers:
   - import: go.opentelemetry.io/collector/receiver/otlpreceiver
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
 exporters:
   - import: go.opentelemetry.io/collector/exporter/loggingexporter
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
   - import: go.opentelemetry.io/collector/exporter/otlpexporter
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
   - import: go.opentelemetry.io/collector/exporter/otlphttpexporter
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
 extensions:
   - import: go.opentelemetry.io/collector/extension/ballastextension
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
   - import: go.opentelemetry.io/collector/extension/zpagesextension
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
 processors:
   - import: go.opentelemetry.io/collector/processor/batchprocessor
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
   - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
-    gomod: go.opentelemetry.io/collector v0.50.0
+    gomod: go.opentelemetry.io/collector v0.51.0
 
 replaces:
   - go.opentelemetry.io/collector => ../../

cmd/otelcorecol/go.mod

@@ -6,7 +6,7 @@ go 1.17
 
 require (
 	github.com/stretchr/testify v1.7.1
-	go.opentelemetry.io/collector v0.50.0
+	go.opentelemetry.io/collector v0.51.0
 	golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
 )
 
@@ -55,8 +55,8 @@ require (
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/collector/pdata v0.50.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.50.0 // indirect
+	go.opentelemetry.io/collector/pdata v0.51.0 // indirect
+	go.opentelemetry.io/collector/semconv v0.51.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 // indirect
 	go.opentelemetry.io/contrib/zpages v0.32.0 // indirect

config/configtelemetry/configtelemetry.go

@@ -56,30 +56,26 @@ func (l Level) String() string {
 	return "unknown"
 }
 
-// UnmarshalText unmarshals text to a Level.
+// UnmarshalText unmarshalls text to a Level.
 func (l *Level) UnmarshalText(text []byte) error {
 	if l == nil {
 		return fmt.Errorf("cannot unmarshal to a nil *Level")
 	}
-	var err error
-	*l, err = parseLevel(string(text))
-	return err
-}
-
-// parseLevel returns the Level represented by the string. The parsing is case-insensitive
-// and it returns error if the string value is unknown.
-func parseLevel(str string) (Level, error) {
-	str = strings.ToLower(str)
 
+	str := strings.ToLower(string(text))
 	switch str {
 	case levelNoneStr:
-		return LevelNone, nil
+		*l = LevelNone
+		return nil
 	case levelBasicStr:
-		return LevelBasic, nil
+		*l = LevelBasic
+		return nil
 	case levelNormalStr:
-		return LevelNormal, nil
+		*l = LevelNormal
+		return nil
 	case levelDetailedStr:
-		return LevelDetailed, nil
+		*l = LevelDetailed
+		return nil
 	}
-	return LevelNone, fmt.Errorf("unknown metrics level %q", str)
+	return fmt.Errorf("unknown metrics level %q", str)
 }

config/configtelemetry/configtelemetry_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestParseFrom(t *testing.T) {
+func TestUnmarshalText(t *testing.T) {
 	tests := []struct {
 		str   string
 		level Level
@@ -56,17 +56,23 @@ func TestParseFrom(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.str, func(t *testing.T) {
-			lvl, err := parseLevel(test.str)
+			var lvl Level
+			err := lvl.UnmarshalText([]byte(test.str))
 			if test.err {
 				assert.Error(t, err)
 			} else {
 				assert.NoError(t, err)
+				assert.Equal(t, test.level, lvl)
 			}
-			assert.Equal(t, test.level, lvl)
 		})
 	}
 }
 
+func TestUnmarshalTextNilLevel(t *testing.T) {
+	lvl := (*Level)(nil)
+	assert.Error(t, lvl.UnmarshalText([]byte(levelNormalStr)))
+}
+
 func TestLevelString(t *testing.T) {
 	tests := []struct {
 		str   string