From 008a232c3de01da0e61150497685fb5573e86859 Mon Sep 17 00:00:00 2001 From: Fae Charlton Date: Fri, 3 Apr 2026 17:36:54 -0400 Subject: [PATCH 1/3] Move otelconsumer out of x-pack so it can be referenced directly from libbeat --- .../otelconsumer => libbeat/outputs/otel}/benchmark_test.go | 0 .../outputs/otelconsumer => libbeat/outputs/otel}/config.go | 0 .../outputs/otelconsumer => libbeat/outputs/otel}/otelconsumer.go | 0 .../otelconsumer => libbeat/outputs/otel}/otelconsumer_test.go | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {x-pack/libbeat/outputs/otelconsumer => libbeat/outputs/otel}/benchmark_test.go (100%) rename {x-pack/libbeat/outputs/otelconsumer => libbeat/outputs/otel}/config.go (100%) rename {x-pack/libbeat/outputs/otelconsumer => libbeat/outputs/otel}/otelconsumer.go (100%) rename {x-pack/libbeat/outputs/otelconsumer => libbeat/outputs/otel}/otelconsumer_test.go (100%) diff --git a/x-pack/libbeat/outputs/otelconsumer/benchmark_test.go b/libbeat/outputs/otel/benchmark_test.go similarity index 100% rename from x-pack/libbeat/outputs/otelconsumer/benchmark_test.go rename to libbeat/outputs/otel/benchmark_test.go diff --git a/x-pack/libbeat/outputs/otelconsumer/config.go b/libbeat/outputs/otel/config.go similarity index 100% rename from x-pack/libbeat/outputs/otelconsumer/config.go rename to libbeat/outputs/otel/config.go diff --git a/x-pack/libbeat/outputs/otelconsumer/otelconsumer.go b/libbeat/outputs/otel/otelconsumer.go similarity index 100% rename from x-pack/libbeat/outputs/otelconsumer/otelconsumer.go rename to libbeat/outputs/otel/otelconsumer.go diff --git a/x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go b/libbeat/outputs/otel/otelconsumer_test.go similarity index 100% rename from x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go rename to libbeat/outputs/otel/otelconsumer_test.go From f106000317f8b74b727eb2bf0a0fe13d84ee1075 Mon Sep 17 00:00:00 2001 From: Fae Charlton Date: Sun, 5 Apr 2026 21:25:07 -0400 Subject: [PATCH 2/3] Fix otelconsumer path and include --- libbeat/publisher/includes/includes.go | 1 + .../otel => publisher/pipeline/otelconsumer}/benchmark_test.go | 0 .../otel => publisher/pipeline/otelconsumer}/config.go | 0 .../otel => publisher/pipeline/otelconsumer}/otelconsumer.go | 0 .../pipeline/otelconsumer}/otelconsumer_test.go | 0 x-pack/libbeat/include/include.go | 3 --- 6 files changed, 1 insertion(+), 3 deletions(-) rename libbeat/{outputs/otel => publisher/pipeline/otelconsumer}/benchmark_test.go (100%) rename libbeat/{outputs/otel => publisher/pipeline/otelconsumer}/config.go (100%) rename libbeat/{outputs/otel => publisher/pipeline/otelconsumer}/otelconsumer.go (100%) rename libbeat/{outputs/otel => publisher/pipeline/otelconsumer}/otelconsumer_test.go (100%) diff --git a/libbeat/publisher/includes/includes.go b/libbeat/publisher/includes/includes.go index ccb69d8e475f..50395e554c2a 100644 --- a/libbeat/publisher/includes/includes.go +++ b/libbeat/publisher/includes/includes.go @@ -28,6 +28,7 @@ import ( _ "github.com/elastic/beats/v7/libbeat/outputs/kafka" _ "github.com/elastic/beats/v7/libbeat/outputs/logstash" _ "github.com/elastic/beats/v7/libbeat/outputs/redis" + _ "github.com/elastic/beats/v7/libbeat/publisher/pipeline/otelconsumer" _ "github.com/elastic/beats/v7/libbeat/publisher/queue/diskqueue" _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" ) diff --git a/libbeat/outputs/otel/benchmark_test.go b/libbeat/publisher/pipeline/otelconsumer/benchmark_test.go similarity index 100% rename from libbeat/outputs/otel/benchmark_test.go rename to libbeat/publisher/pipeline/otelconsumer/benchmark_test.go diff --git a/libbeat/outputs/otel/config.go b/libbeat/publisher/pipeline/otelconsumer/config.go similarity index 100% rename from libbeat/outputs/otel/config.go rename to libbeat/publisher/pipeline/otelconsumer/config.go diff --git a/libbeat/outputs/otel/otelconsumer.go b/libbeat/publisher/pipeline/otelconsumer/otelconsumer.go similarity index 100% rename from libbeat/outputs/otel/otelconsumer.go rename to libbeat/publisher/pipeline/otelconsumer/otelconsumer.go diff --git a/libbeat/outputs/otel/otelconsumer_test.go b/libbeat/publisher/pipeline/otelconsumer/otelconsumer_test.go similarity index 100% rename from libbeat/outputs/otel/otelconsumer_test.go rename to libbeat/publisher/pipeline/otelconsumer/otelconsumer_test.go diff --git a/x-pack/libbeat/include/include.go b/x-pack/libbeat/include/include.go index 7e95f9474656..bf61ff599d92 100644 --- a/x-pack/libbeat/include/include.go +++ b/x-pack/libbeat/include/include.go @@ -16,7 +16,4 @@ import ( _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/ec2" _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/elb" _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/nomad" - - // register outputs - _ "github.com/elastic/beats/v7/x-pack/libbeat/outputs/otelconsumer" ) From b623217faed6cbcba21247572b8177fbaa9d3ef6 Mon Sep 17 00:00:00 2001 From: Fae Charlton Date: Mon, 6 Apr 2026 10:21:04 -0400 Subject: [PATCH 3/3] update license headers --- .../pipeline/otelconsumer/benchmark_test.go | 19 ++++++++++++++++--- .../publisher/pipeline/otelconsumer/config.go | 19 ++++++++++++++++--- .../pipeline/otelconsumer/otelconsumer.go | 19 ++++++++++++++++--- .../otelconsumer/otelconsumer_test.go | 19 ++++++++++++++++--- 4 files changed, 64 insertions(+), 12 deletions(-) diff --git a/libbeat/publisher/pipeline/otelconsumer/benchmark_test.go b/libbeat/publisher/pipeline/otelconsumer/benchmark_test.go index e28cb702c1cf..4df9699df6fb 100644 --- a/libbeat/publisher/pipeline/otelconsumer/benchmark_test.go +++ b/libbeat/publisher/pipeline/otelconsumer/benchmark_test.go @@ -1,6 +1,19 @@ -// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one -// or more contributor license agreements. Licensed under the Elastic License; -// you may not use this file except in compliance with the Elastic License. +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you 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 otelconsumer diff --git a/libbeat/publisher/pipeline/otelconsumer/config.go b/libbeat/publisher/pipeline/otelconsumer/config.go index 37fed24167a0..d8281c1aedbc 100644 --- a/libbeat/publisher/pipeline/otelconsumer/config.go +++ b/libbeat/publisher/pipeline/otelconsumer/config.go @@ -1,6 +1,19 @@ -// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one -// or more contributor license agreements. Licensed under the Elastic License; -// you may not use this file except in compliance with the Elastic License. +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you 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 otelconsumer diff --git a/libbeat/publisher/pipeline/otelconsumer/otelconsumer.go b/libbeat/publisher/pipeline/otelconsumer/otelconsumer.go index 9d90131356aa..5dba8a1d5ef2 100644 --- a/libbeat/publisher/pipeline/otelconsumer/otelconsumer.go +++ b/libbeat/publisher/pipeline/otelconsumer/otelconsumer.go @@ -1,6 +1,19 @@ -// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one -// or more contributor license agreements. Licensed under the Elastic License; -// you may not use this file except in compliance with the Elastic License. +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you 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 otelconsumer diff --git a/libbeat/publisher/pipeline/otelconsumer/otelconsumer_test.go b/libbeat/publisher/pipeline/otelconsumer/otelconsumer_test.go index 16a629db4f00..29e5d2f25fc1 100644 --- a/libbeat/publisher/pipeline/otelconsumer/otelconsumer_test.go +++ b/libbeat/publisher/pipeline/otelconsumer/otelconsumer_test.go @@ -1,6 +1,19 @@ -// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one -// or more contributor license agreements. Licensed under the Elastic License; -// you may not use this file except in compliance with the Elastic License. +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you 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 otelconsumer