Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
317 changes: 167 additions & 150 deletions NOTICE-fips.txt

Large diffs are not rendered by default.

321 changes: 169 additions & 152 deletions NOTICE.txt

Large diffs are not rendered by default.

154 changes: 77 additions & 77 deletions go.mod

Large diffs are not rendered by default.

342 changes: 170 additions & 172 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions internal/pkg/otel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.130.0/exporter/debugexporter/README.md) | v0.130.0 |
| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.130.0/exporter/elasticsearchexporter/README.md) | v0.130.0 |
| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.132.0/exporter/debugexporter/README.md) | v0.132.0 |
| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.132.0/exporter/elasticsearchexporter/README.md) | v0.132.0 |
| [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/fileexporter/v0.130.0/exporter/fileexporter/README.md) | v0.130.0 |
| [kafkaexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/kafkaexporter/v0.130.0/exporter/kafkaexporter/README.md) | v0.130.0 |
| [loadbalancingexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/loadbalancingexporter/v0.130.0/exporter/loadbalancingexporter/README.md) | v0.130.0 |
Expand Down
24 changes: 16 additions & 8 deletions internal/pkg/otel/translate/otelconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,27 +221,35 @@ func TestGetOtelConfig(t *testing.T) {

expectedESConfig := map[string]any{
"elasticsearch/_agent-component/default": map[string]any{
"batcher": map[string]any{
"enabled": true,
"max_size": 1600,
"min_size": 0,
},
"compression": "gzip",
"compression_params": map[string]any{
"level": 1,
},
"mapping": map[string]any{
"mode": "bodymap",
},
"endpoints": []string{"http://localhost:9200"},
"password": "password",
"user": "elastic",
"endpoints": []string{"http://localhost:9200"},
"password": "password",
"user": "elastic",
"max_conns_per_host": 1,
"retry": map[string]any{
"enabled": true,
"initial_interval": 1 * time.Second,
"max_interval": 1 * time.Minute,
"max_retries": 3,
},
"sending_queue": map[string]any{
"enabled": true,
"num_consumers": 1,
"queue_size": 3200,
"block_on_overflow": true,
"wait_for_result": true,
"batch": map[string]any{
"max_size": 1600,
"min_size": 0,
"sizer": "items",
},
},
"logs_dynamic_id": map[string]any{
"enabled": true,
},
Expand Down
9 changes: 8 additions & 1 deletion testing/integration/ess/beat_receivers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,9 @@ func TestClassicAndReceiverAgentMonitoring(t *testing.T) {
"data_stream.namespace",
"elastic_agent.id",
"event.ingested",

// only in receiver doc
"agent.otelcol",
}
switch tc.onlyCompareKeys {
case true:
Expand Down Expand Up @@ -585,6 +588,10 @@ outputs:
"data_stream.namespace",
"event.ingested",
"event.duration",

// only in receiver doc
"agent.otelcol.component.id",
"agent.otelcol.component.kind",
}

stripNondeterminism := func(m mapstr.M, mset string) {
Expand Down Expand Up @@ -668,7 +675,7 @@ outputs:
stripNondeterminism(agentDoc, tt.metricset)
stripNondeterminism(otelDoc, tt.metricset)

AssertMapstrKeysEqual(t, agentDoc, otelDoc, nil, "expected documents keys to be equal for metricset "+tt.metricset)
AssertMapstrKeysEqual(t, agentDoc, otelDoc, ignoredFields, "expected documents keys to be equal for metricset "+tt.metricset)
AssertMapsEqual(t, agentDoc, otelDoc, ignoredFields, "expected documents to be equal for metricset "+tt.metricset)
})
}
Expand Down
4 changes: 4 additions & 0 deletions testing/integration/ess/otel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1635,6 +1635,10 @@ service:
"elastic_agent.id",
"elastic_agent.snapshot",
"elastic_agent.version",

// only in fbreceiver doc
"agent.otelcol.component.id",
"agent.otelcol.component.kind",
}

AssertMapsEqual(t, doc1, doc2, ignoredFields, "expected documents to be equal")
Expand Down
2 changes: 1 addition & 1 deletion wrapper/windows/archive-proxy/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ go 1.24.7

require github.com/elastic/elastic-agent v0.0.0

require golang.org/x/sys v0.34.0 // indirect
require golang.org/x/sys v0.35.0 // indirect

replace github.com/elastic/elastic-agent => ../../../
4 changes: 2 additions & 2 deletions wrapper/windows/archive-proxy/go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=