Skip to content

Commit 9146e01

Browse files
dloucasfxdloucasfx
authored
Merge branch 'main' into weaviate-discovery
2 parents c864991 + 2339b2c commit 9146e01

File tree

11 files changed

+116
-72
lines changed

11 files changed

+116
-72
lines changed

‎.chloggen/add_icmpcheckreceiver.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: new_component
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. crosslink)
5+
component: icmpcheckreceiver
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: "Add ICMP Check Receiver component to the distribution."
9+
10+
# One or more tracking issues related to the change
11+
issues: [6864]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext: |
17+
See [README](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/icmpcheckreceiver) for more details.

‎.github/workflows/build-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- uses: ./.github/actions/setup-environment
113113

114114
- name: Run Unit Tests With Coverage
115-
run: make gotest-with-codecov
115+
run: COVER_TESTING=true make gotest-with-codecov
116116

117117
- name: Upload coverage report
118118
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # 5.5.1

‎.github/workflows/integration-test.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ jobs:
147147
PROFILE: [ "integration", "smartagent" ]
148148
fail-fast: false
149149
env:
150+
COVER_TESTING: true
150151
TEST_OUTPUT: ${{ github.job }}-${{ matrix.PROFILE }}-${{ matrix.ARCH }}.out
151152
steps:
152153
# Multiarch images require more disk space
@@ -232,6 +233,7 @@ jobs:
232233
PROFILE: [ "integration", "smartagent" ]
233234
fail-fast: false
234235
env:
236+
COVER_TESTING: true
235237
TEST_OUTPUT: ${{ github.job }}-${{ matrix.PROFILE }}-${{ matrix.RUNNER }}.out
236238
steps:
237239
# Multiarch images require more disk space
@@ -336,6 +338,8 @@ jobs:
336338
strategy:
337339
matrix: ${{ fromJSON(needs.integration-test-discovery-matrix.outputs.matrix) }}
338340
fail-fast: false
341+
env:
342+
COVER_TESTING: true
339343
steps:
340344
- name: Free up disk space for next step
341345
uses: jlumbroso/[email protected]
@@ -442,6 +446,7 @@ jobs:
442446
KUBECONFIG=$HOME/.kube/config SKIP_TEARDOWN=true make integration-test-${{ matrix.SERVICE }}-discovery-k8s-with-cover
443447
env:
444448
CONTAINER_COVER_DEST: '/etc/otel/collector/coverage'
449+
COVER_TESTING: true
445450
- name: Print logs
446451
if: failure()
447452
run: |

‎.github/workflows/reusable-unit-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
trap "go-junit-report -set-exit-code < unit-test-results-${{ inputs.OS }}/go-unit-tests.out > unit-test-results-${{ inputs.OS }}/junit/results.xml" EXIT
3838
3939
if ${{ inputs.COVERAGE }}; then
40-
make gotest-cover-without-race | tee unit-test-results-${{ inputs.OS }}/go-unit-tests.out
40+
COVER_TESTING=true make gotest-cover-without-race | tee unit-test-results-${{ inputs.OS }}/go-unit-tests.out
4141
else
4242
make test-all | tee unit-test-results/go-unit-tests.out
4343
fi

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ SKIP_COMPILE=false
4040
ARCH?=amd64
4141
BUNDLE_SUPPORTED_ARCHS := amd64 arm64
4242
SKIP_BUNDLE=false
43-
# Used for building the collector to collect coverage information
44-
COVER_TESTING=false
4543

4644
# For integration testing against local changes you can run
4745
# SPLUNK_OTEL_COLLECTOR_IMAGE='otelcol:latest' make -e docker-otelcol integration-test
@@ -205,6 +203,9 @@ integration-test-istio-discovery-k8s:
205203
integration-test-istio-discovery-k8s-with-cover:
206204
@make integration-test-cover-target TARGET='discovery_integration_istio_k8s'
207205

206+
ifeq ($(COVER_TESTING),true)
207+
# These targets are expensive to build, so only build if explicitly requested
208+
208209
.PHONY: gotest-with-codecov
209210
gotest-with-codecov:
210211
@$(MAKE) for-all-target TARGET="test-with-codecov"
@@ -215,6 +216,8 @@ gotest-cover-without-race:
215216
@$(MAKE) for-all-target TARGET="test-cover-without-race"
216217
$(GOCMD) tool covdata textfmt -i=./coverage -o ./coverage.txt
217218

219+
endif
220+
218221
.PHONY: tidy-all
219222
tidy-all:
220223
$(MAKE) for-all-target TARGET="tidy"

‎Makefile.Common‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Explicitly define the shell we will use for commands.
22
SHELL?=/bin/bash
33

4+
# Used for building the collector to collect coverage information
5+
COVER_TESTING?=false
6+
47
# Add support to use Makefile on Windows
58
SHELL_CASE_EXP = case "$$(uname -s)" in CYGWIN*|MINGW*|MSYS*) echo "true";; esac;
69
UNIX_SHELL_ON_WINDOWS := $(shell $(SHELL_CASE_EXP))
@@ -45,14 +48,6 @@ BUILD_TYPE?=release
4548
# COVER_PKGS is the list of packages to include in the test coverage
4649
EXCLUDE_MODS=-not -path "./examples/*" -not -path "./packaging/technical-addon/*"
4750
FIND_MOD_ARGS=-type f -name "go.mod"
48-
COVER_PKGS := $(shell find . $(EXCLUDE_MODS) $(FIND_MOD_ARGS) -execdir $(GOCMD) list ./... \; | tr "\n" "," )
49-
50-
COVER_DIR?=coverage
51-
COVER_DIR_ABS?=$(SRC_ROOT)/$(COVER_DIR)
52-
TEST_COVER_DIR?=$(SRC_ROOT)/tests/$(COVER_DIR)
53-
COVER_OPTS?=-cover -covermode=atomic -coverpkg $(COVER_PKGS)
54-
COVER_TESTING_OPTS?=$(COVER_OPTS) -args -test.gocoverdir="$(COVER_DIR_ABS)"
55-
COVER_TESTING_INTEGRATION_OPTS?=$(COVER_OPTS) -args -test.gocoverdir="$(TEST_COVER_DIR)"
5651

5752
ALL_PKG_DIRS := $(shell $(GOCMD) list -f '{{ .Dir }}' ./... | $(NORMALIZE_DIRS))
5853

@@ -89,6 +84,17 @@ common: checklicense lint misspell
8984
test:
9085
$(GOTEST) $(GOTEST_OPT) $(ALL_PKG_DIRS)
9186

87+
ifeq ($(COVER_TESTING),true)
88+
# These variables and targets are expensive to build, so only build if explicitly requested
89+
90+
COVER_PKGS := $(shell find . $(EXCLUDE_MODS) $(FIND_MOD_ARGS) -execdir $(GOCMD) list ./... \; | tr "\n" "," )
91+
COVER_DIR?=coverage
92+
COVER_DIR_ABS?=$(SRC_ROOT)/$(COVER_DIR)
93+
TEST_COVER_DIR?=$(SRC_ROOT)/tests/$(COVER_DIR)
94+
COVER_OPTS?=-cover -covermode=atomic -coverpkg $(COVER_PKGS)
95+
COVER_TESTING_OPTS?=$(COVER_OPTS) -args -test.gocoverdir="$(COVER_DIR_ABS)"
96+
COVER_TESTING_INTEGRATION_OPTS?=$(COVER_OPTS) -args -test.gocoverdir="$(TEST_COVER_DIR)"
97+
9298
.PHONY: test-with-codecov
9399
test-with-codecov:
94100
mkdir -p $(COVER_DIR)
@@ -102,6 +108,8 @@ test-cover-without-race:
102108
mkdir -p $(COVER_DIR_ABS)
103109
$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./... $(COVER_TESTING_OPTS)
104110

111+
endif
112+
105113
.PHONY: addlicense
106114
addlicense:
107115
@ADDLICENCESEOUT=`$(ADDLICENCESE) -y "" -c 'Splunk, Inc.' $(ALL_SRC) 2>&1`; \

‎docs/components.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ The distribution offers support for the following components.
3636
| [haproxy](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/haproxyreceiver) | [beta] |
3737
| [hostmetrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver) | [beta] |
3838
| [httpcheck](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/httpcheckreceiver) | [alpha] |
39+
| [icmpcheck](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/icmpcheckreceiver) | [in development] |
3940
| [iis](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/iisreceiver) | [beta] |
4041
| [influxdb](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/influxdbreceiver) | [beta] |
4142
| [jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver) | [beta] |

‎go.mod‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ require (
8282
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver v0.138.0
8383
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.138.0
8484
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.138.0
85+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/icmpcheckreceiver v0.138.1-0.20251023154113-ec58426707f1
8586
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.138.0
8687
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.138.0
8788
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.138.0
@@ -141,35 +142,35 @@ require (
141142
go.etcd.io/bbolt v1.4.3
142143
go.etcd.io/etcd/client/v2 v2.305.23
143144
go.opentelemetry.io/collector/component/componentstatus v0.138.0
144-
go.opentelemetry.io/collector/component/componenttest v0.138.0
145+
go.opentelemetry.io/collector/component/componenttest v0.138.1-0.20251021231522-c657d5d4e920
145146
go.opentelemetry.io/collector/config/confighttp v0.138.0
146147
go.opentelemetry.io/collector/config/configopaque v1.44.0
147-
go.opentelemetry.io/collector/confmap v1.44.0
148+
go.opentelemetry.io/collector/confmap v1.44.1-0.20251021231522-c657d5d4e920
148149
go.opentelemetry.io/collector/confmap/provider/envprovider v1.44.0
149150
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.44.0
150151
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.44.0
151152
go.opentelemetry.io/collector/confmap/xconfmap v0.138.0
152153
go.opentelemetry.io/collector/connector/forwardconnector v0.138.0
153-
go.opentelemetry.io/collector/consumer/consumertest v0.138.0
154+
go.opentelemetry.io/collector/consumer/consumertest v0.138.1-0.20251021231522-c657d5d4e920
154155
go.opentelemetry.io/collector/exporter/debugexporter v0.138.0
155156
go.opentelemetry.io/collector/exporter/nopexporter v0.138.0
156157
go.opentelemetry.io/collector/exporter/otlpexporter v0.138.0
157158
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.138.0
158159
go.opentelemetry.io/collector/extension v1.44.0
159160
go.opentelemetry.io/collector/extension/zpagesextension v0.138.0
160161
go.opentelemetry.io/collector/otelcol v0.138.0
161-
go.opentelemetry.io/collector/pdata v1.44.0
162-
go.opentelemetry.io/collector/pipeline v1.44.0
162+
go.opentelemetry.io/collector/pdata v1.44.1-0.20251021231522-c657d5d4e920
163+
go.opentelemetry.io/collector/pipeline v1.44.1-0.20251021231522-c657d5d4e920
163164
go.opentelemetry.io/collector/processor v1.44.0
164165
go.opentelemetry.io/collector/processor/batchprocessor v0.138.0
165166
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.138.0
166-
go.opentelemetry.io/collector/receiver v1.44.0
167+
go.opentelemetry.io/collector/receiver v1.44.1-0.20251021231522-c657d5d4e920
167168
go.opentelemetry.io/collector/receiver/nopreceiver v0.138.0
168169
go.opentelemetry.io/collector/receiver/otlpreceiver v0.138.0
169-
go.opentelemetry.io/collector/receiver/receiverhelper v0.138.0
170-
go.opentelemetry.io/collector/receiver/receivertest v0.138.0
171-
go.opentelemetry.io/collector/scraper v0.138.0
172-
go.opentelemetry.io/collector/scraper/scraperhelper v0.138.0
170+
go.opentelemetry.io/collector/receiver/receiverhelper v0.138.1-0.20251021231522-c657d5d4e920
171+
go.opentelemetry.io/collector/receiver/receivertest v0.138.1-0.20251021231522-c657d5d4e920
172+
go.opentelemetry.io/collector/scraper v0.138.1-0.20251021231522-c657d5d4e920
173+
go.opentelemetry.io/collector/scraper/scraperhelper v0.138.1-0.20251021231522-c657d5d4e920
173174
go.opentelemetry.io/otel/metric v1.38.0
174175
go.opentelemetry.io/otel/trace v1.38.0
175176
go.uber.org/atomic v1.11.0
@@ -387,6 +388,7 @@ require (
387388
github.com/pkg/sftp v1.13.9 // indirect
388389
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
389390
github.com/pquerna/otp v1.4.0 // indirect
391+
github.com/prometheus-community/pro-bing v0.7.0 // indirect
390392
github.com/prometheus/alertmanager v0.28.1 // indirect
391393
github.com/prometheus/client_golang v1.23.2 // indirect
392394
github.com/prometheus/common/assets v0.2.0 // indirect
@@ -448,9 +450,9 @@ require (
448450
go.opentelemetry.io/collector/connector v0.138.0 // indirect
449451
go.opentelemetry.io/collector/connector/connectortest v0.138.0 // indirect
450452
go.opentelemetry.io/collector/connector/xconnector v0.138.0 // indirect
451-
go.opentelemetry.io/collector/consumer/consumererror v0.138.0 // indirect
453+
go.opentelemetry.io/collector/consumer/consumererror v0.138.1-0.20251021231522-c657d5d4e920 // indirect
452454
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.138.0 // indirect
453-
go.opentelemetry.io/collector/consumer/xconsumer v0.138.0 // indirect
455+
go.opentelemetry.io/collector/consumer/xconsumer v0.138.1-0.20251021231522-c657d5d4e920 // indirect
454456
go.opentelemetry.io/collector/exporter v1.44.0 // indirect
455457
go.opentelemetry.io/collector/exporter/exporterhelper v0.138.0 // indirect
456458
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.138.0 // indirect
@@ -461,20 +463,20 @@ require (
461463
go.opentelemetry.io/collector/extension/extensionmiddleware v0.138.0 // indirect
462464
go.opentelemetry.io/collector/extension/extensiontest v0.138.0 // indirect
463465
go.opentelemetry.io/collector/extension/xextension v0.138.0 // indirect
464-
go.opentelemetry.io/collector/filter v0.138.0 // indirect
466+
go.opentelemetry.io/collector/filter v0.138.1-0.20251021231522-c657d5d4e920 // indirect
465467
go.opentelemetry.io/collector/internal/fanoutconsumer v0.138.0 // indirect
466468
go.opentelemetry.io/collector/internal/memorylimiter v0.138.0 // indirect
467469
go.opentelemetry.io/collector/internal/sharedcomponent v0.138.0 // indirect
468-
go.opentelemetry.io/collector/internal/telemetry v0.138.0 // indirect
469-
go.opentelemetry.io/collector/pdata/pprofile v0.138.0 // indirect
470+
go.opentelemetry.io/collector/internal/telemetry v0.138.1-0.20251021231522-c657d5d4e920 // indirect
471+
go.opentelemetry.io/collector/pdata/pprofile v0.138.1-0.20251021231522-c657d5d4e920 // indirect
470472
go.opentelemetry.io/collector/pdata/testdata v0.138.0 // indirect
471473
go.opentelemetry.io/collector/pdata/xpdata v0.138.0 // indirect
472474
go.opentelemetry.io/collector/pipeline/xpipeline v0.138.0 // indirect
473475
go.opentelemetry.io/collector/processor/processorhelper v0.138.0 // indirect
474476
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.138.0 // indirect
475477
go.opentelemetry.io/collector/processor/processortest v0.138.0 // indirect
476478
go.opentelemetry.io/collector/processor/xprocessor v0.138.0 // indirect
477-
go.opentelemetry.io/collector/receiver/xreceiver v0.138.0 // indirect
479+
go.opentelemetry.io/collector/receiver/xreceiver v0.138.1-0.20251021231522-c657d5d4e920 // indirect
478480
go.opentelemetry.io/collector/service v0.138.0 // indirect
479481
go.opentelemetry.io/collector/service/hostcapabilities v0.138.0 // indirect
480482
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
@@ -493,7 +495,7 @@ require (
493495
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
494496
go.opentelemetry.io/otel/log v0.14.0 // indirect
495497
go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect
496-
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
498+
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
497499
go.uber.org/zap/exp v0.3.0 // indirect
498500
go.yaml.in/yaml/v2 v2.4.3 // indirect
499501
go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -739,9 +741,9 @@ require (
739741
go.etcd.io/etcd/client/pkg/v3 v3.5.23 // indirect
740742
go.mongodb.org/atlas v0.38.0 // indirect
741743
go.opencensus.io v0.24.0
742-
go.opentelemetry.io/collector/component v1.44.0
743-
go.opentelemetry.io/collector/consumer v1.44.0
744-
go.opentelemetry.io/collector/featuregate v1.44.0
744+
go.opentelemetry.io/collector/component v1.44.1-0.20251021231522-c657d5d4e920
745+
go.opentelemetry.io/collector/consumer v1.44.1-0.20251021231522-c657d5d4e920
746+
go.opentelemetry.io/collector/featuregate v1.44.1-0.20251021231522-c657d5d4e920
745747
go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685 // indirect
746748
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
747749
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect

0 commit comments

Comments
 (0)