Fix Compile Issues

Fix Compile Export Test Only Need To Unit Test 1.22.2 Add workflow_dispatch To build-and-test.yml Add isWindowsHostProcessContainer To Kubelet To Fix Unit Test: Add isWindowsHostProcessContainer To Clientset To Fix Unit Test Fix Prometheus Integ Test: Fix awscloudwatchlogsexporter Unit Test Fix resourcetotelemetry Unit Tests Fix translator Unit Tests Fix gpu unit tests Add Scrape Protocalls To TestSimplePrometheusEndToEnd Fix awsmiddleware Unit Tests Make FMT Add IsWindowsHostProcessContainer Back
amazon-contributing · Apr 23, 2024 · 6160744 · 6160744
1 parent f1740ab
commit 6160744
Show file tree

Hide file tree

Showing 72 changed files with 2,648 additions and 1,010 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -96,9 +96,7 @@ extension/encoding/textencodingextension/ @open-te
 extension/encoding/zipkinencodingextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @dao-jun
 extension/headerssetterextension/ @open-telemetry/collector-contrib-approvers @jpkrohling
 extension/healthcheckextension/ @open-telemetry/collector-contrib-approvers @jpkrohling
-extension/httpforwarder/ @open-telemetry/collector-contrib-approvers @atoulme @rmfitzpatrick
 extension/jaegerremotesampling/ @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
-extension/jaegerremotesampling/internal/jaegerremotesamplingdeprecated/ @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
 extension/oauth2clientauthextension/ @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
 extension/observer/ @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
 extension/observer/dockerobserver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,5 +1,6 @@
 name: build-and-test
 on:
+ workflow_dispatch:
  push:
  branches: [ main ]
  tags:
@@ -63,6 +64,7 @@ jobs:
  run: ./.github/workflows/scripts/check-codeowners.sh check_entries_in_allowlist
  lint-matrix:
  strategy:
+ fail-fast: false
  matrix:
  test:
  - windows
@@ -241,9 +243,10 @@ jobs:
  git diff --exit-code '.github/ISSUE_TEMPLATE' || (echo 'Dropdowns in issue templates are out of date, please run "make generate-gh-issue-templates" and commit the changes in this PR.' && exit 1)
  unittest-matrix:
  strategy:
+ fail-fast: false
  matrix:
- go-version: ["1.22.2", "1.21.9"] # 1.20 is interpreted as 1.2 without quotes
- runner: [ubuntu-latest, actuated-arm64-4cpu-4gb]
+ go-version: ["1.22.2"] # 1.20 is interpreted as 1.2 without quotes
+ runner: [ubuntu-latest]
  group:
  - receiver-0
  - receiver-1
@@ -343,6 +346,7 @@ jobs:
 
  integration-tests-matrix:
  strategy:
+ fail-fast: false
  matrix:
  group:
  - receiver-0

diff --git a/Makefile b/Makefile
@@ -20,8 +20,6 @@ EX_INTERNAL=-not -path "./internal/*"
 EX_PKG=-not -path "./pkg/*"
 EX_CMD=-not -path "./cmd/*"
 EX_OVERRIDE=-not -path "./override/*"
-# Exclude patches from linting
-EX_PATCH=-not -path "./config/*"
 
 # NONROOT_MODS includes ./* dirs (excludes . dir)
 NONROOT_MODS := $(shell find . $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
@@ -43,7 +41,6 @@ CMD_MODS_0 := $(shell find ./cmd/[a-m]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
 CMD_MODS_1 := $(shell find ./cmd/[n-z]* $(FIND_MOD_ARGS) -not -path "./cmd/otelcontribcol/*" -exec $(TO_MOD_DIR) )
 CMD_MODS := $(CMD_MODS_0) $(CMD_MODS_1)
 OVERRIDE_MODS := $(shell find ./override/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
-PATCH_MODS := $(shell find ./config/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
 OTHER_MODS := $(shell find . $(EX_COMPONENTS) $(EX_INTERNAL) $(EX_PKG) $(EX_CMD) $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) $(PWD)
 ALL_MODS := $(RECEIVER_MODS) $(PROCESSOR_MODS) $(EXPORTER_MODS) $(EXTENSION_MODS) $(CONNECTOR_MODS) $(INTERNAL_MODS) $(PKG_MODS) $(CMD_MODS) $(OTHER_MODS)
 

diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -2,12 +2,14 @@
 // See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
 module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschema
 
-go 1.21
+go 1.22.0
+
+toolchain go1.22.2
 
 require (
  github.com/fatih/structtag v1.2.0
  github.com/google/uuid v1.6.0
- github.com/open-telemetry/opentelemetry-collector-contrib v0.98.0
+ github.com/open-telemetry/opentelemetry-collector-contrib v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.98.0
  github.com/stretchr/testify v1.9.0
  go.opentelemetry.io/collector/component v0.98.0
@@ -245,7 +247,7 @@ require (
  github.com/IBM/sarama v1.43.1 // indirect
  github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
  github.com/Microsoft/go-winio v0.6.1 // indirect
- github.com/Microsoft/hcsshim v0.11.4 // indirect
+ github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
  github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
  github.com/SAP/go-hdb v1.8.12 // indirect
  github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect
@@ -254,6 +256,8 @@ require (
  github.com/alecthomas/participle/v2 v2.1.1 // indirect
  github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
  github.com/aliyun/aliyun-log-go-sdk v0.1.72 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240419190856-2f880467f335 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240415183253-230331014d2c // indirect
  github.com/andybalholm/brotli v1.1.0 // indirect
  github.com/apache/arrow/go/v15 v15.0.0 // indirect
  github.com/apache/pulsar-client-go v0.8.1 // indirect
@@ -271,13 +275,13 @@ require (
  github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
  github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
  github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
- github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.4 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.36 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.4 // indirect
  github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.4 // indirect
- github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect
+ github.com/aws/aws-sdk-go-v2/service/s3 v1.40.0 // indirect
  github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.5 // indirect
  github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
  github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
@@ -298,7 +302,7 @@ require (
  github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect
  github.com/containerd/cgroups/v3 v3.0.3 // indirect
  github.com/containerd/console v1.0.3 // indirect
- github.com/containerd/containerd v1.7.7 // indirect
+ github.com/containerd/errdefs v0.1.0 // indirect
  github.com/containerd/ttrpc v1.2.2 // indirect
  github.com/coreos/go-oidc/v3 v3.10.0 // indirect
  github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -366,7 +370,7 @@ require (
  github.com/golang/mock v1.6.0 // indirect
  github.com/golang/protobuf v1.5.4 // indirect
  github.com/golang/snappy v0.0.4 // indirect
- github.com/google/cadvisor v0.49.1 // indirect
+ github.com/google/cadvisor v0.49.0 // indirect
  github.com/google/flatbuffers v23.5.26+incompatible // indirect
  github.com/google/gnostic-models v0.6.8 // indirect
  github.com/google/go-cmp v0.6.0 // indirect
@@ -425,7 +429,7 @@ require (
  github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
  github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
  github.com/jcmturner/rpc/v2 v2.0.3 // indirect
- github.com/jellydator/ttlcache/v3 v3.1.0 // indirect
+ github.com/jellydator/ttlcache/v3 v3.2.0 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/jpillora/backoff v1.0.0 // indirect
@@ -542,7 +546,7 @@ require (
  github.com/opencontainers/go-digest v1.0.0 // indirect
  github.com/opencontainers/image-spec v1.1.0 // indirect
  github.com/opencontainers/runc v1.1.12 // indirect
- github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
+ github.com/opencontainers/runtime-spec v1.1.0 // indirect
  github.com/opencontainers/selinux v1.11.0 // indirect
  github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
  github.com/openshift/api v3.9.0+incompatible // indirect
@@ -611,7 +615,7 @@ require (
  github.com/valyala/fastjson v1.6.4 // indirect
  github.com/vincent-petithory/dataurl v1.0.0 // indirect
  github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
- github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
+ github.com/vishvananda/netns v0.0.4 // indirect
  github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e // indirect
  github.com/vmware/govmomi v0.36.3 // indirect
  github.com/vultr/govultr/v2 v2.17.2 // indirect
@@ -707,12 +711,12 @@ require (
  gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
  gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
- k8s.io/api v0.29.3 // indirect
- k8s.io/apimachinery v0.29.3 // indirect
- k8s.io/client-go v0.29.3 // indirect
+ k8s.io/api v0.30.0 // indirect
+ k8s.io/apimachinery v0.30.0 // indirect
+ k8s.io/client-go v0.30.0 // indirect
  k8s.io/klog/v2 v2.120.1 // indirect
- k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
- k8s.io/kubelet v0.29.3 // indirect
+ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+ k8s.io/kubelet v0.30.0 // indirect
  k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
  sigs.k8s.io/controller-runtime v0.17.3 // indirect
  sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect