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.

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

fix: remove squash on configtls.TLSClientSetting for AWS components #5454

Merged
merged 11 commits into from
Oct 1, 2021

Conversation

hyunuk
Copy link
Contributor

@hyunuk hyunuk commented Sep 27, 2021

Description:
This PR removes squash onconfigtls.TLSClientSetting and update corresponding yaml files to ensure that the unit test passed.

Link to tracking Issue:
#5433

Copy link
Member

@bogdandrutu bogdandrutu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider to split into a PR that fixes the broken readmes and other that change the other components to not squash

@hyunuk
Copy link
Contributor Author

hyunuk commented Sep 27, 2021

@bogdandrutu I split them into the first two commits in this PR.
But if they are splitted into two PRs, each of them cannot pass build-and-test/unittest(pull_request) in Github actions, which is labeled as Required.

examples/demo/otel-collector-config.yaml Outdated Show resolved Hide resolved
exporter/datadogexporter/example/example_k8s_manifest.yaml Outdated Show resolved Hide resolved
exporter/opencensusexporter/README.md Outdated Show resolved Hide resolved
exporter/opencensusexporter/README.md Outdated Show resolved Hide resolved
exporter/prometheusremotewriteexporter/README.md Outdated Show resolved Hide resolved
exporter/prometheusremotewriteexporter/README.md Outdated Show resolved Hide resolved
exporter/zipkinexporter/README.md Outdated Show resolved Hide resolved
exporter/zipkinexporter/README.md Outdated Show resolved Hide resolved
extension/oauth2clientauthextension/README.md Outdated Show resolved Hide resolved
Copy link
Member

@bogdandrutu bogdandrutu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alolita alolita added the ready to merge Code review completed; ready to merge by maintainers label Sep 29, 2021
@bogdandrutu
Copy link
Member

Consider to split per component: splunk/observiq/elastic/aws, since this has approver from aws owners this may contain the aws changes, and create other 3 PRs. We need component owners to ack these changes.

@bogdandrutu bogdandrutu removed the ready to merge Code review completed; ready to merge by maintainers label Sep 30, 2021
@hyunuk hyunuk changed the title fix: remove squash on configtls.TLSClientSetting fix: remove squash on configtls.TLSClientSetting for AWS components Oct 1, 2021
@bogdandrutu bogdandrutu merged commit 5118335 into open-telemetry:main Oct 1, 2021
luckyj5 pushed a commit to luckyj5/opentelemetry-collector-contrib that referenced this pull request Oct 1, 2021
…pen-telemetry#5454)

* fix: remove squash on configtls.TLSClientSetting

* fix: update yamls and readmes to reflect de-squashed tls

* fix: solve merge conflict

* fix: remove unnecessary file changes

* chore: add CHANGELOG

* fix: add relevant readme files

* fix: includes aws components only
luckyj5 pushed a commit to luckyj5/opentelemetry-collector-contrib that referenced this pull request Oct 1, 2021
…pen-telemetry#5454)

* fix: remove squash on configtls.TLSClientSetting

* fix: update yamls and readmes to reflect de-squashed tls

* fix: solve merge conflict

* fix: remove unnecessary file changes

* chore: add CHANGELOG

* fix: add relevant readme files

* fix: includes aws components only
luckyj5 added a commit to luckyj5/opentelemetry-collector-contrib that referenced this pull request Oct 1, 2021
```
time make -C ./receiver/opencensusreceiver test
make: Entering directory '/home/qmanfroi/git/signalfx/opentelemetry-collector-contrib/receiver/opencensusreceiver'
go test -race -timeout 300s --tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper ./...
ok      github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver   140.310s
ok      github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver/internal/ocmetrics        0.329s
ok      github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver/internal/octrace  0.614s
make: Leaving directory '/home/qmanfroi/git/signalfx/opentelemetry-collector-contrib/receiver/opencensusreceiver'

real    2m21.503s
user    0m4.198s
sys     0m1.047s
```

here is the specification of my laptop:
* CPU: Intel(R) Core(TM) i7-8550U CPU
* Memory: 16GB
* Disk: PM981 NVMe Samsung 512GB
* OS: Arch Linux

* Update dependencies logzio exporter

* Updated example

* Updated README.md

* New line

* Update config.yaml

Co-authored-by: Bogdan Drutu <lazy@splunk.com>

Update loki-label-best-practices page (open-telemetry#5277)

[awscontainerinsights receiver]Add Readme for ECS (open-telemetry#4375)

* Add Readme for ECS

* Revise based on the comments

Add invert match on tail sampling string attribute (open-telemetry#4393)

Fix $attributes.file_path when collecting logs from Kubernetes (open-telemetry#5061)

* Update otel-collector-config.yml

On AWS EKS 1.21, I'd get this error (from your original code):

```console
$ kubectl logs -f --tail=10 ds/otel-collector

2021-08-28T17:46:38.930Z	error	Failed to process entry	{"kind": "receiver", "name": "filelog", "operator_id": "$.extract_metadata_from_filepath", "operator_type": "regex_parser", "error": {"description": "Entry is missing the expected parse_from field.", "suggestion": "Ensure that all incoming entries contain the parse_from field.", "details": {"parse_from": "$attributes.file_path"}}, "action": "send", "entry": {"timestamp":"2021-08-28T17:22:14.809709717Z","body":{"log":"2021-08-28T17:22:14+0000 DEBUG This is a debug log that shows a log that can be ignored.\n","stream":"stdout"},"attributes":{"file.path":"/var/log/pods/default_random-logger_4cf99717-08db-425b-88b6-1ee98fdf3660/random-logger/0.log"},"severity":0}}
```

The error message is showing that the actual attribute is "file.path", not "file_path". My proposed fix will correct that.

* Update otel-collector.yaml

* support untyped and _total metrics without the suffix in the metadata lookup

* Fix spacing

* remove debug line and run go fmt

* fix typo

* Add Apache httpd receiver - part 1

* Incorporate PR feedback

* Remove unnecessary string building step

* Simplify config validation

* Merge main

* Do not require a path

* Remove port requirement

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

* Add mysql receiver config and factory

* Incorporate PR feedback

* Add dependabot

* Rerun make generate

* PR feedback

Bump gopsutil/v3 to v3.21.9 (open-telemetry#5544)

* Bump gopsutil/v3

* make go tidy

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

bump aws-sdk-go to v1.40.53 (open-telemetry#5569)

fix: remove squash on configtls.TLSClientSetting for AWS components (open-telemetry#5454)

* fix: remove squash on configtls.TLSClientSetting

* fix: update yamls and readmes to reflect de-squashed tls

* fix: solve merge conflict

* fix: remove unnecessary file changes

* chore: add CHANGELOG

* fix: add relevant readme files

* fix: includes aws components only
tigrannajaryan pushed a commit that referenced this pull request Oct 4, 2021
…#5540)

This PR removes squash on`configtls.TLSClientSetting` and update corresponding yaml file for observiqexporter.
See history [here](#5454)

**Link to tracking Issue:**
#5433
tigrannajaryan pushed a commit that referenced this pull request Oct 6, 2021
#5541)

This PR removes squash on`configtls.TLSClientSetting` and update corresponding yaml file for splunkhecexporter.
See history [here](#5454)

**Link to tracking Issue:**
#5433
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants