Skip to content

Commit

Permalink
Merge branch 'main' into docs/reslice
Browse files Browse the repository at this point in the history
  • Loading branch information
kruskall authored Feb 15, 2024
2 parents b1d45ab + 11660c8 commit 4924888
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 103 deletions.
20 changes: 19 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
version: 2
updates:

# Go dependencies
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"
groups:
otel:
patterns:
- "go.opentelemetry.io/*"
jaeger:
patterns:
- "github.com/jaegertracing/jaeger"
- "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
golang.org/x/:
patterns:
- "golang.org/x/*"
go-agent:
patterns:
- "go.elastic.co/apm*"
# GitHub actions
- package-ecosystem: "github-actions"
directory: "/"
Expand Down
9 changes: 0 additions & 9 deletions .github/renovate.json

This file was deleted.

54 changes: 25 additions & 29 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,53 @@ go 1.21

require (
github.com/google/go-cmp v0.6.0
github.com/jaegertracing/jaeger v1.40.0
github.com/jaegertracing/jaeger v1.54.0
github.com/json-iterator/go v1.1.12
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.94.0
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
github.com/xeipuuv/gojsonschema v1.2.0
go.elastic.co/apm/v2 v2.4.5
go.elastic.co/apm/v2 v2.4.8
go.elastic.co/fastjson v1.3.0
go.opentelemetry.io/collector/consumer v0.87.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0016
go.opentelemetry.io/collector/semconv v0.87.0
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/metric v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
go.opentelemetry.io/collector/consumer v0.94.1
go.opentelemetry.io/collector/pdata v1.1.0
go.opentelemetry.io/collector/semconv v0.94.1
go.opentelemetry.io/otel v1.23.1
go.opentelemetry.io/otel/metric v1.23.1
go.opentelemetry.io/otel/sdk v1.23.1
go.opentelemetry.io/otel/sdk/metric v1.23.1
go.opentelemetry.io/otel/trace v1.23.1
go.uber.org/zap v1.26.0
golang.org/x/sync v0.4.0
golang.org/x/tools v0.14.0
google.golang.org/grpc v1.58.3
google.golang.org/protobuf v1.31.0
golang.org/x/sync v0.6.0
golang.org/x/tools v0.18.0
google.golang.org/grpc v1.61.1
google.golang.org/protobuf v1.32.0
)

require (
github.com/apache/thrift v0.19.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/elastic/go-sysinfo v1.7.1 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.94.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.0 // indirect
)
Loading

0 comments on commit 4924888

Please sign in to comment.