Skip to content

Commit

Permalink
Merge branch 'main' into mx-psi/hostname-on-running
Browse files Browse the repository at this point in the history
  • Loading branch information
mx-psi authored Jan 29, 2021
2 parents 393e848 + 8ca2e9b commit 6b3b21b
Show file tree
Hide file tree
Showing 260 changed files with 7,274 additions and 2,125 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ commands:
steps:
- when:
condition:
equal: [master, << pipeline.git.branch >>]
equal: [main, << pipeline.git.branch >>]
steps:
- run:
name: Generate GitHub Issue
Expand Down Expand Up @@ -239,7 +239,7 @@ workflows:
- cross-compile
filters:
branches:
only: /master|release\/.+/
only: /main|release\/.+/
tags:
ignore: /.*/
- integration-tests:
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ exporter/carbonexporter/ @open-telemetry/collector-contrib-app
exporter/datadogexporter/ @open-telemetry/collector-contrib-approvers @KSerrania @ericmustin @mx-psi
exporter/dynatraceexporter/ @open-telemetry/collector-contrib-approvers @dyladan
exporter/elasticexporter/ @open-telemetry/collector-contrib-approvers @axw @simitt @jalvz
exporter/f5cloudexporter/ @open-telemetry/collector-contrib-approvers @gramidt
exporter/honeycombexporter/ @open-telemetry/collector-contrib-approvers @paulosman @lizthegrey @MikeGoldsmith
exporter/jaegerthrifthttpexporter/ @open-telemetry/collector-contrib-approvers @jpkrohling @pavolloffay
exporter/kinesisexporter/ @open-telemetry/collector-contrib-approvers @owais
Expand Down
131 changes: 52 additions & 79 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,166 +1,155 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# File generated by "make gendependabot"; DO NOT EDIT.

version: 2
updates:
- package-ecosystem: "gomod" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "weekly" # Check for updates to GitHub Actions every week

################
# INTERNAL #
################
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/awsxray"
directory: "/exporter/alibabacloudlogserviceexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/awsxray/testdata/sampleapp"
directory: "/exporter/awsemfexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/awsxray/testdata/sampleserver"
directory: "/exporter/awsprometheusremotewriteexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/common"
directory: "/exporter/awsxrayexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/k8sconfig"
directory: "/exporter/azuremonitorexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/splunk"
directory: "/exporter/carbonexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/tools"
directory: "/exporter/datadogexporter"
schedule:
interval: "weekly"

##################
# EXTENSIONS #
##################
- package-ecosystem: "gomod"
directory: "/extension/httpforwarder"
directory: "/exporter/dynatraceexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/extension/observer"
directory: "/exporter/elasticexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/extension/observer/hostobserver"
directory: "/exporter/f5cloudexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/extension/observer/k8sobserver"
directory: "/exporter/honeycombexporter"
schedule:
interval: "weekly"

#################
# EXPORTERS #
#################
- package-ecosystem: "gomod"
directory: "/exporter/alibabacloudlogserviceexporter"
directory: "/exporter/jaegerthrifthttpexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/awsemfexporter"
directory: "/exporter/kinesisexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/awsprometheusremotewriteexporter"
directory: "/exporter/loadbalancingexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/awsxrayexporter"
directory: "/exporter/logzioexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/azuremonitorexporter"
directory: "/exporter/lokiexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/carbonexporter"
directory: "/exporter/newrelicexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/datadogexporter"
directory: "/exporter/sapmexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/dynatraceexporter"
directory: "/exporter/sentryexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/elasticexporter"
directory: "/exporter/signalfxexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/honeycombexporter"
directory: "/exporter/splunkhecexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/jaegerthrifthttpexporter"
directory: "/exporter/stackdriverexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/kinesisexporter"
directory: "/exporter/sumologicexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/loadbalancingexporter"
directory: "/extension/httpforwarder"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/logzioexporter"
directory: "/extension/observer"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/lokiexporter"
directory: "/extension/observer/hostobserver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/newrelicexporter"
directory: "/extension/observer/k8sobserver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/sapmexporter"
directory: "/internal/awsxray"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/sentryexporter"
directory: "/internal/awsxray/testdata/sampleapp"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/signalfxcorrelationexporter"
directory: "/internal/awsxray/testdata/sampleserver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/signalfxexporter"
directory: "/internal/common"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/splunkhecexporter"
directory: "/internal/k8sconfig"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/stackdriverexporter"
directory: "/internal/splunk"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/sumologicexporter"
directory: "/internal/tools"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/batchperresourceattr"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/batchpertrace"
schedule:
interval: "weekly"

##################
# PROCESSORS #
##################
- package-ecosystem: "gomod"
directory: "/processor/groupbyattrsprocessor"
schedule:
Expand All @@ -185,14 +174,14 @@ updates:
directory: "/processor/routingprocessor"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/processor/spanmetricsprocessor"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/processor/tailsamplingprocessor"
schedule:
interval: "weekly"

#################
# RECEIVERS #
#################
- package-ecosystem: "gomod"
directory: "/receiver/awsecscontainermetricsreceiver"
schedule:
Expand Down Expand Up @@ -281,30 +270,14 @@ updates:
directory: "/receiver/zookeeperreceiver"
schedule:
interval: "weekly"

###############
# PKG #
###############
- package-ecosystem: "gomod"
directory: "/pkg/batchperresourceattr"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/batchpertrace"
directory: "/testbed"
schedule:
interval: "weekly"

###############
# TESTBED #
###############
- package-ecosystem: "gomod"
directory: "/testbed"
directory: "/testbed/mockdatareceivers/mockawsxrayreceiver"
schedule:
interval: "weekly"

################
# TRACEGEN #
################
- package-ecosystem: "gomod"
directory: "/tracegen"
schedule:
Expand Down
38 changes: 37 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,42 @@

## Unreleased

## v0.19.0

# 🎉 OpenTelemetry Collector Contrib v0.19.0 (Beta) 🎉

The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-collector release](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.19.0) (be sure to check the release notes here as well!). Check out the [Getting Started Guide](https://opentelemetry.io/docs/collector/getting-started/) for deployment and configuration information.

## 🚀 New components 🚀

- `f5cloud` exporter to export metric, trace, and log data to F5 Cloud
- `jmx` receiver to report metrics from a target MBean server in conjunction with the [JMX Metric Gatherer](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/contrib/jmx-metrics/README.md)

## 🛑 Breaking changes 🛑

- `signalfx` exporter: The `exclude_metrics` option now takes slice of metric filters instead of just metric names (slice of strings) (#1951)

## 💡 Enhancements 💡

- `datadog` exporter: Sanitize datadog service names (#1982)
- `awsecscontainermetrics` receiver: Add more metadata (#2011)
- `azuremonitor` exporter: Favor RPC over HTTP spans (#2006)
- `awsemf` exporter: Always use float64 as calculated rate (#2019)
- `splunkhec` receiver: Make the HEC receiver path configurable, and use `/*` by default (#2137)
- `signalfx` exporter:
- Drop non-default metrics and add `include_metrics` option to override (#2145, #2146, #2162)
- Rename `system.network.dropped_packets` metric to `system.network.dropped` (#2160)
- Do not filter cloud attributes from dimensions (#2020)
- `redis` receiver: Migrate to pdata metrics #1889

## 🧰 Bug fixes 🧰

- `datadog` exporter: Ensure that version tag is added to trace stats (#2010)
- `loadbalancing` exporter: Rolling update of collector can stop the periodical check of DNS updates (#1798)
- `awsecscontainermetrics` receiver: Change the type of `exit_code` from string to int and deal with the situation when there is no data (#2147)
- `groupbytrace` processor: Make onTraceReleased asynchronous to fix processor overload (#1808)
- Handle cases where the time field of Splunk HEC events is encoded as a String (#2159)

## v0.18.0

# 🎉 OpenTelemetry Collector Contrib v0.18.0 (Beta) 🎉
Expand Down Expand Up @@ -150,7 +186,7 @@ The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-co
- Move signalfx correlation code out of `sapm` to `signalfxcorrelation` exporter (#1376)
- Move Splunk specific utils outside of common (#1306)
- `stackdriver` exporter:
- Config options `metric_prefix` & `skip_create_metric_descriptor` are now nested under `metric`, see [README](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/master/exporter/stackdriverexporter/README.md).
- Config options `metric_prefix` & `skip_create_metric_descriptor` are now nested under `metric`, see [README](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/stackdriverexporter/README.md).
- Trace status codes no longer reflect gRPC codes as per spec changes: open-telemetry/opentelemetry-specification#1067
- `datadog` exporter: Remove option to change the namespace prefix (#1483)

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing

If you would like to contribute please read OpenTelemetry Collector
[contributing guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/master/CONTRIBUTING.md)
[contributing guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md)
before you begin your work.

## Adding New Components
Expand Down Expand Up @@ -56,6 +56,6 @@ rigid rules and there are exceptions but in general try to follow them.
processors (that also can be reused by other receivers and exporters).
- When implementing exporters try to leverage the exporter helpers from the
core repo, see [exporterhelper
package](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter/exporterhelper).
package](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper).
This will ensure that the exporter provides
[zPages](https://opencensus.io/zpages/) and a standard set of metrics.
Loading

0 comments on commit 6b3b21b

Please sign in to comment.