Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions .chloggen/remove_opencensus.yaml
Original file line number Diff line number Diff line change
@@ -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: []

26 changes: 26 additions & 0 deletions .chloggen/remove_opencensus_contrib.yaml
Original file line number Diff line number Diff line change
@@ -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: []

26 changes: 26 additions & 0 deletions .chloggen/remove_opencensus_k8s.yaml
Original file line number Diff line number Diff line change
@@ -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: []

2 changes: 1 addition & 1 deletion distributions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion distributions/otelcol-contrib/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion distributions/otelcol-contrib/Windows.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 2 additions & 5 deletions distributions/otelcol-contrib/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ receivers:
http:
endpoint: 0.0.0.0:4318

opencensus:
endpoint: 0.0.0.0:55678

# Collect own metrics
prometheus:
config:
Expand Down Expand Up @@ -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]

Expand Down
2 changes: 0 additions & 2 deletions distributions/otelcol-contrib/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,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
Expand Down Expand Up @@ -189,7 +188,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
Expand Down
3 changes: 1 addition & 2 deletions distributions/otelcol-k8s/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion distributions/otelcol-k8s/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 1 addition & 2 deletions distributions/otelcol-k8s/Windows.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion distributions/otelcol-k8s/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion distributions/otelcol/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion distributions/otelcol/Windows.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ COPY config.yaml ./config.yaml

ENTRYPOINT ["otelcol.exe"]
CMD ["--config", "config.yaml"]
EXPOSE 4317 4318 55678 55679
EXPOSE 4317 4318 55679
7 changes: 2 additions & 5 deletions distributions/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ receivers:
http:
endpoint: 0.0.0.0:4318

opencensus:
endpoint: 0.0.0.0:55678

# Collect own metrics
prometheus:
config:
Expand Down Expand Up @@ -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]

Expand Down
2 changes: 0 additions & 2 deletions distributions/otelcol/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.131.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.131.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver 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/prometheusreceiver v0.131.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.131.0

Expand All @@ -23,7 +22,6 @@ exporters:
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.131.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.131.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter 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/prometheusexporter v0.131.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.131.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.131.0
Expand Down