Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add awsfirehosereceiver #31

Merged
merged 7 commits into from
Dec 23, 2024
Merged

feat: add awsfirehosereceiver #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
358f02d
bump to 0.116.0
Dec 23, 2024
acd63ad
replace loggingexporter
Dec 23, 2024
20dab89
wip - compilation errors
Dec 23, 2024
edfdade
wip - compilation errors, past config.Unmarshal
Dec 23, 2024
10c4ec5
fix compliation errors
Dec 23, 2024
2eb5c7f
try fix vulnerability
Dec 23, 2024
712cde9
bump Go to 1.22.8
Dec 23, 2024
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
16 changes: 8 additions & 8 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- '**.md'
workflow_dispatch:
env:
TEST_RESULTS: testbed/tests/results/junit/results.xml
TEST_RESULTS: testbed/tests/results/junit/results.xml
# Make sure to exit early if cache segment download times out after 2 minutes.
# We limit cache download as a whole to 5 minutes.
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.9"
go-version: "1.22.8"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.9"
go-version: "1.22.8"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21.9"
go-version: "1.22.8"
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -175,7 +175,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.9"
go-version: "1.22.8"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: ["1.22.2", "1.21.9"] # 1.20 is interpreted as 1.2 without quotes
go-version: ["1.22.2", "1.22.8"] # 1.20 is interpreted as 1.2 without quotes
runner: [ubuntu-latest]
group:
# - receiver
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.9"
go-version: "1.22.8"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.9"
go-version: "1.22.8"
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion OTEL_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.102.0
0.116.0
50 changes: 28 additions & 22 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,43 @@ dist:
module: github.com/lumigo-io/lumigo-otel-collector-contrib
name: lumigo-collector
description: Lumigo OpenTelemetry collector
otelcol_version: "0.102.0"
version: "0.102.0-dev"
version: "0.116.0-dev"
output_path: cmd/otelcontribcol

exporters:
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.102.0"
- gomod: "go.opentelemetry.io/collector/exporter/loggingexporter v0.102.0"
- gomod: "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.116.0"
- gomod: "go.opentelemetry.io/collector/exporter/debugexporter v0.116.0"
- gomod: "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.116.0"

extensions:
- gomod: "github.com/lumigo-io/lumigo-otel-collector-contrib/extension/lumigoauthextension v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.102.0"
- gomod: "github.com/lumigo-io/lumigo-otel-collector-contrib/extension/lumigoauthextension v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.116.0"

receivers:
- gomod: "go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.102.0"
- gomod: "go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.116.0"

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.18.0

processors:
- gomod: "go.opentelemetry.io/collector/processor/batchprocessor v0.102.0"
- gomod: "github.com/lumigo-io/lumigo-otel-collector-contrib/processor/k8seventsenricherprocessor v0.102.0"
- gomod: "github.com/lumigo-io/lumigo-otel-collector-contrib/processor/redactionbykeyprocessor v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.102.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0"
- gomod: "go.opentelemetry.io/collector/processor/batchprocessor v0.116.0"
- gomod: "github.com/lumigo-io/lumigo-otel-collector-contrib/processor/k8seventsenricherprocessor v0.116.0"
- gomod: "github.com/lumigo-io/lumigo-otel-collector-contrib/processor/redactionbykeyprocessor v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.116.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.116.0"

replaces:
- github.com/lumigo-io/lumigo-otel-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig
Expand Down
30 changes: 28 additions & 2 deletions cmd/otelcontribcol/components.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading