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

Bump dependencies to add GCP cloud logging exporter #9679

Merged
merged 2 commits into from May 5, 2022

Conversation

damemi
Copy link
Contributor

@damemi damemi commented May 2, 2022

Description:
This imports an exporter for GCP logs

Link to tracking Issue: #8249

Testing: Manual and automated unit and integration tests in GoogleCloudPlatform/opentelemetry-operations-go

Documentation: Readme updated with new fields and sample configs

@damemi damemi requested review from a team, dmitryax, dashpole, jsuereth and punya as code owners May 2, 2022 19:52
@damemi damemi changed the title Add GCP cloud logging exporter Bump dependencies to add GCP cloud logging exporter May 2, 2022
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

This is adding new functionality to the exporter, please add a note to the changelog

@damemi
Copy link
Contributor Author

damemi commented May 3, 2022

@codeboten I updated the changelog, is there anything I need to do to get the tests to run again?

Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

@codeboten I updated the changelog, is there anything I need to do to get the tests to run again?

The test run automatically on every commit so you should be ok there. Please resolve the conflicts and we'll get this merged 👍

@damemi damemi requested a review from pmm-sumo as a code owner May 3, 2022 15:17
@damemi
Copy link
Contributor Author

damemi commented May 3, 2022

@codeboten I updated the changelog, is there anything I need to do to get the tests to run again?

The test run automatically on every commit so you should be ok there. Please resolve the conflicts and we'll get this merged 👍

Updated, thanks. btw it looks like first-time contributors need a maintainer to approve the workflows, at least that's the message I see. Just a heads up in case that's an unintentional setting

@damemi damemi force-pushed the logs-collector-exporter branch 2 times, most recently from b9d789e to 3218558 Compare May 3, 2022 16:20
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

Some tests are still failing:

make -C ./exporter/googlecloudexporter test
make[2]: Entering directory '/home/runner/work/opentelemetry-collector-contrib/opentelemetry-collector-contrib/exporter/googlecloudexporter'
go test -race -v -timeout 300s --tags="" ./...
=== RUN   TestLoadConfig
    config_test.go:60: 
        	Error Trace:	config_test.go:60
        	Error:      	Not equal: 
        	            	expected: &googlecloudexporter.Config{ExporterSettings:config.ExporterSettings{id:config.ComponentID{typeVal:"googlecloud", nameVal:"customname"}}, Config:collector.Config{ProjectID:"my-project", UserAgent:"opentelemetry-collector-contrib {{version}}", TraceConfig:collector.TraceConfig{ClientConfig:collector.ClientConfig{Endpoint:"test-trace-endpoint", UseInsecure:true, GetClientOptions:(func() []option.ClientOption)(nil)}, AttributeMappings:[]collector.AttributeMapping(nil)}, MetricConfig:collector.MetricConfig{ClientConfig:collector.ClientConfig{Endpoint:"test-metric-endpoint", UseInsecure:true, GetClientOptions:(func() []option.ClientOption)(nil)}, Prefix:"prefix", SkipCreateMetricDescriptor:true, KnownDomains:[]string{"googleapis.com", "kubernetes.io", "istio.io", "knative.dev"}, InstrumentationLibraryLabels:true, CreateServiceTimeSeries:false, CreateMetricDescriptorBufferSize:10, ServiceResourceLabels:true, ResourceFilters:[]collector.ResourceFilter(nil), CumulativeNormalization:true, EnableSumOfSquaredDeviation:false}, LogConfig:collector.LogConfig{ClientConfig:collector.ClientConfig{Endpoint:"", UseInsecure:false, GetClientOptions:(func() []option.ClientOption)(nil)}, DefaultLogName:""}}, TimeoutSettings:exporterhelper.TimeoutSettings{Timeout:20000000000}, QueueSettings:exporterhelper.QueueSettings{Enabled:true, NumConsumers:2, QueueSize:10}, RetrySettings:exporterhelper.RetrySettings{Enabled:true, InitialInterval:10000000000, MaxInterval:60000000000, MaxElapsedTime:600000000000}}
        	            	actual  : &googlecloudexporter.Config{ExporterSettings:config.ExporterSettings{id:config.ComponentID{typeVal:"googlecloud", nameVal:"customname"}}, Config:collector.Config{ProjectID:"my-project", UserAgent:"opentelemetry-collector-contrib {{version}}", TraceConfig:collector.TraceConfig{ClientConfig:collector.ClientConfig{Endpoint:"test-trace-endpoint", UseInsecure:true, GetClientOptions:(func() []option.ClientOption)(nil)}, AttributeMappings:[]collector.AttributeMapping(nil)}, MetricConfig:collector.MetricConfig{ClientConfig:collector.ClientConfig{Endpoint:"test-metric-endpoint", UseInsecure:true, GetClientOptions:(func() []option.ClientOption)(nil)}, Prefix:"prefix", SkipCreateMetricDescriptor:true, KnownDomains:[]string{"googleapis.com", "kubernetes.io", "istio.io", "knative.dev"}, InstrumentationLibraryLabels:true, CreateServiceTimeSeries:false, CreateMetricDescriptorBufferSize:10, ServiceResourceLabels:true, ResourceFilters:[]collector.ResourceFilter(nil), CumulativeNormalization:false, EnableSumOfSquaredDeviation:false}, LogConfig:collector.LogConfig{ClientConfig:collector.ClientConfig{Endpoint:"", UseInsecure:false, GetClientOptions:(func() []option.ClientOption)(nil)}, DefaultLogName:""}}, TimeoutSettings:exporterhelper.TimeoutSettings{Timeout:20000000000}, QueueSettings:exporterhelper.QueueSettings{Enabled:true, NumConsumers:2, QueueSize:10}, RetrySettings:exporterhelper.RetrySettings{Enabled:true, InitialInterval:10000000000, MaxInterval:60000000000, MaxElapsedTime:600000000000}}
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -37,3 +37,3 @@
        	            	    ResourceFilters: ([]collector.ResourceFilter) <nil>,
        	            	-   CumulativeNormalization: (bool) true,
        	            	+   CumulativeNormalization: (bool) false,
        	            	    EnableSumOfSquaredDeviation: (bool) false
        	Test:       	TestLoadConfig
--- FAIL: TestLoadConfig (0.01s)
=== RUN   TestCreateDefaultConfig
    factory_test.go:31: 
        	Error Trace:	factory_test.go:31
        	Error:      	Received unexpected error:
        	            	type "Config" from package "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter" has invalid config settings: type "Config" from package "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" has invalid config settings: type "MetricConfig" from package "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" has invalid config settings: mapstructure tag not present on field "EnableSumOfSquaredDeviation"
        	Test:       	TestCreateDefaultConfig

@damemi
Copy link
Contributor Author

damemi commented May 3, 2022

Updated to pull in test fix from GoogleCloudPlatform/opentelemetry-operations-go#380

@codeboten codeboten added the ready to merge Code review completed; ready to merge by maintainers label May 5, 2022
@dashpole dashpole added comp:google Google Cloud components enhancement New feature or request labels May 5, 2022
@bogdandrutu bogdandrutu merged commit 19749b4 into open-telemetry:main May 5, 2022
djaglowski pushed a commit to djaglowski/opentelemetry-collector-contrib that referenced this pull request May 10, 2022
Co-authored-by: Alex Boten <aboten@lightstep.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp:google Google Cloud components enhancement New feature or request ready to merge Code review completed; ready to merge by maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants