From 9b61042d05b399b0b615ef482d2ae66e367ff02a Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Thu, 31 Aug 2023 08:37:59 +0300 Subject: [PATCH 1/4] [k8sclusterreceiver] add k8s.pod.status_reason optional metric (#24764) **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24034 --- .../k8sclusterreceiver-pod-status-reason.yaml | 20 ++++ receiver/k8sclusterreceiver/documentation.md | 18 ++++ .../internal/metadata/generated_config.go | 4 + .../metadata/generated_config_test.go | 2 + .../internal/metadata/generated_metrics.go | 57 +++++++++++ .../metadata/generated_metrics_test.go | 15 +++ .../internal/metadata/testdata/config.yaml | 4 + .../k8sclusterreceiver/internal/pod/pods.go | 18 ++++ .../internal/pod/pods_test.go | 26 +++++ .../pod/testdata/expected_evicted.yaml | 95 +++++++++++++++++++ .../internal/testutils/objects.go | 18 ++++ receiver/k8sclusterreceiver/metadata.yaml | 6 ++ 12 files changed, 283 insertions(+) create mode 100755 .chloggen/k8sclusterreceiver-pod-status-reason.yaml create mode 100644 receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml diff --git a/.chloggen/k8sclusterreceiver-pod-status-reason.yaml b/.chloggen/k8sclusterreceiver-pod-status-reason.yaml new file mode 100755 index 000000000000..7b22578cae6e --- /dev/null +++ b/.chloggen/k8sclusterreceiver-pod-status-reason.yaml @@ -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: diff --git a/receiver/k8sclusterreceiver/documentation.md b/receiver/k8sclusterreceiver/documentation.md index 87b52fd36a9f..a5d86f596433 100644 --- a/receiver/k8sclusterreceiver/documentation.md +++ b/receiver/k8sclusterreceiver/documentation.md @@ -386,6 +386,24 @@ The usage for a particular resource with a configured limit. | ---- | ----------- | ------ | | resource | the name of the resource on which the quota is applied | Any Str | +## Optional Metrics + +The following metrics are not emitted by default. Each of them can be enabled by applying the following configuration: + +```yaml +metrics: + : + enabled: true +``` + +### k8s.pod.status_reason + +Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4 - Shutdown, 5 - UnexpectedAdmissionError, 6 - Unknown) + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + ## Resource Attributes | Name | Description | Values | Enabled | diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config.go index d9cd05d91c50..71410bc4ce9f 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_config.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_config.go @@ -53,6 +53,7 @@ type MetricsConfig struct { K8sJobSuccessfulPods MetricConfig `mapstructure:"k8s.job.successful_pods"` K8sNamespacePhase MetricConfig `mapstructure:"k8s.namespace.phase"` K8sPodPhase MetricConfig `mapstructure:"k8s.pod.phase"` + K8sPodStatusReason MetricConfig `mapstructure:"k8s.pod.status_reason"` K8sReplicasetAvailable MetricConfig `mapstructure:"k8s.replicaset.available"` K8sReplicasetDesired MetricConfig `mapstructure:"k8s.replicaset.desired"` K8sReplicationControllerAvailable MetricConfig `mapstructure:"k8s.replication_controller.available"` @@ -155,6 +156,9 @@ func DefaultMetricsConfig() MetricsConfig { K8sPodPhase: MetricConfig{ Enabled: true, }, + K8sPodStatusReason: MetricConfig{ + Enabled: false, + }, K8sReplicasetAvailable: MetricConfig{ Enabled: true, }, diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go index 4dde07183eb4..b7e273b492ff 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go @@ -54,6 +54,7 @@ func TestMetricsBuilderConfig(t *testing.T) { K8sJobSuccessfulPods: MetricConfig{Enabled: true}, K8sNamespacePhase: MetricConfig{Enabled: true}, K8sPodPhase: MetricConfig{Enabled: true}, + K8sPodStatusReason: MetricConfig{Enabled: true}, K8sReplicasetAvailable: MetricConfig{Enabled: true}, K8sReplicasetDesired: MetricConfig{Enabled: true}, K8sReplicationControllerAvailable: MetricConfig{Enabled: true}, @@ -136,6 +137,7 @@ func TestMetricsBuilderConfig(t *testing.T) { K8sJobSuccessfulPods: MetricConfig{Enabled: false}, K8sNamespacePhase: MetricConfig{Enabled: false}, K8sPodPhase: MetricConfig{Enabled: false}, + K8sPodStatusReason: MetricConfig{Enabled: false}, K8sReplicasetAvailable: MetricConfig{Enabled: false}, K8sReplicasetDesired: MetricConfig{Enabled: false}, K8sReplicationControllerAvailable: MetricConfig{Enabled: false}, diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics.go b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics.go index cb5f1ba3cd20..d903567ddec4 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics.go @@ -1384,6 +1384,55 @@ func newMetricK8sPodPhase(cfg MetricConfig) metricK8sPodPhase { return m } +type metricK8sPodStatusReason struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills k8s.pod.status_reason metric with initial data. +func (m *metricK8sPodStatusReason) init() { + m.data.SetName("k8s.pod.status_reason") + m.data.SetDescription("Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4 - Shutdown, 5 - UnexpectedAdmissionError, 6 - Unknown)") + m.data.SetUnit("1") + m.data.SetEmptyGauge() +} + +func (m *metricK8sPodStatusReason) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Gauge().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricK8sPodStatusReason) updateCapacity() { + if m.data.Gauge().DataPoints().Len() > m.capacity { + m.capacity = m.data.Gauge().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricK8sPodStatusReason) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricK8sPodStatusReason(cfg MetricConfig) metricK8sPodStatusReason { + m := metricK8sPodStatusReason{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + type metricK8sReplicasetAvailable struct { data pmetric.Metric // data buffer for generated metric. config MetricConfig // metric config provided by user. @@ -2120,6 +2169,7 @@ type MetricsBuilder struct { metricK8sJobSuccessfulPods metricK8sJobSuccessfulPods metricK8sNamespacePhase metricK8sNamespacePhase metricK8sPodPhase metricK8sPodPhase + metricK8sPodStatusReason metricK8sPodStatusReason metricK8sReplicasetAvailable metricK8sReplicasetAvailable metricK8sReplicasetDesired metricK8sReplicasetDesired metricK8sReplicationControllerAvailable metricK8sReplicationControllerAvailable @@ -2180,6 +2230,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting metricK8sJobSuccessfulPods: newMetricK8sJobSuccessfulPods(mbc.Metrics.K8sJobSuccessfulPods), metricK8sNamespacePhase: newMetricK8sNamespacePhase(mbc.Metrics.K8sNamespacePhase), metricK8sPodPhase: newMetricK8sPodPhase(mbc.Metrics.K8sPodPhase), + metricK8sPodStatusReason: newMetricK8sPodStatusReason(mbc.Metrics.K8sPodStatusReason), metricK8sReplicasetAvailable: newMetricK8sReplicasetAvailable(mbc.Metrics.K8sReplicasetAvailable), metricK8sReplicasetDesired: newMetricK8sReplicasetDesired(mbc.Metrics.K8sReplicasetDesired), metricK8sReplicationControllerAvailable: newMetricK8sReplicationControllerAvailable(mbc.Metrics.K8sReplicationControllerAvailable), @@ -2284,6 +2335,7 @@ func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { mb.metricK8sJobSuccessfulPods.emit(ils.Metrics()) mb.metricK8sNamespacePhase.emit(ils.Metrics()) mb.metricK8sPodPhase.emit(ils.Metrics()) + mb.metricK8sPodStatusReason.emit(ils.Metrics()) mb.metricK8sReplicasetAvailable.emit(ils.Metrics()) mb.metricK8sReplicasetDesired.emit(ils.Metrics()) mb.metricK8sReplicationControllerAvailable.emit(ils.Metrics()) @@ -2458,6 +2510,11 @@ func (mb *MetricsBuilder) RecordK8sPodPhaseDataPoint(ts pcommon.Timestamp, val i mb.metricK8sPodPhase.recordDataPoint(mb.startTime, ts, val) } +// RecordK8sPodStatusReasonDataPoint adds a data point to k8s.pod.status_reason metric. +func (mb *MetricsBuilder) RecordK8sPodStatusReasonDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricK8sPodStatusReason.recordDataPoint(mb.startTime, ts, val) +} + // RecordK8sReplicasetAvailableDataPoint adds a data point to k8s.replicaset.available metric. func (mb *MetricsBuilder) RecordK8sReplicasetAvailableDataPoint(ts pcommon.Timestamp, val int64) { mb.metricK8sReplicasetAvailable.recordDataPoint(mb.startTime, ts, val) diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go index 5521b7db9d45..ed55b0b9d5a6 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go @@ -166,6 +166,9 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordK8sPodPhaseDataPoint(ts, 1) + allMetricsCount++ + mb.RecordK8sPodStatusReasonDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordK8sReplicasetAvailableDataPoint(ts, 1) @@ -612,6 +615,18 @@ func TestMetricsBuilder(t *testing.T) { assert.Equal(t, ts, dp.Timestamp()) assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) assert.Equal(t, int64(1), dp.IntValue()) + case "k8s.pod.status_reason": + assert.False(t, validatedMetrics["k8s.pod.status_reason"], "Found a duplicate in the metrics slice: k8s.pod.status_reason") + validatedMetrics["k8s.pod.status_reason"] = true + assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len()) + assert.Equal(t, "Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4 - Shutdown, 5 - UnexpectedAdmissionError, 6 - Unknown)", ms.At(i).Description()) + assert.Equal(t, "1", ms.At(i).Unit()) + dp := ms.At(i).Gauge().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) case "k8s.replicaset.available": assert.False(t, validatedMetrics["k8s.replicaset.available"], "Found a duplicate in the metrics slice: k8s.replicaset.available") validatedMetrics["k8s.replicaset.available"] = true diff --git a/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml b/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml index 5e7149058ed5..afca964cf6b4 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml +++ b/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml @@ -57,6 +57,8 @@ all_set: enabled: true k8s.pod.phase: enabled: true + k8s.pod.status_reason: + enabled: true k8s.replicaset.available: enabled: true k8s.replicaset.desired: @@ -206,6 +208,8 @@ none_set: enabled: false k8s.pod.phase: enabled: false + k8s.pod.status_reason: + enabled: false k8s.replicaset.available: enabled: false k8s.replicaset.desired: diff --git a/receiver/k8sclusterreceiver/internal/pod/pods.go b/receiver/k8sclusterreceiver/internal/pod/pods.go index 70754e415eb3..67f05951bae8 100644 --- a/receiver/k8sclusterreceiver/internal/pod/pods.go +++ b/receiver/k8sclusterreceiver/internal/pod/pods.go @@ -70,6 +70,7 @@ func Transform(pod *corev1.Pod) *corev1.Pod { func RecordMetrics(logger *zap.Logger, mb *metadata.MetricsBuilder, pod *corev1.Pod, ts pcommon.Timestamp) { mb.RecordK8sPodPhaseDataPoint(ts, int64(phaseToInt(pod.Status.Phase))) + mb.RecordK8sPodStatusReasonDataPoint(ts, int64(reasonToInt(pod.Status.Reason))) rb := mb.NewResourceBuilder() rb.SetK8sNamespaceName(pod.Namespace) rb.SetK8sNodeName(pod.Spec.NodeName) @@ -83,6 +84,23 @@ func RecordMetrics(logger *zap.Logger, mb *metadata.MetricsBuilder, pod *corev1. } } +func reasonToInt(reason string) int32 { + switch reason { + case "Evicted": + return 1 + case "NodeAffinity": + return 2 + case "NodeLost": + return 3 + case "Shutdown": + return 4 + case "UnexpectedAdmissionError": + return 5 + default: + return 6 + } +} + func phaseToInt(phase corev1.PodPhase) int32 { switch phase { case corev1.PodPending: diff --git a/receiver/k8sclusterreceiver/internal/pod/pods_test.go b/receiver/k8sclusterreceiver/internal/pod/pods_test.go index 943bdc97adc5..7c5e40f8ed85 100644 --- a/receiver/k8sclusterreceiver/internal/pod/pods_test.go +++ b/receiver/k8sclusterreceiver/internal/pod/pods_test.go @@ -59,6 +59,32 @@ func TestPodAndContainerMetricsReportCPUMetrics(t *testing.T) { ) } +func TestPodStatusReasonAndContainerMetricsReportCPUMetrics(t *testing.T) { + pod := testutils.NewPodWithContainer( + "1", + testutils.NewPodSpecWithContainer("container-name"), + testutils.NewEvictedTerminatedPodStatusWithContainer("container-name", containerIDWithPreifx("container-id")), + ) + + mbc := metadata.DefaultMetricsBuilderConfig() + mbc.Metrics.K8sPodStatusReason.Enabled = true + ts := pcommon.Timestamp(time.Now().UnixNano()) + mb := metadata.NewMetricsBuilder(mbc, receivertest.NewNopCreateSettings()) + RecordMetrics(zap.NewNop(), mb, pod, ts) + m := mb.Emit() + + expected, err := golden.ReadMetrics(filepath.Join("testdata", "expected_evicted.yaml")) + require.NoError(t, err) + require.NoError(t, pmetrictest.CompareMetrics(expected, m, + pmetrictest.IgnoreTimestamp(), + pmetrictest.IgnoreStartTimestamp(), + pmetrictest.IgnoreResourceMetricsOrder(), + pmetrictest.IgnoreMetricsOrder(), + pmetrictest.IgnoreScopeMetricsOrder(), + ), + ) +} + var containerIDWithPreifx = func(containerID string) string { return "docker://" + containerID } diff --git a/receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml b/receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml new file mode 100644 index 000000000000..15e5ec516dae --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml @@ -0,0 +1,95 @@ +resourceMetrics: + - resource: + attributes: + - key: k8s.namespace.name + value: + stringValue: test-namespace + - key: k8s.node.name + value: + stringValue: test-node + - key: k8s.pod.name + value: + stringValue: test-pod-1 + - key: k8s.pod.uid + value: + stringValue: test-pod-1-uid + - key: opencensus.resourcetype + value: + stringValue: k8s + schemaUrl: https://opentelemetry.io/schemas/1.18.0 + scopeMetrics: + - metrics: + - description: Current phase of the pod (1 - Pending, 2 - Running, 3 - Succeeded, 4 - Failed, 5 - Unknown) + gauge: + dataPoints: + - asInt: "4" + name: k8s.pod.phase + unit: "1" + - description: Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4 - Shutdown, 5 - UnexpectedAdmissionError, 6 - Unknown) + gauge: + dataPoints: + - asInt: "1" + name: k8s.pod.status_reason + unit: "1" + scope: + name: otelcol/k8sclusterreceiver + version: latest + - resource: + attributes: + - key: container.id + value: + stringValue: container-id + - key: container.image.name + value: + stringValue: container-image-name + - key: container.image.tag + value: + stringValue: latest + - key: k8s.container.name + value: + stringValue: container-name + - key: k8s.namespace.name + value: + stringValue: test-namespace + - key: k8s.node.name + value: + stringValue: test-node + - key: k8s.pod.name + value: + stringValue: test-pod-1 + - key: k8s.pod.uid + value: + stringValue: test-pod-1-uid + - key: opencensus.resourcetype + value: + stringValue: container + schemaUrl: https://opentelemetry.io/schemas/1.18.0 + scopeMetrics: + - metrics: + - description: How many times the container has restarted in the recent past. This value is pulled directly from the K8s API and the value can go indefinitely high and be reset to 0 at any time depending on how your kubelet is configured to prune dead containers. It is best to not depend too much on the exact value but rather look at it as either == 0, in which case you can conclude there were no restarts in the recent past, or > 0, in which case you can conclude there were restarts in the recent past, and not try and analyze the value beyond that. + gauge: + dataPoints: + - asInt: "3" + name: k8s.container.restarts + unit: "1" + - description: Whether a container has passed its readiness probe (0 for no, 1 for yes) + gauge: + dataPoints: + - asInt: "1" + name: k8s.container.ready + unit: "1" + - description: Resource requested for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details + gauge: + dataPoints: + - asDouble: 10 + name: k8s.container.cpu_request + unit: "{cpu}" + - description: Maximum resource limit set for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details + gauge: + dataPoints: + - asDouble: 20 + name: k8s.container.cpu_limit + unit: "{cpu}" + scope: + name: otelcol/k8sclusterreceiver + version: latest diff --git a/receiver/k8sclusterreceiver/internal/testutils/objects.go b/receiver/k8sclusterreceiver/internal/testutils/objects.go index 8c5ef60f22e6..97d72021e6a2 100644 --- a/receiver/k8sclusterreceiver/internal/testutils/objects.go +++ b/receiver/k8sclusterreceiver/internal/testutils/objects.go @@ -278,6 +278,24 @@ func NewPodStatusWithContainer(containerName, containerID string) *corev1.PodSta } } +func NewEvictedTerminatedPodStatusWithContainer(containerName, containerID string) *corev1.PodStatus { + return &corev1.PodStatus{ + Phase: corev1.PodFailed, + Reason: "Evicted", + ContainerStatuses: []corev1.ContainerStatus{ + { + Name: containerName, + Ready: true, + RestartCount: 3, + Image: "container-image-name", + ContainerID: containerID, + State: corev1.ContainerState{ + Terminated: &corev1.ContainerStateTerminated{}, + }, + }, + }, + } +} func WithOwnerReferences(or []v1.OwnerReference, obj interface{}) interface{} { switch o := obj.(type) { case *corev1.Pod: diff --git a/receiver/k8sclusterreceiver/metadata.yaml b/receiver/k8sclusterreceiver/metadata.yaml index 81261b1ee773..4d21b48c4313 100644 --- a/receiver/k8sclusterreceiver/metadata.yaml +++ b/receiver/k8sclusterreceiver/metadata.yaml @@ -245,6 +245,12 @@ metrics: unit: 1 gauge: value_type: int + k8s.pod.status_reason: + enabled: false + description: Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4 - Shutdown, 5 - UnexpectedAdmissionError, 6 - Unknown) + unit: 1 + gauge: + value_type: int k8s.deployment.desired: enabled: true From 7211102c1176e46a911462d159286f20690c69f9 Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Thu, 31 Aug 2023 10:38:27 +0300 Subject: [PATCH 2/4] List Grafana Agent as a distribution to 2 more components (#26104) We are going to release a new version of Grafana Agent which includes two more Collector components. The Grafana Agent release will be on 2023-08-30, so ideally the PR should be merged on 2023-08-30 as well. --- connector/spanmetricsconnector/README.md | 3 ++- connector/spanmetricsconnector/metadata.yaml | 2 +- processor/spanprocessor/README.md | 3 ++- processor/spanprocessor/metadata.yaml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/connector/spanmetricsconnector/README.md b/connector/spanmetricsconnector/README.md index 8e850eb76633..f1334b9c9490 100644 --- a/connector/spanmetricsconnector/README.md +++ b/connector/spanmetricsconnector/README.md @@ -3,12 +3,13 @@ | 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 diff --git a/connector/spanmetricsconnector/metadata.yaml b/connector/spanmetricsconnector/metadata.yaml index 6c3fea8c4b93..44c256214d12 100644 --- a/connector/spanmetricsconnector/metadata.yaml +++ b/connector/spanmetricsconnector/metadata.yaml @@ -4,6 +4,6 @@ status: class: connector stability: alpha: [traces_to_metrics] - distributions: [contrib, sumo] + distributions: [contrib, sumo, grafana] codeowners: active: [albertteoh] diff --git a/processor/spanprocessor/README.md b/processor/spanprocessor/README.md index e3ceef2d2e81..3cad7d55de89 100644 --- a/processor/spanprocessor/README.md +++ b/processor/spanprocessor/README.md @@ -4,7 +4,7 @@ | Status | | | ------------- |-----------| | Stability | [alpha]: traces | -| Distributions | [core], [contrib], [aws], [observiq], [redhat], [splunk], [sumo] | +| Distributions | [core], [contrib], [aws], [grafana], [observiq], [redhat], [splunk], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprocessor%2Fspan%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aprocessor%2Fspan) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprocessor%2Fspan%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aprocessor%2Fspan) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@boostchicken](https://www.github.com/boostchicken) | @@ -12,6 +12,7 @@ [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib [aws]: https://github.com/aws-observability/aws-otel-collector +[grafana]: https://github.com/grafana/agent [observiq]: https://github.com/observIQ/observiq-otel-collector [redhat]: https://github.com/os-observability/redhat-opentelemetry-collector [splunk]: https://github.com/signalfx/splunk-otel-collector diff --git a/processor/spanprocessor/metadata.yaml b/processor/spanprocessor/metadata.yaml index 3fc30af02b79..8a07f7407a59 100644 --- a/processor/spanprocessor/metadata.yaml +++ b/processor/spanprocessor/metadata.yaml @@ -4,6 +4,6 @@ status: class: processor stability: alpha: [traces] - distributions: [core, contrib, observiq, splunk, sumo, aws, redhat] + distributions: [core, contrib, observiq, splunk, sumo, aws, redhat, grafana] codeowners: active: [boostchicken] \ No newline at end of file From 3568689cf8139b8620d03aafd8a9048c1f433d7f Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 31 Aug 2023 16:27:52 +0200 Subject: [PATCH 3/4] [*/datadog] Bump opentelemetry-mapping-go to v0.8.0 (#26355) **Description:** Bumps `github.com/DataDog/opentelemetry-mapping-go` to v0.8.0, fixes crash with empty exponential histograms. **Link to tracking Issue:** Fixes #26103 --- .chloggen/mx-psi_v0.8.0-mapping-datadog.yaml | 27 ++++++++++++++++++++ cmd/configschema/go.mod | 10 ++++---- cmd/configschema/go.sum | 22 ++++++++-------- cmd/otelcontribcol/go.mod | 10 ++++---- cmd/otelcontribcol/go.sum | 22 ++++++++-------- connector/datadogconnector/go.mod | 6 ++--- connector/datadogconnector/go.sum | 14 +++++----- exporter/datadogexporter/go.mod | 10 ++++---- exporter/datadogexporter/go.sum | 22 ++++++++-------- go.mod | 10 ++++---- go.sum | 22 ++++++++-------- internal/datadog/go.mod | 8 +++--- internal/datadog/go.sum | 22 ++++++++-------- processor/datadogprocessor/go.mod | 6 ++--- processor/datadogprocessor/go.sum | 14 +++++----- 15 files changed, 126 insertions(+), 99 deletions(-) create mode 100755 .chloggen/mx-psi_v0.8.0-mapping-datadog.yaml diff --git a/.chloggen/mx-psi_v0.8.0-mapping-datadog.yaml b/.chloggen/mx-psi_v0.8.0-mapping-datadog.yaml new file mode 100755 index 000000000000..a1344173a2ff --- /dev/null +++ b/.chloggen/mx-psi_v0.8.0-mapping-datadog.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: 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: [] diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index eff6ea7135b0..a4f60850e056 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -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.1 // 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 @@ -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 diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index c505c29e0323..1173a29d89a6 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -754,17 +754,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0/go.mod h1:Cx8zJKyWoK/mK5j31kwpf58wRaZFyyPxU55/MFEMRSQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 h1:IF+RAgzl0UMo/zA+FBFn/sJqpLKNohkIcSpB47V3yh0= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0/go.mod h1:t0w1Xi9rnqthYFQcq5oqgqVS7CQBGaZbEZI3qPXzmPE= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 h1:YLCXphoA7rGEwlh69+wkqmh8BPk2noEwZaBYMCQ0NU4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0/go.mod h1:AjBYUDNKzEwJzTkJfe5O8hBYODQPpDne3fejPljow/w= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 h1:IDyjHFtUgx+VV6Q+h+RswS8wNFcGjmR56bkQeQ5+Qt4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg9O1kbvenpvjRIGH07v8ozAadJP25yS+uwHyeg= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 079d0682784a..edfec94728b5 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -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 diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 8b899e84c211..a9b29201eb35 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -700,17 +700,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0/go.mod h1:Cx8zJKyWoK/mK5j31kwpf58wRaZFyyPxU55/MFEMRSQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 h1:IF+RAgzl0UMo/zA+FBFn/sJqpLKNohkIcSpB47V3yh0= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0/go.mod h1:t0w1Xi9rnqthYFQcq5oqgqVS7CQBGaZbEZI3qPXzmPE= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 h1:YLCXphoA7rGEwlh69+wkqmh8BPk2noEwZaBYMCQ0NU4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0/go.mod h1:AjBYUDNKzEwJzTkJfe5O8hBYODQPpDne3fejPljow/w= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 h1:IDyjHFtUgx+VV6Q+h+RswS8wNFcGjmR56bkQeQ5+Qt4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg9O1kbvenpvjRIGH07v8ozAadJP25yS+uwHyeg= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 8c22b90a2e53..08e9ca787eff 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -4,7 +4,7 @@ go 1.19 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 @@ -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 diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index b533b4ab45f7..3468ed516e46 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -21,13 +21,13 @@ github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5Tl github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 h1:YLCXphoA7rGEwlh69+wkqmh8BPk2noEwZaBYMCQ0NU4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0/go.mod h1:AjBYUDNKzEwJzTkJfe5O8hBYODQPpDne3fejPljow/w= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 h1:IDyjHFtUgx+VV6Q+h+RswS8wNFcGjmR56bkQeQ5+Qt4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg9O1kbvenpvjRIGH07v8ozAadJP25yS+uwHyeg= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index e61ec6c56729..dd7d5421eb57 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -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 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 37c2017af676..0a3478383bd7 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -75,17 +75,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0/go.mod h1:Cx8zJKyWoK/mK5j31kwpf58wRaZFyyPxU55/MFEMRSQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 h1:IF+RAgzl0UMo/zA+FBFn/sJqpLKNohkIcSpB47V3yh0= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0/go.mod h1:t0w1Xi9rnqthYFQcq5oqgqVS7CQBGaZbEZI3qPXzmPE= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 h1:YLCXphoA7rGEwlh69+wkqmh8BPk2noEwZaBYMCQ0NU4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0/go.mod h1:AjBYUDNKzEwJzTkJfe5O8hBYODQPpDne3fejPljow/w= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 h1:IDyjHFtUgx+VV6Q+h+RswS8wNFcGjmR56bkQeQ5+Qt4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg9O1kbvenpvjRIGH07v8ozAadJP25yS+uwHyeg= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= diff --git a/go.mod b/go.mod index a2fb1ac0f897..8e94786fa662 100644 --- a/go.mod +++ b/go.mod @@ -240,11 +240,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 diff --git a/go.sum b/go.sum index 45f016f74c2f..4aa8c11192a7 100644 --- a/go.sum +++ b/go.sum @@ -756,17 +756,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0/go.mod h1:Cx8zJKyWoK/mK5j31kwpf58wRaZFyyPxU55/MFEMRSQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 h1:IF+RAgzl0UMo/zA+FBFn/sJqpLKNohkIcSpB47V3yh0= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0/go.mod h1:t0w1Xi9rnqthYFQcq5oqgqVS7CQBGaZbEZI3qPXzmPE= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 h1:YLCXphoA7rGEwlh69+wkqmh8BPk2noEwZaBYMCQ0NU4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0/go.mod h1:AjBYUDNKzEwJzTkJfe5O8hBYODQPpDne3fejPljow/w= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 h1:IDyjHFtUgx+VV6Q+h+RswS8wNFcGjmR56bkQeQ5+Qt4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg9O1kbvenpvjRIGH07v8ozAadJP25yS+uwHyeg= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index d712340e1d58..d567a65967f4 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 github.com/DataDog/datadog-agent/pkg/trace 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/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 ) @@ -19,8 +19,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 @@ -58,7 +58,7 @@ require ( go.opentelemetry.io/collector/semconv v0.84.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.24.0 // indirect + go.uber.org/zap v1.25.0 // indirect golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.14.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index e70090d4f809..7ec5ba8eb906 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -18,20 +18,20 @@ github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5Tl github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 h1:YLCXphoA7rGEwlh69+wkqmh8BPk2noEwZaBYMCQ0NU4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0/go.mod h1:AjBYUDNKzEwJzTkJfe5O8hBYODQPpDne3fejPljow/w= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 h1:IDyjHFtUgx+VV6Q+h+RswS8wNFcGjmR56bkQeQ5+Qt4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg9O1kbvenpvjRIGH07v8ozAadJP25yS+uwHyeg= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -152,11 +152,11 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 4d330894c42f..c8ae22fcbdc5 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -5,7 +5,7 @@ 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/DataDog/sketches-go v1.4.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.84.0 github.com/stretchr/testify v1.8.4 @@ -29,8 +29,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/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 3482b9f3e0ba..c543d396782b 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -21,13 +21,13 @@ github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5Tl github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 h1:YLCXphoA7rGEwlh69+wkqmh8BPk2noEwZaBYMCQ0NU4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0/go.mod h1:AjBYUDNKzEwJzTkJfe5O8hBYODQPpDne3fejPljow/w= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 h1:IDyjHFtUgx+VV6Q+h+RswS8wNFcGjmR56bkQeQ5+Qt4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg9O1kbvenpvjRIGH07v8ozAadJP25yS+uwHyeg= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= From 23cd8a100b78babfba5b8ac292501153c4bdbe0a Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 31 Aug 2023 16:28:54 +0200 Subject: [PATCH 4/4] [connector/datadog] Fix `go` directive (#26356) **Description:** The `go` directive was pointing to Go 1.19 instead of Go 1.20. --- connector/datadogconnector/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 08e9ca787eff..b1e9d196c01f 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -1,6 +1,6 @@ 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