Merge pull request #2273 from aws-observability/updateCollector83

[chore] update upstream collector versions
aws-observability · Aug 15, 2023 · e407809 · e407809
2 parents fce60bd + 54c557d
commit e407809
Show file tree

Hide file tree

Showing 644 changed files with 14,645 additions and 9,372 deletions.
diff --git a/Makefile b/Makefile
@@ -199,7 +199,6 @@ golint: lint-static-check
 gomod-tidy:
 	@$(MAKE) for-all-target TARGET="mod-tidy"
 
-
 .PHONY: gomod-vendor
 gomod-vendor:
 	go mod vendor

diff --git a/Makefile.Common b/Makefile.Common
@@ -32,3 +32,4 @@ lint:
 .PHONY: mod-tidy
 mod-tidy:
 	go mod tidy
+
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/patches/kafkaSASLValidationPanicFix.patch b/patches/kafkaSASLValidationPanicFix.patch
diff --git a/patches/statsDfeatGateInstrumentationScope.patch b/patches/statsDfeatGateInstrumentationScope.patch
@@ -4,10 +4,10 @@ Date:   Tue Jul 25 17:33:22 2023 -0700
 
     Add feature gate for instrumentation scope in statsd receiver
 
-diff --git a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol/statsd_parser.go b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol/statsd_parser.go
+diff --git a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/internal/protocol/statsd_parser.go b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/internal/protocol/statsd_parser.go
 index 1cfec5cf..699d6ee7 100644
---- a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol/statsd_parser.go
-+++ b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol/statsd_parser.go
+--- a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/internal/protocol/statsd_parser.go
++++ b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/internal/protocol/statsd_parser.go
 @@ -14,6 +14,7 @@ import (
  	"github.com/lightstep/go-expohisto/structure"
  	"go.opentelemetry.io/collector/client"

diff --git a/testbed/go.mod b/testbed/go.mod
diff --git a/testbed/go.sum b/testbed/go.sum
diff --git a/vendor/cloud.google.com/go/compute/internal/version.go b/vendor/cloud.google.com/go/compute/internal/version.go
diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go
diff --git a/vendor/github.com/DataDog/datadog-agent/pkg/proto/LICENSE b/vendor/github.com/DataDog/datadog-agent/pkg/proto/LICENSE