Skip to content

Commit

Permalink
chore: update githubgen
Browse files Browse the repository at this point in the history
  • Loading branch information
Vihas Splunk committed Oct 29, 2023
1 parent 5a4169c commit b83727c
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 30 deletions.
1 change: 1 addition & 0 deletions .github/ALLOWLIST
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

## COMMON & SHARED components
internal/common
extension/encoding

## DEPRECATED components

Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ extension/basicauthextension/ @open-te
extension/bearertokenauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
extension/encoding/jaegerencodingextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @atoulme
extension/encoding/jsonlogencodingextension/ @open-telemetry/collector-contrib-approvers @VihasMakwana @atoulme
extension/encoding/otlpencodingextension/ @open-telemetry/collector-contrib-approvers @dao-jun @VihasMakwana
extension/encoding/textencodingextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @atoulme
extension/encoding/zipkinencodingextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @dao-jun
extension/encoding/otlpencodingextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @dao-jun
extension/encoding/zipkinencodingextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @dao-jun
extension/headerssetterextension/ @open-telemetry/collector-contrib-approvers @jpkrohling
extension/healthcheckextension/ @open-telemetry/collector-contrib-approvers @jpkrohling
extension/httpforwarder/ @open-telemetry/collector-contrib-approvers @atoulme @rmfitzpatrick
Expand Down
20 changes: 10 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,16 +302,6 @@ updates:
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/extension/encoding/textencodingextension"
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/extension/encoding/zipkinencodingextension"
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/extension/headerssetterextension"
schedule:
Expand Down Expand Up @@ -462,6 +452,16 @@ updates:
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/pkg/golden"
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/pkg/ottl"
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/pkg/pdatatest"
schedule:
Expand Down
1 change: 1 addition & 0 deletions cmd/checkapi/allowlist.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
connector/servicegraphconnector
extension/encoding
extension/observer
processor/servicegraphprocessor
receiver/carbonreceiver
Expand Down
1 change: 1 addition & 0 deletions cmd/githubgen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const allowlistHeader = `# Code generated by githubgen. DO NOT EDIT.
## COMMON & SHARED components
internal/common
extension/encoding
`

Expand Down
15 changes: 15 additions & 0 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.88.0
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.88.0
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension v0.88.0
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jsonlogencodingextension v0.88.0
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jsonlogencodingextension
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/textencodingextension v0.88.0
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/textencodingextension
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.88.0
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.88.1-0.20231026220224-6405e152a2d9
Expand Down Expand Up @@ -418,3 +428,8 @@ replaces:
- github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
- github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure => ../../pkg/translator/azure
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ../../extension/encoding/otlpencodingextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension => ../../extension/encoding/zipkinencodingextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jsonlogencodingextension => ../../extension/encoding/jsonlogencodingextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/textencodingextension => ../../extension/encoding/textencodingextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension => ../../extension/encoding/jaegerencodingextension
2 changes: 1 addition & 1 deletion cmd/otelcontribcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions cmd/otelcontribcol/extensions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,26 @@ func TestDefaultExtensions(t *testing.T) {
return extFactories["jaegerremotesampling"].CreateDefaultConfig().(*jaegerremotesampling.Config)
},
},
{
extension: "otlp_encoding",
skipLifecycle: true, // Requires a docker api to interface and validate.
},
{
extension: "text_encoding",
skipLifecycle: true, // Requires a docker api to interface and validate.
},
{
extension: "jaeger_encoding",
skipLifecycle: true, // Requires a docker api to interface and validate.
},
{
extension: "json_log_encoding",
skipLifecycle: true, // Requires a docker api to interface and validate.
},
{
extension: "zipkin_encoding",
skipLifecycle: true, // Requires a docker api to interface and validate.
},
}

extensionCount := 0
Expand Down
2 changes: 1 addition & 1 deletion extension/encoding/Makefile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ../../../Makefile.Common
include ../../Makefile.Common
4 changes: 3 additions & 1 deletion extension/encoding/encoding_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package encoding

import (
"context"
"testing"

"github.com/stretchr/testify/require"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/extension"
Expand Down
14 changes: 13 additions & 1 deletion extension/encoding/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding

go 1.21.2
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension v0.88.1-0.20231026220224-6405e152a2d9
Expand Down Expand Up @@ -61,3 +61,15 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/enco
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/textencodingextension => ../../extension/encoding/textencodingextension

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension => ../../extension/encoding/jaegerencodingextension

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../pkg/translator/zipkin

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
14 changes: 0 additions & 14 deletions extension/encoding/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ module-sets:
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jsonlogencodingextension
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/textencodingextension
Expand Down

0 comments on commit b83727c

Please sign in to comment.