Merge branch 'main' into spidercensus/fix-googlecloudspanner

.chloggen/k8sclusterreceiver-opencensus.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: k8sclusterreceiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Remove opencensus.resourcetype resource attribute"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [26487]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: OpenTelemetry Collector Slack Channel
-    url: https://cloud-native.slack.com/archives/C01N6P7KR6W
+  - name: Stack Overflow
+    url: https://stackoverflow.com/questions/tagged/open-telemetry-collector
     about: Please ask and answer questions here.

.github/workflows/build-and-test-windows.yml

@@ -44,7 +44,7 @@ jobs:
         run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-mod-cache

.github/workflows/build-and-test.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -141,7 +141,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -164,7 +164,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -224,7 +224,7 @@ jobs:
   unittest-matrix:
     strategy:
       matrix:
-        go-version: ["~1.21.1", "~1.20.8"] # 1.20 is interpreted as 1.2 without quotes
+        go-version: ["~1.21.3", "~1.20.10"] # 1.20 is interpreted as 1.2 without quotes
         group:
           - receiver-0
           - receiver-1
@@ -316,7 +316,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -337,7 +337,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -363,7 +363,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -432,7 +432,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -566,7 +566,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Mkdir bin and dist
         run: |

.github/workflows/changelog.yml

@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache

.github/workflows/codeql-analysis.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
 
       # Initializes the CodeQL tools for scanning.

.github/workflows/create-dependabot-pr.yml

@@ -12,7 +12,7 @@ jobs:
         run: sudo apt-get update; sudo apt-get install zsh
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Run dependabot-pr.sh
         run: ./.github/workflows/scripts/dependabot-pr.sh

.github/workflows/e2e-tests.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -103,3 +103,7 @@ jobs:
         run: |
           cd receiver/kubeletstatsreceiver
           go test -v --tags=e2e
+      - name: run receiver/k8sobjectsreceiver e2e tests
+        run: |
+          cd receiver/k8sobjectsreceiver
+          go test -v --tags=e2e

.github/workflows/load-tests.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache

.github/workflows/prepare-release.yml

@@ -26,7 +26,7 @@ jobs:
           path: opentelemetry-collector-contrib
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Prepare release for contrib
         working-directory: opentelemetry-collector-contrib

.github/workflows/prometheus-compliance-tests.yml

@@ -26,7 +26,7 @@ jobs:
           path: opentelemetry-collector-contrib
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache

.github/workflows/tidy-dependencies.yml

@@ -26,7 +26,7 @@ jobs:
           token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
       - uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.8
+          go-version: ~1.20.10
           cache: false
       - name: Cache Go
         id: go-cache

receiver/k8sclusterreceiver/documentation.md

@@ -438,6 +438,5 @@ Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4
 | k8s.resourcequota.uid | The k8s resourcequota uid. | Any Str | true |
 | k8s.statefulset.name | The k8s statefulset name. | Any Str | true |
 | k8s.statefulset.uid | The k8s statefulset uid. | Any Str | true |
-| opencensus.resourcetype | The OpenCensus resource type. | Any Str | false |
 | openshift.clusterquota.name | The k8s ClusterResourceQuota name. | Any Str | true |
 | openshift.clusterquota.uid | The k8s ClusterResourceQuota uid. | Any Str | true |

receiver/k8sclusterreceiver/internal/clusterresourcequota/clusterresourcequotas.go

@@ -40,7 +40,6 @@ func RecordMetrics(mb *metadata.MetricsBuilder, crq *quotav1.ClusterResourceQuot
 	rb := mb.NewResourceBuilder()
 	rb.SetOpenshiftClusterquotaName(crq.Name)
 	rb.SetOpenshiftClusterquotaUID(string(crq.UID))
-	rb.SetOpencensusResourcetype("k8s")
 	mb.EmitForResource(metadata.WithResource(rb.Emit()))
 }
 

receiver/k8sclusterreceiver/internal/container/containers.go

@@ -77,7 +77,6 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev
 	rb.SetK8sPodName(pod.Name)
 	rb.SetK8sNodeName(pod.Spec.NodeName)
 	rb.SetK8sNamespaceName(pod.Namespace)
-	rb.SetOpencensusResourcetype("container")
 	rb.SetContainerID(utils.StripContainerID(containerID))
 	rb.SetK8sContainerName(c.Name)
 	image, err := docker.ParseImageName(imageStr)

receiver/k8sclusterreceiver/internal/cronjob/cronjobs.go

@@ -25,7 +25,6 @@ func RecordMetrics(mb *metadata.MetricsBuilder, cj *batchv1.CronJob, ts pcommon.
 	rb.SetK8sNamespaceName(cj.Namespace)
 	rb.SetK8sCronjobUID(string(cj.UID))
 	rb.SetK8sCronjobName(cj.Name)
-	rb.SetOpencensusResourcetype("k8s")
 	mb.EmitForResource(metadata.WithResource(rb.Emit()))
 }
 

receiver/k8sclusterreceiver/internal/demonset/daemonsets.go

@@ -36,7 +36,6 @@ func RecordMetrics(mb *metadata.MetricsBuilder, ds *appsv1.DaemonSet, ts pcommon
 	rb.SetK8sNamespaceName(ds.Namespace)
 	rb.SetK8sDaemonsetName(ds.Name)
 	rb.SetK8sDaemonsetUID(string(ds.UID))
-	rb.SetOpencensusResourcetype("k8s")
 	mb.EmitForResource(metadata.WithResource(rb.Emit()))
 }
 

receiver/k8sclusterreceiver/internal/deployment/deployments.go

@@ -35,7 +35,6 @@ func RecordMetrics(mb *imetadata.MetricsBuilder, dep *appsv1.Deployment, ts pcom
 	rb.SetK8sDeploymentName(dep.Name)
 	rb.SetK8sDeploymentUID(string(dep.UID))
 	rb.SetK8sNamespaceName(dep.Namespace)
-	rb.SetOpencensusResourcetype("k8s")
 	mb.EmitForResource(metadata.WithResource(rb.Emit()))
 }
 

receiver/k8sclusterreceiver/internal/jobs/jobs.go

@@ -28,7 +28,6 @@ func RecordMetrics(mb *metadata.MetricsBuilder, j *batchv1.Job, ts pcommon.Times
 	rb.SetK8sNamespaceName(j.Namespace)
 	rb.SetK8sJobName(j.Name)
 	rb.SetK8sJobUID(string(j.UID))
-	rb.SetOpencensusResourcetype("k8s")
 	mb.EmitForResource(metadata.WithResource(rb.Emit()))
 }