Merge branch 'main' into release_skywalking_encoding

JaredTan95 · web-flow · commit c211f78c64d0 · 2025-08-05T14:09:05.000+08:00
diff --git a/.chloggen/remove_opencensus.yaml b/.chloggen/remove_opencensus.yaml
@@ -0,0 +1,26 @@
+# 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. otlpreceiver)
+component: otelcol
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated opencensus exporter and receiver
+
+# One or more tracking issues or pull requests related to the change
+issues: [1056]
+
+# (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:
+
+# 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: []
+
diff --git a/.chloggen/remove_opencensus_contrib.yaml b/.chloggen/remove_opencensus_contrib.yaml
@@ -0,0 +1,26 @@
+# 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. otlpreceiver)
+component: otelcol-contrib
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated opencensus exporter and receiver
+
+# One or more tracking issues or pull requests related to the change
+issues: [1056]
+
+# (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:
+
+# 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: []
+
diff --git a/.chloggen/remove_opencensus_k8s.yaml b/.chloggen/remove_opencensus_k8s.yaml
@@ -0,0 +1,26 @@
+# 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. otlpreceiver)
+component: otelcol-k8s
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated opencensus exporter and receiver
+
+# One or more tracking issues or pull requests related to the change
+issues: [1056]
+
+# (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:
+
+# 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: []
+
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -10,6 +10,7 @@ on:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches:
       - main
+      - release/*
 
 env:
   # Make sure to exit early if cache segment download times out after 2 minutes.
diff --git a/.github/workflows/ci-builder.yaml b/.github/workflows/ci-builder.yaml
@@ -3,7 +3,9 @@ name: CI - Builder
 on:
   merge_group: 
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-contrib/**"
       - "cmd/**"
@@ -13,7 +15,9 @@ on:
       - "go.mod"
       - "go.sum"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-contrib/**"
       - "cmd/**"
diff --git a/.github/workflows/ci-goreleaser-contrib.yaml b/.github/workflows/ci-goreleaser-contrib.yaml
@@ -3,7 +3,9 @@ name: CI - Contrib - GoReleaser
 on:
   merge_group: 
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-contrib/**"
       - "cmd/**"
@@ -13,7 +15,9 @@ on:
       - "go.mod"
       - "go.sum"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-contrib/**"
       - "cmd/**"
diff --git a/.github/workflows/ci-goreleaser-core.yaml b/.github/workflows/ci-goreleaser-core.yaml
@@ -3,7 +3,9 @@ name: CI - Core - GoReleaser
 on:
   merge_group:
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol/**"
       - "cmd/**"
@@ -13,7 +15,9 @@ on:
       - "go.mod"
       - "go.sum"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol/**"
       - "cmd/**"
diff --git a/.github/workflows/ci-goreleaser-ebpf-profiler.yaml b/.github/workflows/ci-goreleaser-ebpf-profiler.yaml
@@ -3,7 +3,9 @@ name: CI - eBPF Profiler - GoReleaser
 on:
   merge_group:
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-ebpf-profiler/**"
       - "cmd/**"
@@ -13,7 +15,9 @@ on:
       - "go.mod"
       - "go.sum"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-ebpf-profiler/**"
       - "cmd/**"
diff --git a/.github/workflows/ci-goreleaser-k8s.yaml b/.github/workflows/ci-goreleaser-k8s.yaml
@@ -3,7 +3,9 @@ name: CI - k8s - GoReleaser
 on:
   merge_group: 
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-k8s/**"
       - "cmd/**"
@@ -13,7 +15,9 @@ on:
       - "go.mod"
       - "go.sum"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-k8s/**"
       - "cmd/**"
diff --git a/.github/workflows/ci-goreleaser-otlp.yaml b/.github/workflows/ci-goreleaser-otlp.yaml
@@ -3,7 +3,9 @@ name: CI - OTLP - GoReleaser
 on:
   merge_group: 
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-otlp/**"
       - "cmd/**"
@@ -13,7 +15,9 @@ on:
       - "go.mod"
       - "go.sum"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "distributions/otelcol-otlp/**"
       - "cmd/**"
diff --git a/.github/workflows/ci-opampsupervisor.yaml b/.github/workflows/ci-opampsupervisor.yaml
@@ -3,7 +3,9 @@ name: CI - OpAMP supervisor
 on:
   merge_group: 
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "cmd/**"
       - ".github/**"
@@ -12,7 +14,9 @@ on:
       - "go.mod"
       - "go.sum"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
     paths:
       - "cmd/**"
       - ".github/**"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,11 +1,15 @@
 name: CI - Binaries
 
 on:
-  merge_group: 
+  merge_group:
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
 
 jobs:
   build:
diff --git a/.github/workflows/regression-tests.yaml b/.github/workflows/regression-tests.yaml
@@ -3,7 +3,9 @@ name: Regression Tests
 on:
   merge_group:
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
 
 jobs:
   check-goreleaser:
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -1,10 +1,14 @@
 name: Shellcheck lint
 on:
-  merge_group: 
+  merge_group:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - release/*
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - release/*
 
 jobs:
   shellcheck:
diff --git a/distributions/README.md b/distributions/README.md
@@ -2,7 +2,7 @@
 
 Support for a distribution implies all the duties covered by the Approver and Maintainer role requirements. In addition, support means that the Collector SIG is the owner and maintainer of the binaries/images of the different Collector distributions and is responsible for the pipeline that produces those artifacts.
 
-The Collector SIG will support at least one distribution that is recommended for production which includes support for Prometheus, Jaeger, Zipkin, and OpenCensus.
+The Collector SIG will support at least one distribution that is recommended for production which includes support for Prometheus, Jaeger, and Zipkin.
 
 Distributions supported by the Collector SIG should fulfill the following criteria:
 
diff --git a/distributions/otelcol-contrib/Dockerfile b/distributions/otelcol-contrib/Dockerfile
@@ -12,4 +12,4 @@ COPY --chmod=755 otelcol-contrib /otelcol-contrib
 COPY config.yaml /etc/otelcol-contrib/config.yaml
 ENTRYPOINT ["/otelcol-contrib"]
 CMD ["--config", "/etc/otelcol-contrib/config.yaml"]
-EXPOSE 4317 4318 55678 55679
+EXPOSE 4317 4318 55679
diff --git a/distributions/otelcol-contrib/Windows.dockerfile b/distributions/otelcol-contrib/Windows.dockerfile
@@ -7,4 +7,4 @@ COPY config.yaml ./config.yaml
 
 ENTRYPOINT ["otelcol-contrib.exe"]
 CMD ["--config", "config.yaml"]
-EXPOSE 4317 4318 55678 55679
+EXPOSE 4317 4318 55679
diff --git a/distributions/otelcol-contrib/config.yaml b/distributions/otelcol-contrib/config.yaml
@@ -16,9 +16,6 @@ receivers:
       http:
         endpoint: 0.0.0.0:4318
 
-  opencensus:
-    endpoint: 0.0.0.0:55678
-
   # Collect own metrics
   prometheus:
     config:
@@ -54,12 +51,12 @@ service:
   pipelines:
 
     traces:
-      receivers: [otlp, opencensus, jaeger, zipkin]
+      receivers: [otlp, jaeger, zipkin]
       processors: [batch]
       exporters: [debug]
 
     metrics:
-      receivers: [otlp, opencensus, prometheus]
+      receivers: [otlp, prometheus]
       processors: [batch]
       exporters: [debug]
 
diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml
@@ -81,7 +81,6 @@ exporters:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.131.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.131.0
@@ -190,7 +189,6 @@ receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/ntpreceiver v0.131.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.131.0
diff --git a/distributions/otelcol-k8s/Dockerfile b/distributions/otelcol-k8s/Dockerfile
@@ -11,8 +11,7 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica
 COPY --chmod=755 otelcol-k8s /otelcol-k8s
 ENTRYPOINT ["/otelcol-k8s"]
 # `4137` and `4318`: OTLP
-# `55678`: OpenCensus
 # `55679`: zpages
 # `6831`, `14268`, and `14250`: Jaeger
 # `9411`: Zipkin
-EXPOSE 4317 4318 55678 55679 6831 14268 14250 9411
+EXPOSE 4317 4318 55679 6831 14268 14250 9411
diff --git a/distributions/otelcol-k8s/README.md b/distributions/otelcol-k8s/README.md
@@ -15,4 +15,4 @@ The full list of components is available in the [manifest](manifest.yaml).
  - All components must be vendor-neutral.
  - Only exporters that use OTLP are allowed.
    - To facilitate troubleshooting, the nop, debug, and file exporters are exceptions.
- - All technologies OTel promised to support will be included as receivers. Specifically this means the `jaegerreceiver`, `zipkinreceiver`, `opencensusreceiver`, and `prometheusreceiver` will be included.
+ - All technologies OTel promised to support will be included as receivers. Specifically this means the `jaegerreceiver`, `zipkinreceiver`, and `prometheusreceiver` will be included.
diff --git a/distributions/otelcol-k8s/Windows.dockerfile b/distributions/otelcol-k8s/Windows.dockerfile
@@ -6,8 +6,7 @@ COPY otelcol-k8s.exe ./otelcol-k8s.exe
 
 ENTRYPOINT ["otelcol-k8s.exe"]
 # `4137` and `4318`: OTLP
-# `55678`: OpenCensus
 # `55679`: zpages
 # `6831`, `14268`, and `14250`: Jaeger
 # `9411`: Zipkin
-EXPOSE 4317 4318 55678 55679 6831 14268 14250 9411
+EXPOSE 4317 4318 55679 6831 14268 14250 9411
diff --git a/distributions/otelcol-k8s/manifest.yaml b/distributions/otelcol-k8s/manifest.yaml
@@ -66,7 +66,6 @@ receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.131.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.131.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.131.0
diff --git a/distributions/otelcol/Dockerfile b/distributions/otelcol/Dockerfile
@@ -12,4 +12,4 @@ COPY --chmod=755 otelcol /otelcol
 COPY config.yaml /etc/otelcol/config.yaml
 ENTRYPOINT ["/otelcol"]
 CMD ["--config", "/etc/otelcol/config.yaml"]
-EXPOSE 4317 4318 55678 55679
+EXPOSE 4317 4318 55679
diff --git a/distributions/otelcol/Windows.dockerfile b/distributions/otelcol/Windows.dockerfile
diff --git a/distributions/otelcol/config.yaml b/distributions/otelcol/config.yaml
diff --git a/distributions/otelcol/manifest.yaml b/distributions/otelcol/manifest.yaml
