Skip to content

Commit

Permalink
Adding the awskinesisexporter and updating go toolchain to 1.22.8
Browse files Browse the repository at this point in the history
  • Loading branch information
rnishtala-sumo committed Dec 18, 2024
1 parent 024a859 commit b16bec0
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ defaults:
shell: bash

env:
GO_VERSION: "1.22.6"
GO_VERSION: "1.22.8"

jobs:
# Add lint to dev builds as that's the only way for cache to be shared across branches.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ defaults:
shell: bash

env:
GO_VERSION: "1.22.6"
GO_VERSION: "1.22.8"

jobs:
build-changed:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ defaults:
shell: bash

env:
GO_VERSION: "1.22.6"
GO_VERSION: "1.22.8"
VERSION: ${{ inputs.version }}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ defaults:
shell: bash

env:
GO_VERSION: "1.22.6"
GO_VERSION: "1.22.8"

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.6-alpine AS builder
FROM golang:1.22.8-alpine AS builder
ADD . /src
WORKDIR /src/otelcolbuilder/
ENV CGO_ENABLED=0
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated.
| Receivers | Processors | Exporters | Extensions | Connectors |
| :------------------------------------------------------: | :----------------------------------------------------------: | :------------------------------------: | :------------------------------------------: | :---------------------------------: |
| [active_directory_ds][activedirectorydsreceiver] | [attributes][attributesprocessor] | [awss3][awss3exporter] | [asapclient][asapauthextension] | [forward][forwardconnector] |
| [`active_directory_inv`][activedirectoryinvreceiver] | [batch][batchprocessor] | [carbon][carbonexporter] | [awsproxy][awsproxy] | [count][countconnector] |
| | [batch][batchprocessor] | [awskinesisexporter][awskinesisexporter] | | |
| [`active_directory_inv`][activedirectoryinvreceiver] | | [carbon][carbonexporter] | [awsproxy][awsproxy] | [count][countconnector] |
| [aerospike][aerospikereceiver] | [`cascading_filter`][cascadingfilterprocessor] | [debug][debugexporter] | [basicauth][basicauthextension] | [exceptions][exceptionsconnector] |
| [apache][apachereceiver] | [cumulativetodelta][cumulativetodeltaprocessor] | [file][fileexporter] | [bearertokenauth][bearertokenauthextension] | [failover][failoverconnector] |
| [awscloudwatch][awscloudwatchreceiver] | [deltatorate][deltatorateprocessor] | [kafka][kafkaexporter] | [db_storage][dbstorage] | [roundrobin][roundrobinconnector] |
Expand Down Expand Up @@ -272,6 +273,7 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated.
[tailsamplingprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/tailsamplingprocessor
[transformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/transformprocessor
[awss3exporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/awss3exporter
[awskinesisexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/awskinesisexporter
[carbonexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/carbonexporter
[debugexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.114.0/exporter/debugexporter
[fileexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/fileexporter
Expand Down
2 changes: 1 addition & 1 deletion ci/build-fips-action/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENV TARGETARCH=$TARGETARCH

RUN yum groupinstall -y "Development Tools" && yum install -y curl git

RUN curl -Lo go.tar.gz https://go.dev/dl/go1.22.6.linux-$TARGETARCH.tar.gz
RUN curl -Lo go.tar.gz https://go.dev/dl/go1.22.8.linux-$TARGETARCH.tar.gz
RUN tar -zxvf go.tar.gz -C /usr/local
ENV PATH="/usr/local/go/bin:${PATH}"

Expand Down
24 changes: 2 additions & 22 deletions otelcolbuilder/.otelcol-builder.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
dist:
name: otelcol-sumo
description: Sumo Logic OpenTelemetry Collector distribution

# the module name for the new distribution, following Go mod conventions. Optional, but recommended.
module: github.com/SumoLogic/sumologic-otel-collector

# the OpenTelemetry Collector version to use as base for the distribution.
version: 0.114.0
# the path to write the output (sources and binary).
output_path: ./cmd

exporters:
# Since include-code was removed we need to manually add all core components that we want to include:
# https://github.com/open-telemetry/opentelemetry-collector/pull/4616
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.114.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.114.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.114.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.114.0

- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.114.0
Expand All @@ -26,7 +23,6 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.114.0

processors:
# Processors with non-upstreamed changes:
- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/processor/cascadingfilterprocessor v0.0.0-00010101000000-000000000000
Expand All @@ -41,14 +37,12 @@ processors:
path: ./../pkg/processor/sumologicsyslogprocessor
- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/processor/metricfrequencyprocessor v0.0.0-00010101000000-000000000000
path: ./../pkg/processor/metricfrequencyprocessor

# Upstream processors:

# Since include-code was removed we need to manually add all core components that we want to include:
# https://github.com/open-telemetry/opentelemetry-collector/pull/4616
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.114.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.114.0

- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.114.0
Expand All @@ -70,27 +64,21 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.114.0

receivers:
# Receivers with non-upstreamed changes:
- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/telegrafreceiver v0.0.0-00010101000000-000000000000
path: ./../pkg/receiver/telegrafreceiver

- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/rawk8seventsreceiver v0.0.0-00010101000000-000000000000
path: ./../pkg/receiver/rawk8seventsreceiver

- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/jobreceiver v0.0.0-00010101000000-000000000000
path: ./../pkg/receiver/jobreceiver

- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/activedirectoryinvreceiver v0.0.0-00010101000000-000000000000
path: ./../pkg/receiver/activedirectoryinvreceiver
# Upstream receivers:

# Since include-code was removed we need to manually add all core components that we want to include:
# https://github.com/open-telemetry/opentelemetry-collector/pull/4616
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.114.0
# Upstream receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.114.0

- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.114.0
Expand Down Expand Up @@ -173,16 +161,13 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.114.0

extensions:
# Processors with non-upstreamed changes:
- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/extension/opampextension v0.0.0-00010101000000-000000000000
path: ./../pkg/extension/opampextension

# Since include-code was removed we need to manually add all core components that we want to include:
# https://github.com/open-telemetry/opentelemetry-collector/pull/4616
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.114.0

# Upstream extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.114.0
Expand All @@ -204,7 +189,6 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.114.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.114.0
Expand All @@ -214,7 +198,6 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.114.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.114.0

providers:
- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/globprovider v0.0.0-00010101000000-000000000000
- gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/opampprovider v0.0.0-00010101000000-000000000000
Expand All @@ -224,16 +207,13 @@ providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.114.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.20.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.114.0

excludes:
- github.com/knadh/koanf v1.5.0

# Replacement paths are relative to the output_path (location of source files)
replaces:
# ----------------------------------------------------------------------------
# Needed for telegrafreceiver
- github.com/influxdata/telegraf => github.com/SumoLogic/telegraf v1.32.0-sumo-0

# This is to make sure we build the with the sumologicextension from the tree.
# The reason this is needed is that sumologicexporter depends on sumologicextension in its go.mod.
# We add a dependency in the builder config in this file but only for a particular (placeholder)
Expand Down
2 changes: 1 addition & 1 deletion pkg/receiver/telegrafreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/telegrafreceiv

go 1.22.0

toolchain go1.22.6
toolchain go1.22.8

require (
github.com/cenkalti/backoff/v4 v4.3.0
Expand Down
2 changes: 1 addition & 1 deletion vagrant/provision.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

export GO_VERSION="1.22.6"
export GO_VERSION="1.22.8"

ARCH="$(dpkg --print-architecture)"

Expand Down

0 comments on commit b16bec0

Please sign in to comment.