Skip to content

Commit

Permalink
Merge branch 'main' into jaegerremotesampling_replace_thrift-gen_with…
Browse files Browse the repository at this point in the history
…_proto-gen

Signed-off-by: Benedikt Bongartz <[email protected]>
  • Loading branch information
frzifus committed Aug 31, 2023
2 parents b3045aa + 23cd8a1 commit 6468cce
Show file tree
Hide file tree
Showing 31 changed files with 416 additions and 104 deletions.
20 changes: 20 additions & 0 deletions .chloggen/k8sclusterreceiver-pod-status-reason.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# 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: "Add k8s.pod.status_reason option metric"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [24034]

# (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:
27 changes: 27 additions & 0 deletions .chloggen/mx-psi_v0.8.0-mapping-datadog.yaml
Original file line number Diff line number Diff line change
@@ -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: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: datadogexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fixes crash when mapping OTLP Exponential Histograms with no buckets. These will now be dropped instead.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [26103]

# (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: []
10 changes: 5 additions & 5 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.8.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 // indirect
github.com/gocql/gocql v1.3.2 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.84.0 // indirect
Expand Down Expand Up @@ -246,9 +246,9 @@ require (
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 // indirect
github.com/DataDog/sketches-go v1.4.2 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
Expand Down
22 changes: 11 additions & 11 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@ require (
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 // indirect
github.com/DataDog/sketches-go v1.4.2 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
Expand Down
22 changes: 11 additions & 11 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions connector/datadogconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector

go 1.19
go 1.20

require (
github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.84.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.84.0
Expand All @@ -24,8 +24,8 @@ require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 // indirect
github.com/DataDog/sketches-go v1.4.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand Down
14 changes: 7 additions & 7 deletions connector/datadogconnector/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion connector/spanmetricsconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
<!-- status autogenerated section -->
| Status | |
| ------------- |-----------|
| Distributions | [contrib], [sumo] |
| Distributions | [contrib], [grafana], [sumo] |
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fspanmetrics%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fspanmetrics) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fspanmetrics%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fspanmetrics) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@albertteoh](https://www.github.com/albertteoh) |

[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
[grafana]: https://github.com/grafana/agent
[sumo]: https://github.com/SumoLogic/sumologic-otel-collector

## Supported Pipeline Types
Expand Down
2 changes: 1 addition & 1 deletion connector/spanmetricsconnector/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ status:
class: connector
stability:
alpha: [traces_to_metrics]
distributions: [contrib, sumo]
distributions: [contrib, sumo, grafana]
codeowners:
active: [albertteoh]
10 changes: 5 additions & 5 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ require (
github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1
github.com/DataDog/datadog-api-client-go/v2 v2.16.0
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0
github.com/DataDog/sketches-go v1.4.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.19.1
github.com/aws/aws-sdk-go v1.44.333
Expand Down
Loading

0 comments on commit 6468cce

Please sign in to comment.