bump Go to 1.21. bump to otel 0.100.0

newrelic · May 15, 2024 · 970c5b9 · 970c5b9
1 parent 8429447
commit 970c5b9
Show file tree

Hide file tree

Showing 24 changed files with 1,451 additions and 1,302 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version:  "1.20"
+          go-version:  "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -106,7 +106,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -146,7 +146,7 @@ jobs:
   unittest-matrix:
       strategy:
         matrix:
-          go-version: ["1.20"]
+          go-version: ["1.21"]
           group:
             - receiver
             - processor
@@ -189,7 +189,7 @@ jobs:
     if: ${{ always() }}
     strategy:
       matrix:
-        go-version: ["1.20"]
+        go-version: ["1.21"]
     runs-on: ubuntu-latest
     needs: [setup-environment, unittest-matrix]
     steps:
@@ -230,7 +230,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20
+          go-version: ~1.21
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

diff --git a/Makefile.Common b/Makefile.Common
@@ -127,7 +127,7 @@ lint: checklicense misspell ## Performs checklicense, misspell and golangci-lint
 .PHONY: tidy
 tidy: ## Updates Go dependencies for the current module.
 	rm -fr go.sum
-	$(GOCMD) mod tidy -compat=1.20
+	$(GOCMD) mod tidy -compat=1.21
 
 .PHONY: misspell
 misspell: ## Checks spelling mistakes with misspell.

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Before writing any code, check the [development guides](./DEVELOPMENT.md) and op
 
 ### Requirements
 
-* Go 1.20.0+
+* Go 1.21.0+
 * GNU Make
 * git
 

diff --git a/cmd/nrotelcomponents/go.mod b/cmd/nrotelcomponents/go.mod
diff --git a/cmd/nrotelcomponents/go.sum b/cmd/nrotelcomponents/go.sum
diff --git a/examples/newrelicapm/Dockerfile b/examples/newrelicapm/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /build
 

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/common/go.mod b/internal/common/go.mod
@@ -1,6 +1,6 @@
 module github.com/newrelic/opentelemetry-collector-components/internal/common
 
-go 1.20
+go 1.21
 
 require github.com/stretchr/testify v1.8.2
 

diff --git a/internal/otelcomponents/main.go b/internal/otelcomponents/main.go
@@ -15,18 +15,13 @@ import (
 type ComponentsFunc func() (otelcol.Factories, error)
 
 func RunWithComponents(componentsFunc ComponentsFunc) {
-	factories, err := componentsFunc()
-	if err != nil {
-		log.Fatalf("failed to build components: %v", err)
-	}
-
 	info := component.BuildInfo{
 		Command:     "otelcomponents",
 		Description: "New Relic OpenTelemetry Collector Components",
 		Version:     version.Version,
 	}
 
-	if err = run(otelcol.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil {
+	if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: componentsFunc}); err != nil {
 		log.Fatal(err)
 	}
 }

diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/newrelic/opentelemetry-collector-components/internal/tools
 
-go 1.20
+go 1.21
 
 require (
 	github.com/client9/misspell v0.3.4

diff --git a/receiver/nopreceiver/documentation.md b/receiver/nopreceiver/documentation.md
@@ -18,7 +18,7 @@ Total number of hello requests since it started
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
 | ---- | ----------- | ---------- | ----------------------- | --------- |
-| requests | Sum | Int | Cumulative | true |
+| requests | Sum | Int | Unspecified | true |
 
 #### Attributes
 

diff --git a/receiver/nopreceiver/factory.go b/receiver/nopreceiver/factory.go
@@ -11,22 +11,23 @@ import (
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/scraperhelper"
+
+	"github.com/newrelic/opentelemetry-collector-components/receiver/nopreceiver/internal/metadata"
 )
 
 const (
-	typeStr   = "nop_stats"
 	stability = component.StabilityLevelDevelopment
 )
 
 func NewFactory() receiver.Factory {
 	return receiver.NewFactory(
-		typeStr,
+		metadata.Type,
 		createDefaultConfig,
 		receiver.WithMetrics(createMetricsReceiver, stability))
 }
 
 func createDefaultConfig() component.Config {
-	return &scraperhelper.ScraperControllerSettings{
+	return &scraperhelper.ControllerConfig{
 		CollectionInterval: 10 * time.Second,
 	}
 }
@@ -37,7 +38,7 @@ func createMetricsReceiver(
 	config component.Config,
 	consumer consumer.Metrics,
 ) (receiver.Metrics, error) {
-	scConf := config.(*scraperhelper.ScraperControllerSettings)
+	scConf := config.(*scraperhelper.ControllerConfig)
 	dsr, err := newReceiver(*scConf, params, consumer)
 	if err != nil {
 		return nil, err

diff --git a/receiver/nopreceiver/generated_component_test.go b/receiver/nopreceiver/generated_component_test.go
diff --git a/receiver/nopreceiver/generated_package_test.go b/receiver/nopreceiver/generated_package_test.go
diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod
@@ -1,47 +1,54 @@
 module github.com/newrelic/opentelemetry-collector-components/receiver/nopreceiver
 
-go 1.20
+go 1.21
 
 require (
-	github.com/google/go-cmp v0.5.9
-	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/collector/component v0.82.0
-	go.opentelemetry.io/collector/confmap v0.82.0
-	go.opentelemetry.io/collector/consumer v0.82.0
-	go.opentelemetry.io/collector/pdata v1.0.0-rcv0014
-	go.opentelemetry.io/collector/receiver v0.82.0
-	go.uber.org/zap v1.24.0
+	github.com/google/go-cmp v0.6.0
+	github.com/stretchr/testify v1.9.0
+	go.opentelemetry.io/collector/component v0.100.0
+	go.opentelemetry.io/collector/confmap v0.100.0
+	go.opentelemetry.io/collector/consumer v0.100.0
+	go.opentelemetry.io/collector/pdata v1.7.0
+	go.opentelemetry.io/collector/receiver v0.100.0
+	go.uber.org/goleak v1.3.0
+	go.uber.org/zap v1.27.0
 )
 
 require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf v1.5.0 // indirect
-	github.com/knadh/koanf/v2 v2.0.1 // indirect
+	github.com/knadh/koanf/v2 v2.1.1 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector v0.82.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.82.0 // indirect
-	go.opentelemetry.io/collector/exporter v0.82.0 // indirect
-	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect
-	go.opentelemetry.io/collector/processor v0.82.0 // indirect
-	go.opentelemetry.io/otel v1.16.0 // indirect
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/otel/trace v1.16.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	github.com/prometheus/client_golang v1.19.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.53.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	go.opentelemetry.io/collector v0.100.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.100.0 // indirect
+	go.opentelemetry.io/otel v1.26.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
+	go.opentelemetry.io/otel/metric v1.26.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.26.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
+	go.opentelemetry.io/otel/trace v1.26.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/grpc v1.56.2 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
+	google.golang.org/grpc v1.64.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )