Skip to content

Commit f1afa02

Browse files
pmm-sumopmm-sumo
committed
Merge Sumo Logic updates to OTC
Merge Sumo tail-sampling extensions Update source processor to new API Fix imports order Update deps for OTC v0.14.0 Expose tailsamplingprocessor metrics Config update (#289) CircleCI configuration update and linter fixes Tail sampling processor - update to v0.16 Source processor - update to v0.16 Tailsampling processor order fix Introduce cascading filter processor (#359) Introduce cascading filter processor Switch to AWS ECR (#409) Switch to AWS ECR Investigate issue with image tagging (#410) Move envs into $BASH_ENV AWS CLI orb Update README.md Clarify which span attributes are updated/added and `probablistic_filtering_ratio` behavior Provide invert (like grep -v) match capability (#509) Bump OTC-Sumo version Add Sumo examples (#681) Update README.md Update base dependency to v0.19.0-sumo Remove uneccesary return values per linter Switch master -> main Address linter errors in sourceprocessor Use cloud.namespace on AWS resourcedetection Update ec2.go TRACING-1684 | Change cloud.namespace tag from "ec2" to "aws/ec2". TRACING-1684 | Test fix Switch examples to use OTLP/HTTP (#864) Bump SumoLogic OTC base version Fix cascadingfilterprocessor unit test Introduce telegrafreceiver (#935) Increase testbed memory limits AWS OTel Collector templates (#788) Add AWS OTel Collector config templates Update core version to v0.22.0 AWS Distro for Opentelemetry collector configuration file (#983) Add AWS Distro Collector config Change endpoint, add insecure flag Update readme Update Telegraf for changes in core v0.22.0 Rebase on v0.24.0 upstream changes Add opentelemetry-collector-builder with Makefile and Github Action to build on PR (#1300) Add telegrafreceiver to opentelemetry-collector-builder config Add tracing-tests into pipeline (#1302) Install fluentbit (#1312) Add publish-check for all tags and branches Fix CI to actually produce artifacts for tags Update config.yml (#1412) Update aws-otel-config-file.yaml (#1537) Add resourcedetection Add additional receivers Sumo Logic Syslog Processor (#1313) add sumologicsyslogprocessor Signed-off-by: Dominik Rosiek <[email protected]> Co-authored-by: Patryk Małek <[email protected]> Update k8sprocessor with recent changes from sumologic-otel-collector Add drop traces capability Fix linter issues Fix configschema go mods Update CircleCI Golang conf Remove old circleci config Remove windows-test target Update modules Update observability test from upstream Linter fix Update testbed limits Update number of processors Fix linter at sumologicsyslogprocessor Update infrastructure_service->platform Fix k8s linter check Increase testbed limits Fix double filling attributes Skip coverage Increase testbed limits Update Dockerfile Update testbed limits Update example, include better metrics and handle no-policies case Revert to old sourceprocessor config format Include missed testcase Fix linter lint & gofmt fix Use simpler rules in cascadingfilter Remove OnLateArrivingSpans Linter fix Increase memory ballasts Fix probability calculation Identation fix
1 parent 6048c3f commit f1afa02

File tree

116 files changed

+16378
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+16378
-260
lines changed

‎.circleci/config.yml‎

Lines changed: 204 additions & 139 deletions
Large diffs are not rendered by default.

‎.github/workflows/opentelemetry-collector-builder.yaml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: OpenTelemetry Collector Builder
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
# otelcolbuilder_post_go1_16:
10+
# runs-on: ubuntu-20.04
11+
# strategy:
12+
# matrix:
13+
# go: [ '1.16' ]
14+
# steps:
15+
# - uses: actions/checkout@v2
16+
# - name: Setup go
17+
# uses: actions/setup-go@v2
18+
# with:
19+
# go-version: ${{ matrix.go }}
20+
# - name: Print go version
21+
# run: go version
22+
# - name: Build OpenTelemetry distro
23+
# working-directory: ./otelcolbuilder/
24+
# run: |
25+
# go install github.com/open-telemetry/[email protected]
26+
# make build
27+
28+
# Just build on 1.15 for now because of a weird issue:
29+
# https://github.com/actions/setup-go/issues/107
30+
otelcolbuilder_pre_go1_16:
31+
runs-on: ubuntu-20.04
32+
strategy:
33+
matrix:
34+
go: [ '1.15' ]
35+
steps:
36+
- uses: actions/checkout@v2
37+
- name: Setup go
38+
uses: actions/setup-go@v2
39+
with:
40+
go-version: ${{ matrix.go }}
41+
- name: Print go version
42+
run: go version
43+
- name: Print go env
44+
run: go env
45+
- name: Build OpenTelemetry distro
46+
working-directory: ./otelcolbuilder/
47+
run: |
48+
make install-prego1.16
49+
make build

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ integration-coverage.txt
3131
coverage.html
3232
integration-coverage.html
3333

34+
# vagrant
35+
.vagrant
36+
ubuntu-bionic-18.04-cloudimg-console.log
37+
3438
# Wix
3539
*.wixobj
3640
*.wixpdb

‎README.md‎

Lines changed: 19 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,26 @@
1-
---
1+
# SumoLogic / OpenTelemetry Collector Contrib
2+
This is a repository for OpenTelemetry Collector Contrib with additional Sumo Logic extensions. It is based
3+
on the [opentelemetry-collector-contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) and
4+
[core distribution of the Collector](https://github.com/open-telemetry/opentelemetry-collector).
25

3-
<p align="center">
4-
<strong>
5-
<a href="https://opentelemetry.io/docs/collector/getting-started/">Getting Started</a>
6-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
7-
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md">Getting Involved</a>
8-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
9-
<a href="https://gitter.im/open-telemetry/opentelemetry-service">Getting In Touch</a>
10-
</strong>
11-
</p>
126

13-
<p align="center">
14-
<a href="https://goreportcard.com/report/github.com/open-telemetry/opentelemetry-collector-contrib">
15-
<img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/open-telemetry/opentelemetry-collector-contrib?style=for-the-badge">
16-
</a>
17-
<a href="https://circleci.com/gh/open-telemetry/opentelemetry-collector-contrib">
18-
<img alt="Build Status" src="https://img.shields.io/circleci/build/github/open-telemetry/opentelemetry-collector-contrib?style=for-the-badge">
19-
</a>
20-
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-collector-contrib/branch/main/">
21-
<img alt="Codecov Status" src="https://img.shields.io/codecov/c/github/open-telemetry/opentelemetry-collector-contrib?style=for-the-badge">
22-
</a>
23-
<a href="https://github.com/open-telemetry/opentelemetry-collector-contrib/releases">
24-
<img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/open-telemetry/opentelemetry-collector-contrib?include_prereleases&style=for-the-badge">
25-
</a>
26-
<img alt="Beta" src="https://img.shields.io/badge/status-beta-informational?style=for-the-badge&logo=data:image/png;base64,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">
27-
</p>
7+
## Docker Images
8+
Docker images for all releases are published at https://hub.docker.com/r/sumologic/opentelemetry-collector
289

29-
<p align="center">
30-
<strong>
31-
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/vision.md">Vision</a>
32-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
33-
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/design.md">Design</a>
34-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
35-
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md">Monitoring</a>
36-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
37-
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/performance.md">Performance</a>
38-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
39-
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security.md">Security</a>
40-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
41-
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/roadmap.md">Roadmap</a>
42-
</strong>
43-
</p>
10+
### Building docker locally
4411

45-
---
12+
```
13+
docker build -f cmd/otelcontribcol/Dockerfile -t otelcontribcol .
14+
```
4615

47-
# OpenTelemetry Collector Contrib
16+
## Differences from the core release
4817

49-
This is a repository for OpenTelemetry Collector contributions that are not
50-
part of the [core
51-
distribution](https://github.com/open-telemetry/opentelemetry-collector) of the
52-
Collector. Typically, these contributions are vendor specific
53-
receivers/exporters and/or components that are only useful to a relatively
54-
small number of users.
18+
SumoLogic version of OpenTelemetry Collector introduces a number of additions over the plain version:
5519

56-
> Please note that this repository and its releases are a superset of the core repository.
57-
58-
## Contributing
59-
60-
See [CONTRIBUTING.md](CONTRIBUTING.md).
61-
62-
Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/open-telemetry/teams/collector-contrib-triagers))
63-
- [Alolita Sharma](https://github.com/alolita), AWS
64-
- [Punya Biswal](https://github.com/punya), Google
65-
- [Steve Flanders](https://github.com/flands), Splunk
66-
67-
Approvers ([@open-telemetry/collector-contrib-approvers](https://github.com/orgs/open-telemetry/teams/collector-contrib-approvers)):
68-
69-
- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
70-
- [Anuraag Agrawal](https://github.com/anuraaga), AWS
71-
- [Daniel Jaglowski](https://github.com/djaglowski), observIQ
72-
- [Dmitrii Anoshin](https://github.com/dmitryax), Splunk
73-
- [Kevin Brockhoff](https://github.com/kbrockhoff), Daugherty Business Solutions
74-
- [Pablo Baeyens](https://github.com/mx-psi), DataDog
75-
- [Owais Lone](https://github.com/owais), Splunk
76-
77-
Maintainers ([@open-telemetry/collector-contrib-maintainer](https://github.com/orgs/open-telemetry/teams/collector-contrib-maintainer)):
78-
79-
- [Juraci Paixão Kröhling](https://github.com/jpkrohling), Grafana Labs
80-
- [Alex Boten](https://github.com/codeboten), Lightstep
81-
- [Bogdan Drutu](https://github.com/BogdanDrutu), Splunk
82-
- [Tigran Najaryan](https://github.com/tigrannajaryan), Splunk
83-
84-
Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md).
85-
86-
## PRs and Reviews
87-
88-
When creating a PR please following the process [described
89-
here](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#how-to-structure-prs-to-get-expedient-reviews).
90-
91-
News PRs will be automatically associated with the reviewers based on
92-
[CODEOWNERS](.github/CODEOWNERS). PRs will be also automatically assigned to one of the
93-
maintainers or approvers for facilitation.
94-
95-
The facilitator is responsible for helping the PR author and reviewers to make progress
96-
or if progress cannot be made for closing the PR.
97-
98-
If the reviewers do not have approval rights the facilitator is also responsible
99-
for the official approval that is required for the PR to be merged and if the facilitator
100-
is a maintainer they are responsible for merging the PR as well.
101-
102-
The facilitator is not required to perform a thorough review, but they are encouraged to
103-
enforce Collector best practices and consistency across the codebase and component
104-
behavior. The facilitators will typically rely on codeowner's detailed review of the code
105-
when making the final approval decision.
106-
107-
We recommend maintainers and approvers to keep an eye on the
108-
[project board](https://github.com/orgs/open-telemetry/projects/3). All newly created
109-
PRs are automatically added to this board. (If you don't see the PR on the board you
110-
may need to add it manually by setting the Project field in the PR view).
20+
* Extensions to [k8sprocessor](https://github.com/SumoLogic/opentelemetry-collector-contrib/tree/master/processor/k8sprocessor)
21+
which include more tags being collected and field extraction enhancements
22+
* A [sourceprocessor](https://github.com/SumoLogic/opentelemetry-collector-contrib/tree/master/processor/sourceprocessor) that
23+
adds additional tags (mostly relevant to K8s environment) and provides some data filtering rules
24+
* [Cascading filter processor](https://github.com/pmm-sumo/opentelemetry-collector-contrib/tree/remote-conf-poc/processor/cascadingfilterprocessor)
25+
extensions, which include *cascading* policy with two-pass rules for determining span budget for each of the defined rules
26+
* Additional release schedule, which allows to quickly introduce bugfixes and extensions

‎Vagrantfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# -*- mode: ruby -*-
2+
# vi: set ft=ruby :
3+
4+
Vagrant.configure('2') do |config|
5+
config.vm.box = 'ubuntu/bionic64'
6+
config.vm.box_check_update = false
7+
config.vm.host_name = 'opentelemetry-collector-contrib'
8+
config.vm.network :private_network, ip: "192.168.33.33"
9+
10+
config.vm.provider 'virtualbox' do |vb|
11+
vb.gui = false
12+
vb.memory = 4096
13+
vb.name = 'opentelemetry-collector-contrib'
14+
end
15+
config.vm.provision 'file', source: 'vagrant', destination: 'vagrant'
16+
config.vm.provision 'shell', path: 'vagrant/provision.sh'
17+
end

‎cmd/configschema/go.mod‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,18 +220,21 @@ require (
220220
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.38.0 // indirect
221221
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.38.0 // indirect
222222
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.38.0 // indirect
223+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cascadingfilterprocessor v0.38.0 // indirect
223224
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.38.0 // indirect
224225
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.38.0 // indirect
225226
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.38.0 // indirect
226227
github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.38.0 // indirect
227228
github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.38.0 // indirect
228229
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.38.0 // indirect
230+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.38.0 // indirect
229231
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.38.0 // indirect
230232
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.38.0 // indirect
231233
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.38.0 // indirect
232234
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.38.0 // indirect
233235
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.38.0 // indirect
234236
github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.38.0 // indirect
237+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/sourceprocessor v0.38.0 // indirect
235238
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.38.0 // indirect
236239
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.38.0 // indirect
237240
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.38.0 // indirect
@@ -592,8 +595,16 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/grou
592595

593596
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor => ../../processor/groupbytraceprocessor
594597

598+
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/cascadingfilterprocessor => ../../processor/cascadingfilterprocessor/
599+
600+
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor => ../../processor/k8sprocessor/
601+
595602
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor => ../../processor/k8sattributesprocessor/
596603

604+
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/sourceprocessor => ../../processor/sourceprocessor/
605+
606+
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicsyslogprocessor => ../../processor/sumologicsyslogprocessor/
607+
597608
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => ../../processor/resourcedetectionprocessor/
598609

599610
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor => ../../processor/resourceprocessor/

‎cmd/otelcontribcol/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ USER ${USER_UID}
1111

1212
COPY --from=prep /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
1313
COPY otelcontribcol /
14-
EXPOSE 4317 55680 55679
14+
EXPOSE 4317 4318 55680 55679
1515
ENTRYPOINT ["/otelcontribcol"]
1616
CMD ["--config", "/etc/otel/config.yaml"]

‎examples/README.md‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Examples
2+
## Kubernetes configuration
3+
4+
### Helm chart values template
5+
[kubernetes/custom-values.yaml](./kubernetes/custom-values.yaml) contains
6+
an example template for Sumologic Kubernetes Collection Helm chart, which
7+
installs OpenTelemetry Collector in Agent and Gateway configuration, as described
8+
in the [documentation](https://help.sumologic.com/Traces/Getting_Started_with_Transaction_Tracing/Set_up_traces_collection_for_Kubernetes_environments).
9+
10+
After filling the template values, you can install it following
11+
[Sumologic Kubernetes Collection installation instructions](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/release-v2.0/deploy/docs/Installation_with_Helm.md)
12+
For example, by running following commands:
13+
```shell
14+
helm repo add sumologic https://sumologic.github.io/sumologic-kubernetes-collection
15+
kubectl create namespace sumologic
16+
helm upgrade --install my-release -n sumologic sumologic/sumologic -f custom-values.yaml
17+
```
18+
19+
### Helm chart values template with cascading filter enabled
20+
21+
Additionally, [kubernetes/custom-values-cascading-filter.yaml](./kubernetes/custom-values-cascading-filter.yaml)
22+
includes an alternative example template that enables cascading filter,
23+
as described in [trace filtering documentation](https://help.sumologic.com/Traces/Getting_Started_with_Transaction_Tracing/What_if_I_don't_want_to_send_all_the_tracing_data_to_Sumo_Logic%3F).
24+
Note that cascading filter is currently supported only for single-instance
25+
OpenTelemetry Collector deployments.
26+
27+
## Non-kubernetes configuration
28+
29+
### Agent configuration (should be run on each host/node)
30+
[non-kubernetes/agent-configuration-template.yaml](non-kubernetes/agent-configuration-template.yaml) contains
31+
an OpenTelemetry Collector YAML file which includes configuration
32+
for OpenTelemetry Collector running in Agent mode. It should be
33+
deployed on each host/node within the system.
34+
35+
### Gateway configuration (should be run per each cluster/data-center/etc.)
36+
[non-kubernetes/gateway-configuration-template.yaml](non-kubernetes/gateway-configuration-template.yaml) contains
37+
an OpenTelemetry Collector YAML file which includes configuration
38+
for OpenTelemetry Collector running in Gateway mode.
39+
40+
Additionally, for [non-kubernetes/gateway-configuration-template-with-cascading-filter.yaml](non-kubernetes/gateway-configuration-template-with-cascading-filter.yaml)
41+
the configuration also includes cascading filter config,
42+
which is described in more detail in [trace filtering documentation](https://help.sumologic.com/Traces/Getting_Started_with_Transaction_Tracing/What_if_I_don't_want_to_send_all_the_tracing_data_to_Sumo_Logic%3F).
43+
44+
Please refer to [relevant documentation](https://help.sumologic.com/Traces/Getting_Started_with_Transaction_Tracing/Set_up_traces_collection_for_other_environments)
45+
for more details.
46+
47+
### AWS OTel Collector configuration file
48+
[non-kubernetes/aws-otel-config.yaml](non-kubernetes/aws-otel-config.yaml) contains
49+
an AWS OpenTelemetry Collector distrubtion YAML file which includes configuration
50+
for OpenTelemetry Collector. Should be deployed on the AWS environments.
51+
52+
### AWS OTel Collector for ECS in EC2 mode template
53+
[non-kubernetes/aws-otel-ecs-ec2-deployment.yaml](non-kubernetes/aws-otel-ecs-ec2-deployment.yaml) contains
54+
an AWS OpenTelemetry Collector distribution YAML file which includes
55+
CloudFormation template. It should be deployed on the AWS ECS EC2
56+
environment.
57+
58+
### AWS OTel Collector for ECS in Fargate mode template
59+
[non-kubernetes/aws-otel-ecs-fargate-deployment.yaml](non-kubernetes/aws-otel-ecs-fargate-deployment.yaml) contains
60+
an AWS OpenTelemetry Collector distribution YAML file which includes
61+
CloudFormation template. It should be deployed on the AWS ECS Fargate
62+
environment.
63+
64+
### AWS OTel Collector for EC2 deployment template
65+
[non-kubernetes/aws-otel-ec2-deployment.yaml](non-kubernetes/aws-otel-ec2-deployment.yaml) contains
66+
an AWS OpenTelemetry Collector distribution YAML file which includes
67+
CloudFormation template. It should be deployed on the AWS EC2.
68+
69+
### AWS Distro for OpenTelemetry configuration
70+
[aws_lambda/aws-distro-collector-lambda-layer-config.yaml](aws_lambda/aws-distro-collector-lambda-layer-config.yaml) contains
71+
an [AWS Distro for Opentelemetry Collector](https://github.com/aws-observability/aws-otel-lambda/tree/main/extensions/aoc-extension) YAML file which includes configuration for collector installed in a Lambda Layer. Collector requires *SUMOLOGIC_HTTP_TRACES_ENDPOINT_URL* environment variable to be set.

0 commit comments

Comments
 (0)