Skip to content

Commit

Permalink
bump Go to 1.21. bump to otel 0.100.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenruizdegauna committed May 15, 2024
1 parent 8429447 commit 19d993e
Show file tree
Hide file tree
Showing 40 changed files with 1,992 additions and 1,510 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
unittest-matrix:
strategy:
matrix:
go-version: ["1.20"]
go-version: ["1.21"]
group:
- receiver
- processor
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
327 changes: 169 additions & 158 deletions cmd/nrotelcomponents/go.mod

Large diffs are not rendered by default.

845 changes: 434 additions & 411 deletions cmd/nrotelcomponents/go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions connector/apmconnector/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ Apdex value

| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
| ---- | ----------- | ---------- | ----------------------- | --------- |
| 1 | Sum | Double | Delta | false |
| 1 | Sum | Double | Unspecified | false |

### apm.service.error.count

Number of transaction errors

| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
| ---- | ----------- | ---------- | ----------------------- | --------- |
| 1 | Sum | Double | Delta | false |
| 1 | Sum | Double | Unspecified | false |

### apm.service.transaction.duration

Duration of the transaction

| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
| ---- | ----------- | ---------- | ----------------------- | --------- |
| s | Sum | Double | Delta | false |
| s | Sum | Double | Unspecified | false |
4 changes: 3 additions & 1 deletion connector/apmconnector/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/connector"
"go.opentelemetry.io/collector/consumer"

"github.com/newrelic/opentelemetry-collector-components/connector/apmconnector/internal/metadata"
)

// FIXME copying this from the metadata/generated_status to be able to build the component externally
Expand All @@ -23,7 +25,7 @@ const (
// NewFactory returns a ConnectorFactory.
func NewFactory() connector.Factory {
return connector.NewFactory(
Type,
metadata.Type,
createDefaultConfig,
connector.WithTracesToMetrics(createTracesToMetrics, TracesToMetricsStability),
connector.WithMetricsToMetrics(createMetricsToMetrics, MetricsToMetricsStability),
Expand Down
79 changes: 79 additions & 0 deletions connector/apmconnector/generated_component_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions connector/apmconnector/generated_package_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 39 additions & 26 deletions connector/apmconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,44 +1,57 @@
module github.com/newrelic/opentelemetry-collector-components/connector/apmconnector

go 1.20
go 1.21

require (
github.com/google/go-cmp v0.5.9
github.com/google/go-cmp v0.6.0
github.com/lightstep/go-expohisto v1.0.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.83.0
go.opentelemetry.io/collector/confmap v0.83.0
go.opentelemetry.io/collector/connector v0.82.0
go.opentelemetry.io/collector/consumer v0.83.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014
go.opentelemetry.io/collector/receiver v0.83.0
go.uber.org/zap v1.25.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/connector 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/davecgh/go-spew v1.1.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // 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.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // 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
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // 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
github.com/rogpeppe/go-internal v1.11.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.14.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.57.0 // 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
)
Loading

0 comments on commit 19d993e

Please sign in to comment.