Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Development moved to https://github.com/open-telemetry/otel-arrow #48

Open
jmacd opened this issue Mar 16, 2023 · 4 comments
Open

Development moved to https://github.com/open-telemetry/otel-arrow #48

jmacd opened this issue Mar 16, 2023 · 4 comments
Assignees

Comments

@jmacd
Copy link
Contributor

jmacd commented Mar 16, 2023

This repository will continue to hold the complete version history of the collector and its OTLP Exporter/Receiver with Arrow changes included. Development done in https://github.com/f5/otel-arrow-adapter will be copied back into this repository.

Do not develop here, use https://github.com/f5/otel-arrow-adapter.

@jmacd will arrange scripts to copy changes back to this repository in-between pulling changes from the mainline.

@jmacd
Copy link
Contributor Author

jmacd commented May 22, 2023

The current process is:

  1. In Makefile.copyFromAdapter
SOURCE_DIR := ../otel-arrow-adapter/collector/gen

GO_FILES := $(shell cd $(SOURCE_DIR) && find . -name '*.go')

# Function to execute a command. Note the empty line before endef to make sure each command
# gets executed separately instead of concatenated with previous one.
# Accepts command to execute as first parameter.
define exec-command
$(1)

endef

.PHONY: subgen generate all

all:
	echo "Run 'make gen'"

generate:
	$(MAKE) -f Makefile.copyFromAdapter subgen

# If this fails because a new directory does not exist, make it by hand and repeat.
subgen:
	$(foreach file, $(GO_FILES),$(call exec-command,cp $(SOURCE_DIR)/$(file) $(file)))
	$(foreach file, $(GO_FILES),$(call exec-command,sed -i '' -f patch.sed $(file)))
  1. In patch.sed:
s+github.com/f5/otel-arrow-adapter/collector/gen/exporter/otlpexporter+go.opentelemetry.io/collector/exporter/otlpexporter+g
s+github.com/f5/otel-arrow-adapter/collector/gen/receiver/otlpreceiver+go.opentelemetry.io/collector/receiver/otlpreceiver+g
s+github.com/f5/otel-arrow-adapter/collector/gen/internal+go.opentelemetry.io/collector/internal+g

@jmacd
Copy link
Contributor Author

jmacd commented Jun 23, 2023

Note the code introduced in f5/otel-arrow-adapter#185 and f5/otel-arrow-adapter#184 will require attention during the next branch-synchronization. @moh-osman3

@jmacd
Copy link
Contributor Author

jmacd commented Jun 29, 2023

I will update the Arrow Collector components in three steps.

  1. Arrow component development from otel-arrow-adapter@c5c36c334e75795b1c3a49e503601ae4b8fb7782 #56 copies changes from this repo since the last time this process was done back into that repository.
  2. Next, I will pull mainline updates from https://github.com/open-telemetry/opentelemetry-collector in a second PR to that repo,
  3. Finally, I will copy the components back to this repository.

We expect this to be the last time this exact process is followed. Next time, we will perform the first two steps and then (3) copy components into new PRs in OTel-Collector-Contrib, (4) remove the copied components from this repo.

jmacd added a commit that referenced this issue Aug 14, 2023
…14 (#60)

**Description:**


open-telemetry/otel-arrow@c5c36c3
through

open-telemetry/otel-arrow@caeffd6

**Link to tracking Issue:** 
open-telemetry/otel-arrow#3
which supercedes
#48
in this repo.

**Testing:** 
`make all` passes w/ known exception for logging exporter, which will be
corrected with test-scoped exemplar data.

**Documentation:** WIP
@jmacd
Copy link
Contributor Author

jmacd commented Aug 14, 2023

Updating to v0.83.0 here: #61

@jmacd jmacd changed the title Development moved to https://github.com/f5/otel-arrow-adapter Development moved to https://github.com/open-telemetry/otel-arrow Aug 14, 2023
jmacd added a commit to open-telemetry/otel-arrow that referenced this issue Aug 14, 2023
Part of #3
Part of open-telemetry/otel-arrow-collector#48

The OTel-Arrow exporter and receiver code have been synchronized with
the OTLP exporter and receiver from the mainline collector by copying to
and from the https://github.com/open-telemetry/otel-arrow-collector/
repository. This is the same code as one commit prior (i.e.,
caeffd6)
following the merge step here.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant