Skip to content

Commit afdf236

Browse files
Merge branch 'main' into add-receivers-v130
2 parents 1cb7fdd + 6060b9c commit afdf236

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

NOTICE-fips.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3576,11 +3576,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
35763576

35773577
--------------------------------------------------------------------------------
35783578
Dependency : github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver
3579-
Version: v0.2.0
3579+
Version: v0.2.1
35803580
Licence type (autodetected): Apache-2.0
35813581
--------------------------------------------------------------------------------
35823582

3583-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/[email protected].0/LICENSE:
3583+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/[email protected].1/LICENSE:
35843584

35853585
Apache License
35863586
Version 2.0, January 2004

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3576,11 +3576,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
35763576

35773577
--------------------------------------------------------------------------------
35783578
Dependency : github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver
3579-
Version: v0.2.0
3579+
Version: v0.2.1
35803580
Licence type (autodetected): Apache-2.0
35813581
--------------------------------------------------------------------------------
35823582

3583-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/[email protected].0/LICENSE:
3583+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/[email protected].1/LICENSE:
35843584

35853585
Apache License
35863586
Version 2.0, January 2004

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension v0.5.0
3232
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.16.0
3333
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.9.0
34-
github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver v0.2.0
34+
github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver v0.2.1
3535
github.com/fatih/color v1.18.0
3636
github.com/fsnotify/fsnotify v1.9.0
3737
github.com/go-viper/mapstructure/v2 v2.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,8 @@ github.com/elastic/opentelemetry-collector-components/processor/elastictraceproc
566566
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.9.0/go.mod h1:abeJCmXXWoNdCqyIFkzgZAnvK9QkxAqyBLMonlKxAZ0=
567567
github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.8.0 h1:m2RieHXVTRykAd7VdpryuAV56Ia/eidgtlEutnG/m5w=
568568
github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.8.0/go.mod h1:uQHpGpKwGHhdO5fm2hx1mthiPMiScmFOp5XNwD0EqVw=
569-
github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver v0.2.0 h1:h1gGRol15HQupkhVW+x5GSI9DcZrjEqPlJCTmf5A9kg=
570-
github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver v0.2.0/go.mod h1:6GD6slW/fYTxZkhBfjk2TaSJHmyevZfyuudIyqXAfwc=
569+
github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver v0.2.1 h1:kcwYI2wQVFYnZojkKtFky3lrFZB1BDmw6SivDffP+qs=
570+
github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver v0.2.1/go.mod h1:6GD6slW/fYTxZkhBfjk2TaSJHmyevZfyuudIyqXAfwc=
571571
github.com/elastic/opentelemetry-lib v0.21.0 h1:aktZQ6hocz/yVMOikDrdcjWtl/qcK/AfMBundZJTCcQ=
572572
github.com/elastic/opentelemetry-lib v0.21.0/go.mod h1:mNcdHi6ivTn5w4bE18as43gzKt2rVmK4HCeJZ9JmFXk=
573573
github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA=

internal/pkg/otel/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This section provides a summary of components included in the Elastic Distributi
3636
| Component | Version |
3737
|---|---|
3838
| [apachereceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/apachereceiver/v0.130.0/receiver/apachereceiver/README.md) | v0.130.0 |
39-
| [elasticapmintakereceiver](https://github.com/elastic/opentelemetry-collector-components/blob/receiver/elasticapmintakereceiver/v0.2.0/receiver/elasticapmintakereceiver/README.md) | v0.2.0 |
39+
| [elasticapmintakereceiver](https://github.com/elastic/opentelemetry-collector-components/blob/receiver/elasticapmintakereceiver/v0.2.1/receiver/elasticapmintakereceiver/README.md) | v0.2.1 |
4040
| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/filelogreceiver/v0.130.0/receiver/filelogreceiver/README.md) | v0.130.0 |
4141
| [hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/hostmetricsreceiver/v0.130.0/receiver/hostmetricsreceiver/README.md) | v0.130.0 |
4242
| [httpcheckreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/httpcheckreceiver/v0.130.0/receiver/httpcheckreceiver/README.md) | v0.130.0 |

0 commit comments

Comments
 (0)