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

Diff between main and swo #2

Closed
wants to merge 82 commits into from
Closed
Changes from 3 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
86b9b1e
Used the collector-contrib component
jerrytfleung Nov 3, 2023
85bc31f
Sync dependencies
jerrytfleung Nov 3, 2023
4a07d4c
Added back resourcedetectionprocessor
jerrytfleung Nov 3, 2023
8a86ca8
Updated
jerrytfleung Nov 3, 2023
d666685
Added compatibile-runtimes in Makefile
jerrytfleung Nov 28, 2023
922a479
Updated go package
jerrytfleung Nov 29, 2023
00a8912
Revert
jerrytfleung Nov 29, 2023
8dbf0e5
Revert
jerrytfleung Nov 29, 2023
6258c3f
Updated
jerrytfleung Nov 29, 2023
bd42fcd
Updated Makefile
jerrytfleung Nov 30, 2023
48a48cc
Updated
jerrytfleung Dec 13, 2023
8e96926
Updated dependency
jerrytfleung Dec 13, 2023
3ef830a
Updated Makefile
jerrytfleung Dec 14, 2023
9c6f6a5
Updated default config
jerrytfleung Jan 9, 2024
7802378
After go mod tidy
jerrytfleung Jan 9, 2024
03e379d
go mod tidy
jerrytfleung Jan 9, 2024
f007eab
Not exposing interval environment variables
jerrytfleung Jan 18, 2024
6133039
Updated collector
jerrytfleung Jan 22, 2024
98263bc
Added resourceprocessor config
jerrytfleung Jan 22, 2024
ceeb4b4
Removed Batch and decouple
jerrytfleung Jan 22, 2024
47a623e
Updated config.yaml
jerrytfleung Jan 22, 2024
d7e6b93
Changed timeout
jerrytfleung Jan 22, 2024
dad0163
go mod tidy
jerrytfleung Jan 23, 2024
18c70a6
Revert decouple
jerrytfleung Jan 23, 2024
369d608
Took out batch processor
jerrytfleung Jan 26, 2024
614bebb
Upgrade solarwindsapmsettingsextension
jerrytfleung Jan 26, 2024
56192d8
Merge branch 'main' into swo
jerrytfleung Jan 27, 2024
f3c4e89
Sync to main
jerrytfleung Jan 27, 2024
5b9ab77
Re-enabled resourcedetectionprocessor
jerrytfleung Jan 27, 2024
f83d11f
opentelemetry-lambda doesn't work with the recent change of collector…
jerrytfleung Jan 27, 2024
1b05511
Updated
jerrytfleung Jan 27, 2024
dabf87a
Updated
jerrytfleung Jan 27, 2024
4dcf58f
Updated
jerrytfleung Jan 27, 2024
6dde583
Do refresh in start
jerrytfleung Jan 27, 2024
4af28c6
Updated
jerrytfleung Jan 29, 2024
248d562
Adjusted context deadline
jerrytfleung Jan 29, 2024
2df7246
Updated
jerrytfleung Jan 29, 2024
1b3b854
Trigger action
jerrytfleung Feb 1, 2024
690ee9c
Tried
jerrytfleung Feb 5, 2024
a1b187a
Merge branch 'solarwinds:swo' into swo
jerrytfleung Feb 5, 2024
33add6c
Revert
jerrytfleung Feb 6, 2024
db087ef
Added github actions
jerrytfleung Feb 6, 2024
6953838
Merge branch 'solarwinds:swo' into swo
jerrytfleung Feb 6, 2024
c654521
Revert
jerrytfleung Feb 6, 2024
e4637f8
Merge pull request #4 from jerrytfleung/swo
jerrytfleung Feb 6, 2024
79675a2
Merge branch 'main' into swo
jerrytfleung Feb 14, 2024
a84c2e3
Change default log level and change verbosity to an env variable
jerrytfleung Feb 14, 2024
dbde37f
Merge pull request #5 from solarwinds/NH-72987
jerrytfleung Feb 15, 2024
20d9384
Remove logging from pipeleine
jerrytfleung Feb 15, 2024
8a6c598
Merge pull request #6 from solarwinds/NH-72987-path1
jerrytfleung Feb 15, 2024
2d2728e
lambda
jerrytfleung Feb 21, 2024
b855ba2
Merge pull request #7 from solarwinds/lambda
jerrytfleung Feb 21, 2024
d39d7c5
Fixed the zap logger always use info as default
jerrytfleung Feb 22, 2024
b42394b
nits
jerrytfleung Feb 22, 2024
77ce861
Merge pull request #8 from solarwinds/zap_logger_default
jerrytfleung Feb 22, 2024
bf29b36
Updated
jerrytfleung Mar 1, 2024
4e42234
Merge pull request #9 from solarwinds/NH-73899
jerrytfleung Mar 1, 2024
d67dd3d
Added logging
jerrytfleung Mar 4, 2024
000b116
Merge pull request #10 from solarwinds/logging_exporter
jerrytfleung Mar 4, 2024
16ec1d2
Renaming amd64 to x86_64
jerrytfleung Mar 5, 2024
b6800ac
Merge pull request #11 from solarwinds/renaming_amd64_to_x86_64
jerrytfleung Mar 5, 2024
813a420
Need to rename the artifact from amd64 to x86_64 to meet GHA workflow…
jerrytfleung Mar 6, 2024
629f8aa
Merge pull request #12 from solarwinds/NH-74565
jerrytfleung Mar 6, 2024
7bd1ade
Revert "Change to sw.cloud.aws.resource.type"
cheempz Mar 13, 2024
ae3544e
Merge pull request #13 from solarwinds/revert-7-lambda
cheempz Mar 13, 2024
69c7932
Merge branch 'swo' into prepare_to_merge
jerrytfleung May 13, 2024
5fa3909
Merge pull request #15 from solarwinds/prepare_to_merge
jerrytfleung May 13, 2024
16e0968
Fixed go modules
jerrytfleung May 13, 2024
957f709
go mod tidy
jerrytfleung May 13, 2024
e638397
Regenerate doc.go
jerrytfleung May 13, 2024
86bfc3f
Merge pull request #16 from solarwinds/swo-after-merge-fix
jerrytfleung May 13, 2024
7f1c996
updated
jerrytfleung May 13, 2024
645a491
nits
jerrytfleung May 13, 2024
9546947
shadow declaration
jerrytfleung May 14, 2024
35650ed
Merge pull request #17 from solarwinds/swo-applied-PR-comment-from-co…
jerrytfleung May 14, 2024
bf40974
NH-76996 Otelcol: collecting Lambda function logs (#18)
jerrytfleung May 16, 2024
f61490b
NH-80074 Otelcol: Add lambda distro version to resource attribute (#19)
jerrytfleung May 17, 2024
b2522af
Fixed the single quote issue (#20)
jerrytfleung May 17, 2024
7ce6cae
Removed support of raw file (#22)
jerrytfleung May 23, 2024
15390d0
NH-76996 Otelcol: collecting Lambda function logs (code refactoring) …
jerrytfleung May 29, 2024
00cd03b
NH-76996 - Disabled platform events log processing (#25)
jerrytfleung Jun 5, 2024
81a6178
Merge branch 'main' into swo
jerrytfleung Jul 3, 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
12 changes: 8 additions & 4 deletions collector/main.go
Original file line number Diff line number Diff line change
@@ -58,10 +58,14 @@ func main() {
func initLogger() *zap.Logger {
lvl := zap.NewAtomicLevelAt(zapcore.WarnLevel)

envLvl := os.Getenv("OPENTELEMETRY_EXTENSION_LOG_LEVEL")
userLvl, err := zap.ParseAtomicLevel(envLvl)
if err == nil {
lvl = userLvl
var err error
envLvl, ok := os.LookupEnv("OPENTELEMETRY_EXTENSION_LOG_LEVEL")
if ok {
var userLvl zap.AtomicLevel
userLvl, err = zap.ParseAtomicLevel(envLvl)
if err == nil {
lvl = userLvl
}
}

l := zap.New(zapcore.NewCore(zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()), os.Stdout, lvl))
21 changes: 21 additions & 0 deletions collector/main_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package main

import (
"os"
"testing"

"github.com/stretchr/testify/assert"
"go.uber.org/zap/zapcore"
)

func TestInitLogger(t *testing.T) {
logger := initLogger()
assert.Equal(t, zapcore.WarnLevel, logger.Level())
}

func TestInitLogger_WithEnv(t *testing.T) {
os.Setenv("OPENTELEMETRY_EXTENSION_LOG_LEVEL", "debug")
logger := initLogger()
assert.Equal(t, zapcore.DebugLevel, logger.Level())
os.Unsetenv("OPENTELEMETRY_EXTENSION_LOG_LEVEL")
}