Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Renamed ApplicationStartInfo and its components #6

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Renamed ApplicationStartInfo and its components #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16ab20f
renamed ApplicationStartInfo to BuildInfo
dhruv-vora May 3, 2021
beaa3d7
Merge branch 'main' into update-user-agent-header
dhruv-vora May 10, 2021
b2a5dee
restore go.mod and go.sum
dhruv-vora May 10, 2021
4848cc7
updated upstream collector version to 0.26.0
dhruv-vora May 11, 2021
aeb7db6
updated version of all components of Collector-Contrib
dhruv-vora May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions cmd/awscollector/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,16 @@ func main() {
setCollectorConfigFromExtraCfg(extraConfig)
}

info := component.ApplicationStartInfo{
ExeName: "aws-otel-collector",
LongName: "AWS OTel Collector",
Version: version.Version,
GitHash: version.GitHash,
info := component.BuildInfo{
Command: "aws-otel-collector",
Description: "AWS OTel Collector",
Version: version.Version,
}

params := service.Parameters{
Factories: factories,
ApplicationStartInfo: info,
ParserProvider: cfgFactory,
Factories: factories,
BuildInfo: info,
ParserProvider: cfgFactory,
}
if lumberHook != nil {
params.LoggingOptions = []zap.Option{zap.Hooks(lumberHook)}
Expand Down
46 changes: 23 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,41 @@ go 1.14

require (
github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/newrelicexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/newrelicexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.26.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.26.0
github.com/opencontainers/runc v1.0.0-rc93
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.25.0
go.opentelemetry.io/collector v0.26.0
go.uber.org/zap v1.16.0
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.25.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.26.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.25.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.26.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.25.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.26.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.25.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.26.0

replace github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents => ./pkg/lambdacomponents

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.25.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.26.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.25.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.26.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.25.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.26.0
Loading