Skip to content

Commit

Permalink
Release v0.61.0 (#2074)
Browse files Browse the repository at this point in the history
* Account for mssql test container recovery flake

* test: Add signalfx exporter translation integration tests

* Release v0.61.0
  • Loading branch information
rmfitzpatrick authored Oct 4, 2022
1 parent 20af37d commit f530150
Show file tree
Hide file tree
Showing 12 changed files with 382 additions and 241 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

## Unreleased

## v0.61.0

This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.61.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.61.0) and the [opentelemetry-collector-contrib v0.61.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.61.0) releases.

### 💡 Enhancements 💡

- `signalfx` exporter: Drop datapoints with more than 36 dimensions [#14625](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/14625)
- Security updates for third-party dependencies

### 🧰 Bug fixes 🧰

- `smartagent` receiver: Reduce severity of logged unsupported config fields warning [#2072](https://github.com/signalfx/splunk-otel-collector/pull/2072)

## v0.60.0

This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.60.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.60.0) and the [opentelemetry-collector-contrib v0.60.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.60.0) releases.
Expand Down
152 changes: 76 additions & 76 deletions go.mod

Large diffs are not rendered by default.

312 changes: 156 additions & 156 deletions go.sum

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions tests/exporters/signalfx/signalfx_translation_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright Splunk, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package tests

import (
"testing"

"github.com/signalfx/splunk-otel-collector/tests/testutils"
)

func TestSignalFxExporterTranslatesOTelCPUMetrics(t *testing.T) {
testutils.AssertAllMetricsReceived(
t, "cpu_translations.yaml", "cpu_translations_config.yaml", nil,
)
}

func TestSignalFxExporterTranslatesOTelMemoryMetrics(t *testing.T) {
testutils.AssertAllMetricsReceived(
t, "memory_translations.yaml", "memory_translations_config.yaml", nil,
)
}
26 changes: 26 additions & 0 deletions tests/exporters/signalfx/testdata/cpu_translations_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
receivers:
hostmetrics:
collection_interval: 1s
scrapers:
cpu:
signalfx:
endpoint: 127.0.0.1:9943

exporters:
signalfx:
access_token: token
ingest_url: http://127.0.0.1:9943
api_url: http://127.0.0.1:9943
otlp:
endpoint: "${OTLP_ENDPOINT}"
tls:
insecure: true

service:
pipelines:
metrics/in:
receivers: [hostmetrics]
exporters: [signalfx]
metrics/out:
receivers: [signalfx]
exporters: [otlp]
26 changes: 26 additions & 0 deletions tests/exporters/signalfx/testdata/memory_translations_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
receivers:
hostmetrics:
collection_interval: 1s
scrapers:
memory:
signalfx:
endpoint: 127.0.0.1:9943

exporters:
signalfx:
access_token: token
ingest_url: http://127.0.0.1:9943
api_url: http://127.0.0.1:9943
otlp:
endpoint: "${OTLP_ENDPOINT}"
tls:
insecure: true

service:
pipelines:
metrics/in:
receivers: [hostmetrics]
exporters: [signalfx]
metrics/out:
receivers: [signalfx]
exporters: [otlp]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
resource_metrics:
- instrumentation_library_metrics:
- metrics:
- name: cpu.utilization
type: DoubleGauge
- name: cpu.num_processors
type: IntGauge
- name: cpu.idle
type: IntMonotonicCumulativeSum
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
resource_metrics:
- instrumentation_library_metrics:
- metrics:
- name: system.memory.usage
labels:
state: used
type: IntGauge
- name: system.memory.usage
labels:
state: free
type: IntGauge
- name: system.memory.usage
labels:
state: buffered
type: IntGauge
- name: system.memory.usage
labels:
state: cached
type: IntGauge
- name: system.memory.usage
labels:
state: slab_reclaimable
type: IntGauge
- name: system.memory.usage
labels:
state: slab_unreclaimable
type: IntGauge
- name: memory.total
labels: {}
type: IntGauge
- name: memory.utilization
labels: {}
type: DoubleGauge
4 changes: 2 additions & 2 deletions tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/signalfx/signalfx-go v1.23.0
github.com/stretchr/testify v1.8.0
github.com/testcontainers/testcontainers-go v0.14.0
go.opentelemetry.io/collector v0.60.1-0.20220927165804-a6eba81e5937
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927165804-a6eba81e5937
go.opentelemetry.io/collector v0.61.0
go.opentelemetry.io/collector/pdata v0.61.0
go.opentelemetry.io/otel/trace v1.10.0
go.uber.org/atomic v1.10.0
go.uber.org/zap v1.23.0
Expand Down
10 changes: 5 additions & 5 deletions tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -781,11 +781,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.60.1-0.20220927165804-a6eba81e5937 h1:aKcnveR9aHBWz529QWW9faZoSGFTW4KJ539YUUFZYvQ=
go.opentelemetry.io/collector v0.60.1-0.20220927165804-a6eba81e5937/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w=
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927165804-a6eba81e5937 h1:1UyL6zrEvR87Pu1bhuihXhkVZ4BhroyuXEHQtrBQDbI=
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927165804-a6eba81e5937/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E=
go.opentelemetry.io/collector/semconv v0.60.0 h1:xy6HSukzA5CC8SR4DvFyLd28EFEOnQgxtpU1bSCM0qY=
go.opentelemetry.io/collector v0.61.0 h1:lvuhmlskup6Z3AfQKZwuRk43jRClB+1FkwjGXRoxhfs=
go.opentelemetry.io/collector v0.61.0/go.mod h1:515eomlUIwLEXTBwLAEEtl2HPreJy5xtv//LYMk/SZE=
go.opentelemetry.io/collector/pdata v0.61.0 h1:jPUReUpR/D1xsigfRxyXA7cYMnXfnK+D7z61W6F9moo=
go.opentelemetry.io/collector/pdata v0.61.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E=
go.opentelemetry.io/collector/semconv v0.61.0 h1:RMrzDugNuFsUjppvvNZWiWcNneogZ3Zo4idWyIUWR9k=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 h1:qZ3KzA4qPzLBDtQyPk4ydjlg8zvXbNysnFHaVMKJbVo=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ func TestTelegrafSQLServerReceiverProvidesAllMetrics(t *testing.T) {
path.Join(".", "testdata", "server"),
).WithExposedPorts("1433:1433").WithName("sql-server").WithNetworks(
"mssql",
).WillWaitForPorts("1433").WillWaitForLogs("SQL Server is now ready for client connections.")
).WillWaitForPorts("1433").WillWaitForLogs(
"SQL Server is now ready for client connections.", "Recovery is complete.")

client := testutils.NewContainer().WithContext(
path.Join(".", "testdata", "client"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ FROM mcr.microsoft.com/mssql-tools

COPY create_user.sql /usr/local/create_user.sql

CMD ["/opt/mssql-tools/bin/sqlcmd", "-S", "tcp:sql-server,1433", "-U", "sa", "-P", "Password!", "-i", "/usr/local/create_user.sql"]
CMD ["bash", "-c", "sleep 10 && /opt/mssql-tools/bin/sqlcmd -S \"tcp:sql-server,1433\" -U sa -P \"Password!\" -i /usr/local/create_user.sql"]

0 comments on commit f530150

Please sign in to comment.